diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm')
355 files changed, 1877 insertions, 5385 deletions
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc index 465eab68916..2b596949aad 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc +++ b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc @@ -5,12 +5,11 @@ project (DDS_Hello_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default dynamicflags += HELLO_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=HELLO_BASE_STUB_Export \ -Wb,stub_export_include=Hello_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Hello_Base.idl } diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl index f15d7b4f0cb..15ec9b2e066 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill (3 * $tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl index c28adced639..a5dbde388d2 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill (3 * $tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl index c324400cae0..a0b6edda28f 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl @@ -233,7 +233,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill (5 * $tg_executor->ProcessStopWaitInterval ()); print "Invoking executor - stop the application -\n"; diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl index 09a8a098e5e..2e12504c37d 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl index c73fc8e11a7..48110e0fedb 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl index 40764f5b852..658125b4b68 100755 --- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc index d3e88495282..7b8a9589c44 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc @@ -5,12 +5,11 @@ project (DDS_Quoter_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default dynamicflags += QUOTER_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=QUOTER_BASE_STUB_Export \ -Wb,stub_export_include=Quoter_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Quoter_Base.idl } diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl index 44cd3fa00c0..0cee98f3263 100755 --- a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc index 5f953ca0731..0a311bc0aff 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc @@ -5,12 +5,11 @@ project (DDS_Shapes_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default dynamicflags += SHAPES_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=SHAPES_BASE_STUB_Export \ -Wb,stub_export_include=Shapes_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Shapes_Base.idl } diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl index 6ab7070d719..91f09e912e2 100755 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl index 1b5bdb89f1b..2d7beaad068 100644 --- a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl +++ b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl @@ -1,7 +1,7 @@ // $Id$ -#ifndef CCM_DDS_BASE_IDL -#define CCM_DDS_BASE_IDL +#ifndef DDS_CCM_BASE_IDL +#define DDS_CCM_BASE_IDL #include <Components.idl> #include "connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl" diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h deleted file mode 100644 index b9ec6e68944..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @author Johnny Willemsen <jwillemsen@remedy.nl> - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_GROUPDATAQOSPOLICY_H -#define DDS4CCM_GROUPDATAQOSPOLICY_H - -#include "OctetSeq.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::GroupDataQosPolicy DDS_GroupDataQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - -inline void -operator<<= (::DDS::GroupDataQosPolicy &ddsqos, const ::DDS_GroupDataQosPolicy & qos) -{ - ddsqos.value <<= qos.value; -} - -inline void -operator<<= (::DDS_GroupDataQosPolicy &ddsqos, const ::DDS::GroupDataQosPolicy & qos) -{ - ddsqos.value <<= qos.value; -} - -#endif - -#endif /* DDS4CCM_GROUPDATAQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/OctetSeq.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/OctetSeq.h deleted file mode 100644 index ed0cc97a018..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OctetSeq.h +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @author Marcel Smit <msmit@remedy.nl> - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_OCTETSEQ_H -#define DDS4CCM_OCTETSEQ_H - -inline void -operator<<= (::DDS::OctetSeq &ddsseq, const ::DDS_OctetSeq & seq) -{ - ddsseq.length (seq.length ()); - for (::DDS_Long i = 0; i < seq.length (); ++i) - { - ddsseq[i] = seq[i]; - } -} - -inline void -operator<<= (::DDS_OctetSeq &ddsseq, const ::DDS::OctetSeq & seq) -{ - ddsseq.length (seq.length ()); - for (::CORBA::ULong i = 0; i < seq.length (); ++i) - { - ddsseq[i] = seq[i]; - } -} - -#endif /* DDS4CCM_OCTETSEQ_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h deleted file mode 100644 index 3173c98e231..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h +++ /dev/null @@ -1,78 +0,0 @@ -/** - * @author Marcel Smit <msmit@remedy.nl> - * - * $Id$ - * - */ - -#ifndef SUBSCRIPTIONBUILTINTOPICDATA_H_ -#define SUBSCRIPTIONBUILTINTOPICDATA_H_ - -#include "BuiltinTopicKey_t.h" -#include "DurabilityQosPolicy.h" -#include "DeadlineQosPolicy.h" -#include "LatencyBudgetQosPolicy.h" -#include "LivelinessQosPolicy.h" -#include "ReliabilityQosPolicy.h" -#include "OwnershipQosPolicy.h" -#include "OwnershipStrengthQosPolicy.h" -#include "DestinationOrderQosPolicy.h" -#include "UserDataQosPolicy.h" -#include "TimeBasedFilterQosPolicy.h" -#include "PresentationQosPolicy.h" -#include "PartitionQosPolicy.h" -#include "TopicDataQosPolicy.h" -#include "GroupDataQosPolicy.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::SubscriptionBuiltinTopicData &ddstopicdata, const ::DDS_SubscriptionBuiltinTopicData & topicdata) -{ - ddstopicdata.key <<= topicdata.key; - ddstopicdata.participant_key <<= topicdata.participant_key; - ddstopicdata.topic_name = topicdata.topic_name; - ddstopicdata.type_name = topicdata.type_name; - - ddstopicdata.durability <<= topicdata.durability; - ddstopicdata.deadline <<= topicdata.deadline; - ddstopicdata.latency_budget <<= topicdata.latency_budget; - ddstopicdata.liveliness <<= topicdata.liveliness; - ddstopicdata.reliability <<= topicdata.reliability; - ddstopicdata.ownership <<= topicdata.ownership; - ddstopicdata.destination_order <<= topicdata.destination_order; - ddstopicdata.user_data <<= topicdata.user_data; - ddstopicdata.time_based_filter <<= topicdata.time_based_filter; - - ddstopicdata.presentation <<= topicdata.presentation; - ddstopicdata.partition <<= topicdata.partition; - ddstopicdata.topic_data <<= topicdata.topic_data; - ddstopicdata.group_data <<= topicdata.group_data; -} - -inline void -operator<<= (::DDS_SubscriptionBuiltinTopicData & ddstopicdata, const ::DDS::SubscriptionBuiltinTopicData & topicdata) -{ - ddstopicdata.key <<= topicdata.key; - ddstopicdata.participant_key <<= topicdata.participant_key; - ddstopicdata.topic_name = CORBA::string_dup (topicdata.topic_name); - ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name); - - ddstopicdata.durability <<= topicdata.durability; - ddstopicdata.deadline <<= topicdata.deadline; - ddstopicdata.latency_budget <<= topicdata.latency_budget; - ddstopicdata.liveliness <<= topicdata.liveliness; - ddstopicdata.reliability <<= topicdata.reliability; - ddstopicdata.ownership <<= topicdata.ownership; - ddstopicdata.destination_order <<= topicdata.destination_order; - ddstopicdata.user_data <<= topicdata.user_data; - ddstopicdata.time_based_filter <<= topicdata.time_based_filter; - - ddstopicdata.presentation <<= topicdata.presentation; - ddstopicdata.partition <<= topicdata.partition; - ddstopicdata.topic_data <<= topicdata.topic_data; - ddstopicdata.group_data <<= topicdata.group_data; -} - -#endif - -#endif /* SUBSCRIPTIONBUILTINTOPICDATA_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h deleted file mode 100644 index cd2463ed535..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @author Johnny Willemsen <jwillemsen@remedy.nl> - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_USERDATAQOSPOLICY_H -#define DDS4CCM_USERDATAQOSPOLICY_H - -#include "OctetSeq.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::UserDataQosPolicy DDS_UserDataQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::UserDataQosPolicy &ddsqos, const ::DDS_UserDataQosPolicy & qos) -{ - ddsqos.value <<= qos.value; -} - -inline void -operator<<= (::DDS_UserDataQosPolicy &ddsqos, const ::DDS::UserDataQosPolicy & qos) -{ - ddsqos.value <<= qos.value; -} - -#endif - -#endif /* DDS4CCM_USERDATAQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h b/CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h index 1f4b4fd18b4..3c12b7008f9 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h @@ -21,6 +21,18 @@ operator<<= (::DDS_BuiltinTopicKey_t &ddsbuiltintopickey, const ::DDS::BuiltinTo ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value)); } +inline void +operator>>= (const ::DDS_BuiltinTopicKey_t &builtintopickey, ::DDS::BuiltinTopicKey_t & ddsbuiltintopickey) +{ + ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value)); +} + +inline void +operator>>= (const ::DDS::BuiltinTopicKey_t &builtintopickey, ::DDS_BuiltinTopicKey_t & ddsbuiltintopickey) +{ + ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value)); +} + #endif #endif /* BUILTINTOPICKEY_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp index 2a2a0597606..9fd0fd752f2 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp @@ -1,5 +1,5 @@ // $Id$ -#include "dds4ccm/impl/dds/Coherent_Changes_Guard.h" +#include "dds4ccm/impl/ndds/Coherent_Changes_Guard.h" CIAO::DDS4CCM::Coherent_Changes_Guard::Coherent_Changes_Guard (DDSPublisher* p, bool coherent_write) : p_ (p), coherent_write_ (coherent_write) { diff --git a/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h index 77a4a55d986..8a02245aed1 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h @@ -11,7 +11,7 @@ #define _CIAO_COHERENT_CHANGES_GUARD #include "ace/Copy_Disabled.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) # include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp index 2a17f8d2118..9bdfb36e72d 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp @@ -2,8 +2,7 @@ #include "ContentFilteredTopic.h" #include "Topic.h" - -#include "ndds/StringSeq.h" +#include "StringSeq.h" #include "dds4ccm/impl/logger/Log_Macros.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.h b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h index 56633f14a97..13208ca50e4 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h @@ -12,7 +12,7 @@ #include "DomainParticipant.h" #include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #include "tao/LocalObject.h" #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS4CCM_Traits.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h index 5e4fcb003a4..5e4fcb003a4 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS4CCM_Traits.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp index e464fd0d680..4cd20753f9f 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/DDSCallbackStatusHandler.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/DDSCallbackStatusHandler.h" #include "dds4ccm/impl/logger/Log_Macros.h" //============================================================ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.h b/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.h index b2d7d525001..b2d7d525001 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.h diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp index 9dbf4ae0eb2..2b28c2ac952 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp @@ -2,8 +2,8 @@ // $Id$ #include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds/DomainParticipantFactory.h" -#include "dds4ccm/impl/dds/DomainParticipant.h" +#include "dds4ccm/impl/ndds/DomainParticipantFactory.h" +#include "dds4ccm/impl/ndds/DomainParticipant.h" #include "ace/Tokenizer_T.h" #include "ace/Env_Value_T.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h index 465aed09079..cb798ddf337 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h @@ -9,7 +9,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsC.h" #include "ace/Copy_Disabled.h" #include "tao/LocalObject.h" -#include "dds4ccm/impl/dds/DomainParticipantListener_T.h" +#include "dds4ccm/impl/ndds/DomainParticipantListener_T.h" template <typename DDS_TYPE, typename CCM_TYPE> class DDS_Base_Connector_T @@ -54,6 +54,6 @@ protected: typedef ::CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE> DomainParticipantListener; }; -#include "dds4ccm/impl/dds/DDS_Base_Connector_T.cpp" +#include "dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp" #endif /* CONNECTOR_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp index beea24946bc..a5cad0cbda6 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp @@ -1,13 +1,13 @@ // -*- C++ -*- // $Id$ -#include "dds4ccm/impl/dds/DataReaderListener_T.h" -#include "dds4ccm/impl/dds/DataWriterListener_T.h" -#include "dds4ccm/impl/dds/Writer_T.h" -#include "dds4ccm/impl/dds/Getter_T.h" -#include "dds4ccm/impl/dds/Reader_T.h" -#include "dds4ccm/impl/dds/DataListenerControl_T.h" -#include "dds4ccm/impl/dds/PortStatusListener_T.h" +#include "dds4ccm/impl/ndds/DataReaderListener_T.h" +#include "dds4ccm/impl/ndds/DataWriterListener_T.h" +#include "dds4ccm/impl/ndds/Writer_T.h" +#include "dds4ccm/impl/ndds/Getter_T.h" +#include "dds4ccm/impl/ndds/Reader_T.h" +#include "dds4ccm/impl/ndds/DataListenerControl_T.h" +#include "dds4ccm/impl/ndds/PortStatusListener_T.h" #include "dds4ccm/impl/logger/Log_Macros.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h index c96a1949ee4..e58317060cb 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h @@ -8,10 +8,10 @@ #ifndef DDS_EVENT_CONNECTOR_T_H_ #define DDS_EVENT_CONNECTOR_T_H_ -#include "dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h" -#include "dds4ccm/impl/dds/DDS_Get_T.h" -#include "dds4ccm/impl/dds/DDS_Write_T.h" -#include "dds4ccm/impl/dds/DDS_Listen_T.h" +#include "dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h" +#include "dds4ccm/impl/ndds/DDS_Get_T.h" +#include "dds4ccm/impl/ndds/DDS_Write_T.h" +#include "dds4ccm/impl/ndds/DDS_Listen_T.h" template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED> class DDS_Event_Connector_T @@ -84,6 +84,6 @@ private: //@} }; -#include "dds4ccm/impl/dds/DDS_Event_Connector_T.cpp" +#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp" #endif /* DDS_EVENT_CONNECTOR_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp index 0fa0f62cf26..e65491d078d 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp @@ -1,16 +1,16 @@ // -*- C++ -*- // $Id$ -#include "dds4ccm/impl/dds/DataReaderListener_T.h" -#include "dds4ccm/impl/dds/DataWriterListener_T.h" -#include "dds4ccm/impl/dds/Reader_T.h" -#include "dds4ccm/impl/dds/DataListenerControl_T.h" +#include "dds4ccm/impl/ndds/DataReaderListener_T.h" +#include "dds4ccm/impl/ndds/DataWriterListener_T.h" +#include "dds4ccm/impl/ndds/Reader_T.h" +#include "dds4ccm/impl/ndds/DataListenerControl_T.h" #include "dds4ccm/impl/logger/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED> DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::DDS_Get_T (void) : - ccm_dds_reader_ (0) + rti_reader_ (0) { } @@ -54,7 +54,7 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete ( } ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd = dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ()); - this->ccm_dds_reader_.set_impl (rd->get_impl ()); + this->rti_reader_.set_impl (rd->get_impl ()); this->data_reader_ = ::DDS::CCM_DataReader::_narrow (reader); this->dds_get_.set_impl (reader); this->dds_read_.set_impl (reader); @@ -83,7 +83,7 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::activate ( PortStatusListener (listener, reactor), CORBA::NO_MEMORY ()); } - this->ccm_dds_reader_.set_listener ( + this->rti_reader_.set_listener ( this->status_.in (), ::CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( listener)); @@ -103,7 +103,7 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::passivate (void) try { this->dds_get_.passivate (); - this->ccm_dds_reader_.set_listener ( + this->rti_reader_.set_listener ( ::DDS::DataReaderListener::_nil (), 0); this->status_ = ::DDS::DataReaderListener::_nil (); @@ -127,7 +127,7 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::remove ( this->data_reader_ = ::DDS::CCM_DataReader::_nil (); this->dds_get_.set_impl (0); this->dds_read_.set_impl (0); - this->ccm_dds_reader_.set_impl (0); + this->rti_reader_.set_impl (0); } catch (...) { @@ -160,6 +160,6 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::get_dds_entity (void) { DDS4CCM_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::get_dds_entity"); - return &this->ccm_dds_reader_; + return &this->rti_reader_; } diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h index 9845792da54..3ed0f519fe8 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h @@ -9,9 +9,9 @@ #define DDS_GET_T_H_ #include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/Reader_T.h" -#include "dds4ccm/impl/dds/Getter_T.h" -#include "dds4ccm/impl/dds/PortStatusListener_T.h" +#include "dds4ccm/impl/ndds/Reader_T.h" +#include "dds4ccm/impl/ndds/Getter_T.h" +#include "dds4ccm/impl/ndds/PortStatusListener_T.h" template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED> class DDS_Get_T @@ -53,14 +53,14 @@ private: //@{ ::DDS::CCM_DataReader_var data_reader_; ::DDS::DataReaderListener_var status_; - ::CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, FIXED> dds_get_; - ::CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_; - ::CIAO::DDS4CCM::CCM_DDS_DataReader_i ccm_dds_reader_; + ::CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, FIXED> dds_get_; + ::CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_; + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_; //@} typedef ::CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE> PortStatusListener; }; -#include "dds4ccm/impl/dds/DDS_Get_T.cpp" +#include "dds4ccm/impl/ndds/DDS_Get_T.cpp" #endif /* DDS_GET_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp index 034fa2d99d0..afdabd65774 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp @@ -1,15 +1,15 @@ // -*- C++ -*- // $Id$ -#include "dds4ccm/impl/dds/DataReaderListener_T.h" -#include "dds4ccm/impl/dds/DataWriterListener_T.h" -#include "dds4ccm/impl/dds/Writer_T.h" -#include "dds4ccm/impl/dds/Getter_T.h" -#include "dds4ccm/impl/dds/Reader_T.h" -#include "dds4ccm/impl/dds/DataReader.h" -#include "dds4ccm/impl/dds/Topic.h" -#include "dds4ccm/impl/dds/DataListenerControl_T.h" -#include "dds4ccm/impl/dds/PortStatusListener_T.h" +#include "dds4ccm/impl/ndds/DataReaderListener_T.h" +#include "dds4ccm/impl/ndds/DataWriterListener_T.h" +#include "dds4ccm/impl/ndds/Writer_T.h" +#include "dds4ccm/impl/ndds/Getter_T.h" +#include "dds4ccm/impl/ndds/Reader_T.h" +#include "dds4ccm/impl/ndds/DataReader.h" +#include "dds4ccm/impl/ndds/Topic.h" +#include "dds4ccm/impl/ndds/DataListenerControl_T.h" +#include "dds4ccm/impl/ndds/PortStatusListener_T.h" #include "dds4ccm/impl/logger/Log_Macros.h" @@ -17,7 +17,7 @@ template <typename DDS_TYPE, typename CCM_TYPE> DDS_Listen_T<DDS_TYPE, CCM_TYPE>::DDS_Listen_T (void) : data_control_ (new CCM_DDS_DataListenerControl_T < ::CCM_DDS::CCM_DataListenerControl> ()), - ccm_dds_reader_ (0) + rti_reader_ (0) { } @@ -61,7 +61,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( } ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd = dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ()); - this->ccm_dds_reader_.set_impl (rd->get_impl ()); + this->rti_reader_.set_impl (rd->get_impl ()); this->data_reader_ = ::DDS::CCM_DataReader::_narrow (reader); this->dds_read_.set_impl (this->data_reader_.in ()); this->dds_read_.set_qos (topic, library_name, profile_name); @@ -94,7 +94,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::activate ( reactor), CORBA::NO_MEMORY ()); } - this->ccm_dds_reader_.set_listener ( + this->rti_reader_.set_listener ( this->data_listener_.in (), ::CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( listener)); @@ -113,7 +113,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::passivate () DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::passivate"); try { - this->ccm_dds_reader_.set_listener ( + this->rti_reader_.set_listener ( ::DDS::DataReaderListener::_nil (), 0); this->data_listener_= ::DDS::DataReaderListener::_nil (); @@ -134,7 +134,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::remove ( try { subscriber->delete_datareader (this->data_reader_.in ()); - this->ccm_dds_reader_.set_impl (0); + this->rti_reader_.set_impl (0); this->data_reader_ = ::DDS::CCM_DataReader::_nil (); this->dds_read_.set_impl (0); } @@ -161,7 +161,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::get_dds_entity (void) { DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::get_dds_entity"); - return &this->ccm_dds_reader_; + return &this->rti_reader_; } template <typename DDS_TYPE, typename CCM_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h index bc1e0dd8c17..1787e9319db 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h @@ -55,12 +55,12 @@ private: ::DDS::CCM_DataReader_var data_reader_; ::CCM_DDS::CCM_DataListenerControl_var data_control_; ::DDS::DataReaderListener_var data_listener_; - ::CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_; - ::CIAO::DDS4CCM::CCM_DDS_DataReader_i ccm_dds_reader_; + ::CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_; + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_; //@} typedef ::CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE> DataReaderListener; }; -#include "dds4ccm/impl/dds/DDS_Listen_T.cpp" +#include "dds4ccm/impl/ndds/DDS_Listen_T.cpp" #endif /* DDS_LISTEN_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp index 73f7a0df299..9de3be9e328 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp @@ -1,18 +1,18 @@ // -*- C++ -*- // $Id$ -#include "dds4ccm/impl/dds/DataReaderListener_T.h" -#include "dds4ccm/impl/dds/DataWriterListener_T.h" -#include "dds4ccm/impl/dds/Writer_T.h" -#include "dds4ccm/impl/dds/Reader_T.h" -#include "dds4ccm/impl/dds/DataListenerControl_T.h" -#include "dds4ccm/impl/dds/PortStatusListener_T.h" +#include "dds4ccm/impl/ndds/DataReaderListener_T.h" +#include "dds4ccm/impl/ndds/DataWriterListener_T.h" +#include "dds4ccm/impl/ndds/Writer_T.h" +#include "dds4ccm/impl/ndds/Reader_T.h" +#include "dds4ccm/impl/ndds/DataListenerControl_T.h" +#include "dds4ccm/impl/ndds/PortStatusListener_T.h" #include "dds4ccm/impl/logger/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE> DDS_Read_T<DDS_TYPE, CCM_TYPE>::DDS_Read_T (void) : - ccm_dds_reader_ (0) + rti_reader_ (0) { } @@ -56,7 +56,7 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( } ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd = dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ()); - this->ccm_dds_reader_.set_impl (rd->get_impl ()); + this->rti_reader_.set_impl (rd->get_impl ()); this->data_ = ::DDS::CCM_DataReader::_narrow (reader); this->dds_read_.set_impl (reader); this->dds_read_.set_qos (topic, library_name, profile_name); @@ -85,7 +85,7 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::activate ( PortStatusListener (listener, reactor), CORBA::NO_MEMORY ()); } - this->ccm_dds_reader_.set_listener ( + this->rti_reader_.set_listener ( this->status_.in (), ::CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( listener)); @@ -105,7 +105,7 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::passivate () try { - this->ccm_dds_reader_.set_listener (::DDS::DataReaderListener::_nil (), 0); + this->rti_reader_.set_listener (::DDS::DataReaderListener::_nil (), 0); this->status_ = ::DDS::DataReaderListener::_nil (); } catch (...) @@ -125,7 +125,7 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::remove ( try { subscriber->delete_datareader (this->data_.in ()); - this->ccm_dds_reader_.set_impl (0); + this->rti_reader_.set_impl (0); this->data_ = ::DDS::CCM_DataReader::_nil (); this->dds_read_.set_impl (0); } @@ -151,6 +151,6 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_dds_entity (void) { DDS4CCM_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_dds_entity"); - return &this->ccm_dds_reader_; + return &this->rti_reader_; } diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h index d1d39a1a68f..54ce6b30926 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h @@ -49,12 +49,12 @@ private: //@{ ::DDS::CCM_DataReader_var data_; ::DDS::DataReaderListener_var status_; - ::CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_; - ::CIAO::DDS4CCM::CCM_DDS_DataReader_i ccm_dds_reader_; + ::CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_; + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_; //@} typedef ::CIAO::DDS4CCM::PortStatusListener_T <DDS_TYPE, CCM_TYPE> PortStatusListener; }; -#include "dds4ccm/impl/dds/DDS_Read_T.cpp" +#include "dds4ccm/impl/ndds/DDS_Read_T.cpp" #endif /* DDS_READ_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp index 0174e5f7e50..01acfc8df28 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp @@ -1,10 +1,10 @@ // -*- C++ -*- // $Id$ -#include "dds4ccm/impl/dds/DataReaderStateListener_T.h" -#include "dds4ccm/impl/dds/Reader_T.h" -#include "dds4ccm/impl/dds/StateListenerControl_T.h" -#include "dds4ccm/impl/dds/PortStatusListener_T.h" +#include "dds4ccm/impl/ndds/DataReaderStateListener_T.h" +#include "dds4ccm/impl/ndds/Reader_T.h" +#include "dds4ccm/impl/ndds/StateListenerControl_T.h" +#include "dds4ccm/impl/ndds/PortStatusListener_T.h" #include "dds4ccm/impl/logger/Log_Macros.h" @@ -12,7 +12,7 @@ template <typename DDS_TYPE, typename CCM_TYPE> DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::DDS_StateListen_T (void) : data_control_ (new CCM_DDS_StateListenerControl_T < ::CCM_DDS::CCM_StateListenerControl> ()), - ccm_dds_reader_ (0) + rti_reader_ (0) { } @@ -56,7 +56,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( } ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd = dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ()); - this->ccm_dds_reader_.set_impl (rd->get_impl ()); + this->rti_reader_.set_impl (rd->get_impl ()); this->data_reader_ = ::DDS::CCM_DataReader::_narrow (reader); this->dds_read_.set_impl (this->data_reader_.in ()); } @@ -89,7 +89,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::activate ( reactor), CORBA::NO_MEMORY ()); } - this->ccm_dds_reader_.set_listener ( + this->rti_reader_.set_listener ( this->data_listener_.in (), ::CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( listener)); @@ -108,7 +108,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::passivate (void) DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::passivate"); try { - this->ccm_dds_reader_.set_listener ( + this->rti_reader_.set_listener ( ::DDS::DataReaderListener::_nil (), 0); this->data_listener_ = ::DDS::DataReaderListener::_nil (); @@ -129,7 +129,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::remove ( try { subscriber->delete_datareader (this->data_reader_.in ()); - this->ccm_dds_reader_.set_impl (0); + this->rti_reader_.set_impl (0); this->data_reader_ = ::DDS::CCM_DataReader::_nil (); this->dds_read_.set_impl (0); } @@ -155,7 +155,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::get_dds_entity (void) { DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::get_dds_entity"); - return &this->ccm_dds_reader_; + return &this->rti_reader_; } template <typename DDS_TYPE, typename CCM_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h index b785716fba9..2692ccd3bf5 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h @@ -52,12 +52,12 @@ private: ::DDS::CCM_DataReader_var data_reader_; ::CCM_DDS::CCM_StateListenerControl_var data_control_; ::DDS::DataReaderListener_var data_listener_; - ::CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_; - ::CIAO::DDS4CCM::CCM_DDS_DataReader_i ccm_dds_reader_; + ::CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_; + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_; //@} typedef ::CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE> DataReaderStateListener; }; -#include "dds4ccm/impl/dds/DDS_StateListen_T.cpp" +#include "dds4ccm/impl/ndds/DDS_StateListen_T.cpp" #endif /* DDS_STATELISTEN_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp index 76f9a1d63e5..7bd64199729 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp @@ -1,15 +1,15 @@ // -*- C++ -*- // $Id$ -#include "dds4ccm/impl/dds/DataReaderStateListener_T.h" -#include "dds4ccm/impl/dds/DataWriterListener_T.h" -#include "dds4ccm/impl/dds/Updater_T.h" -#include "dds4ccm/impl/dds/Reader_T.h" -#include "dds4ccm/impl/dds/PublisherListener_T.h" -#include "dds4ccm/impl/dds/SubscriberListener_T.h" -#include "dds4ccm/impl/dds/DataListenerControl_T.h" -#include "dds4ccm/impl/dds/StateListenerControl_T.h" -#include "dds4ccm/impl/dds/PortStatusListener_T.h" +#include "dds4ccm/impl/ndds/DataReaderStateListener_T.h" +#include "dds4ccm/impl/ndds/DataWriterListener_T.h" +#include "dds4ccm/impl/ndds/Updater_T.h" +#include "dds4ccm/impl/ndds/Reader_T.h" +#include "dds4ccm/impl/ndds/PublisherListener_T.h" +#include "dds4ccm/impl/ndds/SubscriberListener_T.h" +#include "dds4ccm/impl/ndds/DataListenerControl_T.h" +#include "dds4ccm/impl/ndds/StateListenerControl_T.h" +#include "dds4ccm/impl/ndds/PortStatusListener_T.h" #include "dds4ccm/impl/logger/Log_Macros.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h index 042dafc36e7..89cacaf4a5b 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h @@ -8,12 +8,12 @@ #ifndef DDS_STATE_CONNECTOR_T_H_ #define DDS_STATE_CONNECTOR_T_H_ -#include "dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h" -#include "dds4ccm/impl/dds/DDS_Get_T.h" -#include "dds4ccm/impl/dds/DDS_Listen_T.h" -#include "dds4ccm/impl/dds/DDS_StateListen_T.h" -#include "dds4ccm/impl/dds/DDS_Update_T.h" -#include "dds4ccm/impl/dds/DDS_Read_T.h" +#include "dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h" +#include "dds4ccm/impl/ndds/DDS_Get_T.h" +#include "dds4ccm/impl/ndds/DDS_Listen_T.h" +#include "dds4ccm/impl/ndds/DDS_StateListen_T.h" +#include "dds4ccm/impl/ndds/DDS_Update_T.h" +#include "dds4ccm/impl/ndds/DDS_Read_T.h" template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED> class DDS_State_Connector_T @@ -105,6 +105,6 @@ private: //@} }; -#include "dds4ccm/impl/dds/DDS_State_Connector_T.cpp" +#include "dds4ccm/impl/ndds/DDS_State_Connector_T.cpp" #endif /* DDS_STATE_CONNECTOR_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp index 5fb5b21411d..5fb5b21411d 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h index 1e9416252dd..69af82224f6 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h @@ -9,10 +9,10 @@ #define DDS_TOPIC_BASE_CONNECTOR_H #include "ace/Copy_Disabled.h" -#include "dds4ccm/impl/dds/DDS_Base_Connector_T.h" -#include "dds4ccm/impl/dds/TopicListener_T.h" -#include "dds4ccm/impl/dds/PublisherListener_T.h" -#include "dds4ccm/impl/dds/SubscriberListener_T.h" +#include "dds4ccm/impl/ndds/DDS_Base_Connector_T.h" +#include "dds4ccm/impl/ndds/TopicListener_T.h" +#include "dds4ccm/impl/ndds/PublisherListener_T.h" +#include "dds4ccm/impl/ndds/SubscriberListener_T.h" template <typename DDS_TYPE, typename CCM_TYPE> class DDS_TopicBase_Connector_T @@ -68,6 +68,6 @@ typedef ::CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE> SubscriberList typedef ::CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE> PublisherListener; }; -#include "dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp" +#include "dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp" #endif /* DDS_TOPIC_BASE_CONNECTOR_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp index c772f4fd8a9..9d36a15099b 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp @@ -1,16 +1,16 @@ // -*- C++ -*- // $Id$ -#include "dds4ccm/impl/dds/DataReaderStateListener_T.h" -#include "dds4ccm/impl/dds/DataWriterListener_T.h" -#include "dds4ccm/impl/dds/Updater_T.h" -#include "dds4ccm/impl/dds/DataWriter.h" +#include "dds4ccm/impl/ndds/DataReaderStateListener_T.h" +#include "dds4ccm/impl/ndds/DataWriterListener_T.h" +#include "dds4ccm/impl/ndds/Updater_T.h" +#include "dds4ccm/impl/ndds/DataWriter.h" #include "dds4ccm/impl/logger/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE> DDS_Update_T<DDS_TYPE, CCM_TYPE>::DDS_Update_T (void) : - ccm_dds_writer_ (0) + rti_writer_ (0) { } @@ -53,7 +53,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( } ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rw = dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dwv_tmp.in ()); - this->ccm_dds_writer_.set_impl (rw->get_impl ()); + this->rti_writer_.set_impl (rw->get_impl ()); this->data_writer_ = ::DDS::CCM_DataWriter::_narrow (dwv_tmp); this->dds_update_.set_impl (dwv_tmp); } @@ -78,7 +78,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::activate () DataWriterListener (), CORBA::NO_MEMORY ()); } - this->ccm_dds_writer_.set_listener ( + this->rti_writer_.set_listener ( this->data_listener_.in (), ::CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::get_mask ()); } @@ -96,7 +96,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::passivate () DDS4CCM_TRACE ("DDS_Update_T<DDS_TYPE, CCM_TYPE>::passivate"); try { - this->ccm_dds_writer_.set_listener ( + this->rti_writer_.set_listener ( ::DDS::DataWriterListener::_nil (), 0); this->data_listener_ = ::DDS::DataWriterListener::_nil (); @@ -117,7 +117,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::remove ( try { publisher->delete_datawriter (this->data_writer_.in ()); - this->ccm_dds_writer_.set_impl (0); + this->rti_writer_.set_impl (0); this->data_writer_ = ::DDS::CCM_DataWriter::_nil (); this->dds_update_.set_impl (0); } @@ -139,6 +139,6 @@ template <typename DDS_TYPE, typename CCM_TYPE> ::DDS::CCM_DataWriter_ptr DDS_Update_T<DDS_TYPE, CCM_TYPE>::get_dds_entity (void) { - return &this->ccm_dds_writer_; + return &this->rti_writer_; } diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h index c6c70235121..0aa579e9446 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h @@ -8,7 +8,7 @@ #ifndef DDS_UPDATE_T_H #define DDS_UPDATE_T_H -#include "dds4ccm/impl/dds/Updater_T.h" +#include "dds4ccm/impl/ndds/Updater_T.h" template <typename DDS_TYPE, typename CCM_TYPE> class DDS_Update_T @@ -42,11 +42,11 @@ private: ::DDS::CCM_DataWriter_var data_writer_; ::DDS::DataWriterListener_var data_listener_; ::CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE> dds_update_; - ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i ccm_dds_writer_; + ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i rti_writer_; //@} typedef ::CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE> DataWriterListener; }; -#include "dds4ccm/impl/dds/DDS_Update_T.cpp" +#include "dds4ccm/impl/ndds/DDS_Update_T.cpp" #endif /* DDS_UPDATE_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp index f628d5a9829..4f0b6fdf0bb 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp @@ -1,10 +1,10 @@ // -*- C++ -*- // $Id$ -#include "dds4ccm/impl/dds/DataReaderListener_T.h" -#include "dds4ccm/impl/dds/DataWriterListener_T.h" -#include "dds4ccm/impl/dds/DataListenerControl_T.h" -#include "dds4ccm/impl/dds/PortStatusListener_T.h" +#include "dds4ccm/impl/ndds/DataReaderListener_T.h" +#include "dds4ccm/impl/ndds/DataWriterListener_T.h" +#include "dds4ccm/impl/ndds/DataListenerControl_T.h" +#include "dds4ccm/impl/ndds/PortStatusListener_T.h" #include "dds4ccm/impl/logger/Log_Macros.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h index 5df2f64f3c6..d42f824e608 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h @@ -8,8 +8,8 @@ #ifndef DDS_WRITE_T_H_ #define DDS_WRITE_T_H_ -#include "dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h" -#include "dds4ccm/impl/dds/Writer_T.h" +#include "dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h" +#include "dds4ccm/impl/ndds/Writer_T.h" template <typename DDS_TYPE, typename CCM_TYPE> class DDS_Write_T @@ -55,6 +55,6 @@ private: typedef ::CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE> DataWriterListener; }; -#include "dds4ccm/impl/dds/DDS_Write_T.cpp" +#include "dds4ccm/impl/ndds/DDS_Write_T.cpp" #endif /* DDS_WRITE_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp index 627cec340b4..627cec340b4 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.h index 50630e7221a..c0aa0db8272 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.h @@ -42,7 +42,7 @@ protected: ACE_Atomic_Op <TAO_SYNCH_MUTEX, ::CCM_DDS::DataNumber_t> max_delivered_data_; }; -#include "dds4ccm/impl/dds/DataListenerControl_T.cpp" +#include "dds4ccm/impl/ndds/DataListenerControl_T.cpp" #endif /* DDS4CCM_DATALISTENERCONTROLI_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp index 1208e9489cd..d7d963d912d 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp @@ -5,21 +5,20 @@ #include "StatusCondition.h" #include "ReadCondition.h" #include "QueryCondition.h" +#include "SampleLostStatus.h" +#include "SubscriptionMatchedStatus.h" +#include "RequestedDeadlineMissedStatus.h" +#include "SampleRejectedStatus.h" +#include "LivelinessChangedStatus.h" +#include "PublicationBuiltinTopicData.h" +#include "RequestedIncompatibleQosStatus.h" +#include "Duration_t.h" +#include "InstanceHandle_t.h" +#include "InstanceHandleSeq.h" #include "Subscriber.h" #include "TopicDescription.h" - -#include "ndds/SampleLostStatus.h" -#include "ndds/SubscriptionMatchedStatus.h" -#include "ndds/RequestedDeadlineMissedStatus.h" -#include "ndds/SampleRejectedStatus.h" -#include "ndds/LivelinessChangedStatus.h" -#include "ndds/PublicationBuiltinTopicData.h" -#include "ndds/RequestedIncompatibleQosStatus.h" -#include "ndds/Duration_t.h" -#include "ndds/InstanceHandle_t.h" -#include "ndds/InstanceHandleSeq.h" -#include "ndds/DataReaderQos.h" -#include "ndds/StringSeq.h" +#include "DataReaderQos.h" +#include "StringSeq.h" #include "dds4ccm/impl/logger/Log_Macros.h" @@ -212,14 +211,14 @@ namespace CIAO DDS4CCM_TRACE ("CCM_DDS_DataReader_i::set_listener"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_DataReaderListener_i *ccm_dds_drl = 0; + CCM_DDS_DataReaderListener_i *rti_drl = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_drl, + ACE_NEW_THROW_EX (rti_drl, CCM_DDS_DataReaderListener_i (a_listener), CORBA::NO_MEMORY ()); } - return this->impl ()->set_listener (ccm_dds_drl, mask); + return this->impl ()->set_listener (rti_drl, mask); #else return this->impl ()->set_listener (a_listener, mask); #endif @@ -232,14 +231,14 @@ namespace CIAO #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) DDSDataReaderListener *drl = this->impl ()->get_listener (); - CCM_DDS_DataReaderListener_i *ccm_dds_drl = dynamic_cast <CCM_DDS_DataReaderListener_i *> (drl); - if (!ccm_dds_drl) + CCM_DDS_DataReaderListener_i *rti_drl = dynamic_cast <CCM_DDS_DataReaderListener_i *> (drl); + if (!rti_drl) { DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DataReader_i::get_listener - " "DDS returned a NIL listener.\n")); return ::DDS::DataReaderListener::_nil (); } - return ccm_dds_drl->get_datareaderlistener (); + return rti_drl->get_datareaderlistener (); #else return this->impl ()->get_listener (); #endif @@ -286,9 +285,9 @@ namespace CIAO ::DDS::SampleRejectedStatus & status) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_SampleRejectedStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_rejected_status (ddsstatus); - status <<= ddsstatus; + DDS_SampleRejectedStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_rejected_status (rtistatus); + rtistatus >>= status; return retval; #else return this->impl ()->get_sample_rejected_status (status); @@ -300,9 +299,9 @@ namespace CIAO ::DDS::LivelinessChangedStatus & status) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_LivelinessChangedStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_changed_status (ddsstatus); - status <<= ddsstatus; + DDS_LivelinessChangedStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_changed_status (rtistatus); + rtistatus >>= status; return retval; #else return this->impl ()->get_liveliness_changed_status (status); @@ -314,9 +313,9 @@ namespace CIAO ::DDS::RequestedDeadlineMissedStatus & status) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_RequestedDeadlineMissedStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_deadline_missed_status (ddsstatus); - status <<= ddsstatus; + DDS_RequestedDeadlineMissedStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_deadline_missed_status (rtistatus); + rtistatus >>= status; return retval; #else return this->impl ()->get_requested_deadline_missed_status (status); @@ -328,9 +327,9 @@ namespace CIAO ::DDS::RequestedIncompatibleQosStatus & status) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_RequestedIncompatibleQosStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_incompatible_qos_status (ddsstatus); - status <<= ddsstatus; + DDS_RequestedIncompatibleQosStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_incompatible_qos_status (rtistatus); + rtistatus >>= status; return retval; #else return this->impl ()->get_requested_incompatible_qos_status (status); @@ -344,7 +343,7 @@ namespace CIAO #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) ::DDS_SubscriptionMatchedStatus ddsstatus; ::DDS::ReturnCode_t const retval = this->impl ()->get_subscription_matched_status (ddsstatus); - status <<= ddsstatus; + ddsstatus >>= status; return retval; #else return this->impl ()->get_subscription_matched_status (status); @@ -356,9 +355,9 @@ namespace CIAO ::DDS::SampleLostStatus & status) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_SampleLostStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_lost_status (ddsstatus); - status <<= ddsstatus; + DDS_SampleLostStatus rtistatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_lost_status (rtistatus); + rtistatus >>= status; return retval; #else return this->impl ()->get_sample_lost_status (status); @@ -382,11 +381,10 @@ namespace CIAO CCM_DDS_DataReader_i::get_matched_publications ( ::DDS::InstanceHandleSeq & publication_handles) { - DDS4CCM_TRACE ("CCM_DDS_DataReader_i::get_matched_publications"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) ::DDS_InstanceHandleSeq rtiseq; ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_publications (rtiseq); - publication_handles <<= rtiseq; + rtiseq >>= publication_handles; return retval; #else return this->impl ()->get_matched_publications (publication_handles); @@ -399,15 +397,15 @@ namespace CIAO DDS_INSTANCE_HANDLE_T_IN publication_handle) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_PublicationBuiltinTopicData ccm_dds_pub_data; - ::DDS_InstanceHandle_t ccm_dds_pub_handle; + ::DDS_PublicationBuiltinTopicData rti_pub_data; + ::DDS_InstanceHandle_t rti_pub_handle; - ccm_dds_pub_data <<= publication_data; - ccm_dds_pub_handle <<= publication_handle; + rti_pub_data <<= publication_data; + rti_pub_handle <<= publication_handle; ::DDS::ReturnCode_t const retcode = this->impl()-> - get_matched_publication_data (ccm_dds_pub_data, - ccm_dds_pub_handle); - publication_data <<= ccm_dds_pub_data; + get_matched_publication_data (rti_pub_data, + rti_pub_handle); + rti_pub_data >>= publication_data; return retcode; #else return this->impl ()->get_matched_publication_data (publication_data, publication_handle); diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReader.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h index 11b959c04f5..74648685770 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReader.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h @@ -14,8 +14,8 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" -#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/InstanceHandle_t.h" #include "tao/LocalObject.h" #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp index c7f51f3a2d6..5b4e276f614 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" -#include "dds4ccm/impl/dds/DataReader.h" +#include "dds4ccm/impl/ndds/DataReader.h" #include "dds4ccm/impl/logger/Log_Macros.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h index 44d96bc24c2..929f9cea0df 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h @@ -58,6 +58,6 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/DataReaderHandler_T.cpp" +#include "dds4ccm/impl/ndds/DataReaderHandler_T.cpp" #endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp index 4cf709b1222..f1f177e8801 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp @@ -2,13 +2,12 @@ #include "DataReaderListener.h" #include "DataReader.h" - -#include "ndds/SampleLostStatus.h" -#include "ndds/SubscriptionMatchedStatus.h" -#include "ndds/RequestedDeadlineMissedStatus.h" -#include "ndds/SampleRejectedStatus.h" -#include "ndds/LivelinessChangedStatus.h" -#include "ndds/RequestedIncompatibleQosStatus.h" +#include "SampleLostStatus.h" +#include "SubscriptionMatchedStatus.h" +#include "RequestedDeadlineMissedStatus.h" +#include "SampleRejectedStatus.h" +#include "LivelinessChangedStatus.h" +#include "RequestedIncompatibleQosStatus.h" #include "dds4ccm/idl/dds4ccm_BaseC.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h index a65d2e37931..a65d2e37931 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp index 63f20392a6e..103b226130b 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" -#include "dds4ccm/impl/dds/DataReader.h" +#include "dds4ccm/impl/ndds/DataReader.h" #include "dds4ccm/impl/logger/Log_Macros.h" #include "ace/Reactor.h" @@ -128,13 +128,8 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (:: if (nr_of_samples > 0) { - typename CCM_TYPE::seq_type * inst_seq = 0; - ACE_NEW (inst_seq, - typename CCM_TYPE::seq_type (nr_of_samples)); - - ::CCM_DDS::ReadInfoSeq * infoseq = 0; - ACE_NEW (infoseq, - ::CCM_DDS::ReadInfoSeq (nr_of_samples)); + typename CCM_TYPE::seq_type::_var_type inst_seq = new typename CCM_TYPE::seq_type (nr_of_samples); + ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq (nr_of_samples); infoseq->length (nr_of_samples); inst_seq->length (nr_of_samples); @@ -145,12 +140,12 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (:: { if(sample_info[i].valid_data) { - (*infoseq)[ix] <<= sample_info[i]; - (*inst_seq)[ix] = data[i]; + infoseq[ix] <<= sample_info[i]; + inst_seq[ix] = data[i]; ++ix; } } - listener_->on_many_data (*inst_seq, *infoseq); + listener_->on_many_data (inst_seq, infoseq); } } // Return the loan diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h index 07f63e29529..89d3cb95c3e 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h @@ -12,7 +12,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/PortStatusListener_T.h" +#include "dds4ccm/impl/ndds/PortStatusListener_T.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Reactor; @@ -53,6 +53,6 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/DataReaderListener_T.cpp" +#include "dds4ccm/impl/ndds/DataReaderListener_T.cpp" #endif /* DDS4CCM_DATAREADERLISTENER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h index 3b493392c1b..23df656a4f8 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h @@ -61,6 +61,39 @@ operator<<= (::DDS_DataReaderQos &ddsqos, const ::DDS::DataReaderQos & qos) ddsqos.reader_data_lifecycle <<= qos.reader_data_lifecycle; } +inline void +operator>>= (const ::DDS_DataReaderQos &qos, ::DDS::DataReaderQos & ddsqos) +{ + ddsqos.durability <<= qos.durability; + ddsqos.deadline <<= qos.deadline; + ddsqos.latency_budget <<= qos.latency_budget; + ddsqos.liveliness <<= qos.liveliness; + ddsqos.reliability <<= qos.reliability; + ddsqos.destination_order <<= qos.destination_order; + ddsqos.history <<= qos.history; + ddsqos.resource_limits <<= qos.resource_limits; + ddsqos.user_data <<= qos.user_data; + ddsqos.ownership <<= qos.ownership; + ddsqos.time_based_filter <<= qos.time_based_filter; + ddsqos.reader_data_lifecycle <<= qos.reader_data_lifecycle; +} + +inline void +operator>>= (const ::DDS::DataReaderQos &qos, ::DDS_DataReaderQos & ddsqos) +{ + ddsqos.durability <<= qos.durability; + ddsqos.deadline <<= qos.deadline; + ddsqos.latency_budget <<= qos.latency_budget; + ddsqos.liveliness <<= qos.liveliness; + ddsqos.reliability <<= qos.reliability; + ddsqos.destination_order <<= qos.destination_order; + ddsqos.history <<= qos.history; + ddsqos.resource_limits <<= qos.resource_limits; + ddsqos.user_data <<= qos.user_data; + ddsqos.ownership <<= qos.ownership; + ddsqos.time_based_filter <<= qos.time_based_filter; + ddsqos.reader_data_lifecycle <<= qos.reader_data_lifecycle; +} #endif #endif /* DDS4CCM_DATAREADERQOS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp index d3e42fa1ca8..d3d09ec7ac8 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" -#include "dds4ccm/impl/dds/DataReader.h" +#include "dds4ccm/impl/ndds/DataReader.h" #include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds/DataReaderHandler_T.h" +#include "dds4ccm/impl/ndds/DataReaderHandler_T.h" #include "tao/ORB_Core.h" #include <vector> @@ -154,10 +154,8 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_ { // sample_new or sample_delete found -> first send out the updated // samples in one go - typename CCM_TYPE::seq_type * inst_seq = 0; - ACE_NEW (inst_seq, typename CCM_TYPE::seq_type); - ::CCM_DDS::ReadInfoSeq * infoseq = 0; - ACE_NEW (infoseq, ::CCM_DDS::ReadInfoSeq); + typename CCM_TYPE::seq_type::_var_type inst_seq = new typename CCM_TYPE::seq_type; + ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq; infoseq->length (nr_of_updates); inst_seq->length (nr_of_updates); @@ -166,11 +164,11 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_ iter != updates.end(); ++iter) { - (*infoseq)[ix] <<= sample_info[*iter]; - (*inst_seq)[ix] = data[*iter]; + infoseq[ix] <<= sample_info[*iter]; + inst_seq[ix] = data[*iter]; ++ix; } - this->listener_->on_many_updates (*inst_seq, *infoseq); + this->listener_->on_many_updates (inst_seq, infoseq); // now invoke on_creation or on_deletion if (sample_info[i].valid_data && sample_info[i].view_state == ::DDS_NEW_VIEW_STATE) @@ -198,10 +196,8 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_ //send the latest updates. if (updates.size () > 0) { - typename CCM_TYPE::seq_type * inst_seq = 0; - ACE_NEW (inst_seq, typename CCM_TYPE::seq_type); - ::CCM_DDS::ReadInfoSeq * infoseq = 0; - ACE_NEW (infoseq, ::CCM_DDS::ReadInfoSeq); + typename CCM_TYPE::seq_type::_var_type inst_seq = new typename CCM_TYPE::seq_type; + ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq; infoseq->length (nr_of_updates); inst_seq->length (nr_of_updates); @@ -210,11 +206,11 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_ iter != updates.end(); ++iter) { - (*infoseq)[ix] <<= sample_info[*iter]; - (*inst_seq)[ix] = data[*iter]; + infoseq[ix] <<= sample_info[*iter]; + inst_seq[ix] = data[*iter]; ++ix; } - this->listener_->on_many_updates (*inst_seq, *infoseq); + this->listener_->on_many_updates (inst_seq, infoseq); } // Return the loan reader->return_loan(data, sample_info); diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h index 18e1cf4bb3d..637c79bdf38 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h @@ -48,6 +48,6 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/DataReaderStateListener_T.cpp" +#include "dds4ccm/impl/ndds/DataReaderStateListener_T.cpp" #endif /* DDS4CCM_DATAREADERSTATELISTENER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp index 33c15bf1e37..d07b8bf820a 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp @@ -5,16 +5,14 @@ #include "Publisher.h" #include "DataWriterListener.h" #include "Topic.h" - -#include "ndds/Duration_t.h" -#include "ndds/InstanceHandle_t.h" -#include "ndds/PublicationMatchedStatus.h" -#include "ndds/LivelinessLostStatus.h" -#include "ndds/OfferedIncompatibleQosStatus.h" -#include "ndds/OfferedDeadlineMissedStatus.h" -#include "ndds/InstanceHandleSeq.h" -#include "ndds/DataWriterQos.h" -#include "ndds/SubscriptionBuiltinTopicData.h" +#include "Duration_t.h" +#include "InstanceHandle_t.h" +#include "PublicationMatchedStatus.h" +#include "LivelinessLostStatus.h" +#include "OfferedIncompatibleQosStatus.h" +#include "OfferedDeadlineMissedStatus.h" +#include "InstanceHandleSeq.h" +#include "DataWriterQos.h" #include "dds4ccm/impl/logger/Log_Macros.h" @@ -36,9 +34,9 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_DataWriter_i::set_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DataWriterQos ccm_dds_qos; - ccm_dds_qos <<= qos; - return this->impl()->set_qos (ccm_dds_qos); + ::DDS_DataWriterQos rti_qos; + rti_qos <<= qos; + return this->impl()->set_qos (rti_qos); #else return this->impl ()->set_qos (qos); #endif @@ -49,11 +47,11 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_DataWriter_i::get_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DataWriterQos ccm_dds_qos; - ccm_dds_qos <<= qos; + ::DDS_DataWriterQos rti_qos; + rti_qos <<= qos; ::DDS::ReturnCode_t retcode = - this->impl()->get_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; + this->impl()->get_qos (rti_qos); + qos <<= rti_qos; return retcode; #else return this->impl ()->get_qos (qos); @@ -65,14 +63,14 @@ namespace CIAO ::DDS::StatusMask mask) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_DataWriterListener_i* ccm_dds_impl_list = 0; + CCM_DDS_DataWriterListener_i* rti_impl_list = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_impl_list, + ACE_NEW_THROW_EX (rti_impl_list, CCM_DDS_DataWriterListener_i (a_listener), CORBA::NO_MEMORY ()); } - return this->impl ()->set_listener (ccm_dds_impl_list, mask); + return this->impl ()->set_listener (rti_impl_list, mask); #else return this->impl ()->set_listener (a_listener, mask); #endif @@ -148,10 +146,10 @@ namespace CIAO CCM_DDS_DataWriter_i::get_liveliness_lost_status (::DDS::LivelinessLostStatus & status) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_LivelinessLostStatus ddsstatus; - ddsstatus <<= status; - ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_lost_status (ddsstatus); - status <<= ddsstatus; + ::DDS_LivelinessLostStatus rtistatus; + rtistatus <<= status; + ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_lost_status (rtistatus); + rtistatus >>= status; return retval; #else return this->impl ()->get_liveliness_lost_status (status); @@ -162,10 +160,10 @@ namespace CIAO CCM_DDS_DataWriter_i::get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_OfferedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_deadline_missed_status (ddsstatus); - status <<= ddsstatus; + ::DDS_OfferedDeadlineMissedStatus rtistatus; + rtistatus <<= status; + ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_deadline_missed_status (rtistatus); + rtistatus >>= status; return retval; #else return this->impl ()->get_offered_deadline_missed_status (status); @@ -176,10 +174,10 @@ namespace CIAO CCM_DDS_DataWriter_i::get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_OfferedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_incompatible_qos_status (ddsstatus); - status <<= ddsstatus; + ::DDS_OfferedIncompatibleQosStatus rtistatus; + rtistatus <<= status; + ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_incompatible_qos_status (rtistatus); + rtistatus >>= status; return retval; #else return this->impl ()->get_offered_incompatible_qos_status (status); @@ -190,10 +188,10 @@ namespace CIAO CCM_DDS_DataWriter_i::get_publication_matched_status (::DDS::PublicationMatchedStatus & status) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_PublicationMatchedStatus ddsstatus; - ddsstatus <<= status; - ::DDS::ReturnCode_t const retval = this->impl ()->get_publication_matched_status (ddsstatus); - status <<= ddsstatus; + ::DDS_PublicationMatchedStatus rtistatus; + rtistatus <<= status; + ::DDS::ReturnCode_t const retval = this->impl ()->get_publication_matched_status (rtistatus); + rtistatus >>= status; return retval; #else return this->impl ()->get_publication_matched_status (status); @@ -213,7 +211,7 @@ namespace CIAO ::DDS_InstanceHandleSeq rtiseq; rtiseq <<= subscription_handles; ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_subscriptions (rtiseq); - subscription_handles <<= rtiseq; + rtiseq >>= subscription_handles; return retval; #else return this->impl ()->get_matched_subscriptions (subscription_handles); @@ -222,18 +220,14 @@ namespace CIAO ::DDS::ReturnCode_t CCM_DDS_DataWriter_i::get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data, - DDS_INSTANCE_HANDLE_T_IN subscription_handle) + DDS_INSTANCE_HANDLE_T_IN subscription_handle) { DDS4CCM_TRACE ("CCM_DDS_DataWriter_i::get_matched_subscription_data"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_SubscriptionBuiltinTopicData ccm_dds_sub_data; - ::DDS_InstanceHandle_t ccm_dds_sub_handle; - ccm_dds_sub_data <<= subscription_data; - ccm_dds_sub_handle <<= subscription_handle; - ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_subscription_data (ccm_dds_sub_data, - ccm_dds_sub_handle); - subscription_data <<= ccm_dds_sub_data; - return retval; + ACE_UNUSED_ARG (subscription_data); + ACE_UNUSED_ARG (subscription_handle); + throw CORBA::NO_IMPLEMENT (); + // Add your implementation here #else return this->impl ()->get_matched_subscription_data (subscription_data, subscription_handle); #endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h index 5b664dce78a..30ee9a94b12 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataWriter.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h @@ -14,8 +14,8 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" -#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/InstanceHandle_t.h" #include "tao/LocalObject.h" #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp index 71ee37d6430..041092a4324 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp @@ -2,10 +2,10 @@ #include "DataWriterListener.h" #include "DataWriter.h" -#include "ndds/PublicationMatchedStatus.h" -#include "ndds/LivelinessLostStatus.h" -#include "ndds/OfferedIncompatibleQosStatus.h" -#include "ndds/OfferedDeadlineMissedStatus.h" +#include "PublicationMatchedStatus.h" +#include "LivelinessLostStatus.h" +#include "OfferedIncompatibleQosStatus.h" +#include "OfferedDeadlineMissedStatus.h" namespace CIAO { diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h index 1776bf65f81..fc0751bc1f2 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h @@ -15,7 +15,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" #include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) # include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp index 5155e2402ca..898390a5959 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" -#include "dds4ccm/impl/dds/DataWriter.h" +#include "dds4ccm/impl/ndds/DataWriter.h" #include "dds4ccm/impl/logger/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h index f8801ee0c90..805499eac25 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h @@ -60,6 +60,6 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/DataWriterListener_T.cpp" +#include "dds4ccm/impl/ndds/DataWriterListener_T.cpp" #endif /* DDS_DATAWRITERLISTENER_T */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h index 346792c62b9..a12804a4789 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h @@ -70,6 +70,45 @@ operator<<= (::DDS_DataWriterQos &ddsqos, const ::DDS::DataWriterQos & qos) ddsqos.writer_data_lifecycle <<= qos.writer_data_lifecycle; } +inline void +operator>>= (const ::DDS_DataWriterQos &qos, ::DDS::DataWriterQos & ddsqos) +{ + ddsqos.durability <<= qos.durability; + ddsqos.durability_service <<= qos.durability_service; + ddsqos.deadline <<= qos.deadline; + ddsqos.latency_budget <<= qos.latency_budget; + ddsqos.liveliness <<= qos.liveliness; + ddsqos.reliability <<= qos.reliability; + ddsqos.destination_order <<= qos.destination_order; + ddsqos.history <<= qos.history; + ddsqos.resource_limits <<= qos.resource_limits; + ddsqos.transport_priority <<= qos.transport_priority; + ddsqos.lifespan <<= qos.lifespan; + ddsqos.user_data <<= qos.user_data; + ddsqos.ownership <<= qos.ownership; + ddsqos.ownership_strength <<= qos.ownership_strength; + ddsqos.writer_data_lifecycle <<= qos.writer_data_lifecycle; +} + +inline void +operator>>= (const ::DDS::DataWriterQos &qos, ::DDS_DataWriterQos & ddsqos) +{ + ddsqos.durability <<= qos.durability; + ddsqos.durability_service <<= qos.durability_service; + ddsqos.deadline <<= qos.deadline; + ddsqos.latency_budget <<= qos.latency_budget; + ddsqos.liveliness <<= qos.liveliness; + ddsqos.reliability <<= qos.reliability; + ddsqos.destination_order <<= qos.destination_order; + ddsqos.history <<= qos.history; + ddsqos.resource_limits <<= qos.resource_limits; + ddsqos.transport_priority <<= qos.transport_priority; + ddsqos.lifespan <<= qos.lifespan; + ddsqos.user_data <<= qos.user_data; + ddsqos.ownership <<= qos.ownership; + ddsqos.ownership_strength <<= qos.ownership_strength; + ddsqos.writer_data_lifecycle <<= qos.writer_data_lifecycle; +} #endif #endif /* DDS4CCM_DATAWRITERQOS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h index f981bc47c83..83e5298f9fd 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h @@ -28,6 +28,17 @@ operator<<= (::DDS_DeadlineQosPolicy &ddsqos, const ::DDS::DeadlineQosPolicy & q ddsqos.period <<= qos.period; } +inline void +operator>>= (const ::DDS_DeadlineQosPolicy &qos, ::DDS::DeadlineQosPolicy & ddsqos) +{ + ddsqos.period <<= qos.period; +} + +inline void +operator>>= (const ::DDS::DeadlineQosPolicy &qos, ::DDS_DeadlineQosPolicy & ddsqos) +{ + ddsqos.period <<= qos.period; +} #endif #endif /* DDS4CCM_DEADLINEQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h index d0ca02ec1ba..31dbeb1b32d 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h @@ -28,6 +28,17 @@ operator<<= (::DDS_DestinationOrderQosPolicy &ddsqos, const ::DDS::DestinationOr ddsqos.kind = static_cast < ::DDS_DestinationOrderQosPolicyKind> (qos.kind); } +inline void +operator>>= (const ::DDS_DestinationOrderQosPolicy &qos, ::DDS::DestinationOrderQosPolicy & ddsqos) +{ + ddsqos.kind = static_cast < ::DDS::DestinationOrderQosPolicyKind> (qos.kind); +} + +inline void +operator>>= (const ::DDS::DestinationOrderQosPolicy &qos, ::DDS_DestinationOrderQosPolicy & ddsqos) +{ + ddsqos.kind = static_cast < ::DDS_DestinationOrderQosPolicyKind> (qos.kind); +} #endif #endif /* DDS4CCM_DESTINATIONORDERQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp index c70676db7d9..705d35d1398 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp @@ -8,19 +8,19 @@ #include "TopicDescription.h" #include "Utils.h" #include "StatusCondition.h" +#include "InstanceHandle_t.h" +#include "Duration_t.h" +#include "Time_t.h" +#include "InstanceHandleSeq.h" #include "PublisherListener.h" #include "SubscriberListener.h" #include "TopicListener.h" #include "DomainParticipantListener.h" -#include "ndds/PublisherQos.h" -#include "ndds/SubscriberQos.h" -#include "ndds/TopicQos.h" -#include "ndds/DomainParticipantQos.h" -#include "ndds/InstanceHandle_t.h" -#include "ndds/Duration_t.h" -#include "ndds/Time_t.h" -#include "ndds/InstanceHandleSeq.h" +#include "PublisherQos.h" +#include "SubscriberQos.h" +#include "TopicQos.h" +#include "DomainParticipantQos.h" #include "dds4ccm/idl/dds4ccm_BaseC.h" @@ -53,37 +53,37 @@ namespace CIAO DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher_with_profile - " "Creating Publisher\n")); - CCM_DDS_PublisherListener_i *ccm_dds_pl = 0; + CCM_DDS_PublisherListener_i *rti_pl = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_pl, + ACE_NEW_THROW_EX (rti_pl, CCM_DDS_PublisherListener_i (a_listener), CORBA::NO_MEMORY ()); } - DDSPublisher * ccm_dds_pub = + DDSPublisher * rti_pub = this->impl ()->create_publisher_with_profile (library_name, profile_name, - ccm_dds_pl, + rti_pl, mask); - if (!ccm_dds_pub) + if (!rti_pub) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher_with_profile - " "Error: Unable to create Publisher\n")); - delete ccm_dds_pl; + delete rti_pl; throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::Publisher_var retval = ::DDS::Publisher::_nil (); ACE_NEW_THROW_EX (retval, - CCM_DDS_Publisher_i (ccm_dds_pub), + CCM_DDS_Publisher_i (rti_pub), CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher_with_profile - " "Successfully created a DDSPublisher\n")); - ccm_dds_pub->enable (); + rti_pub->enable (); return retval._retn (); } #endif @@ -100,22 +100,22 @@ namespace CIAO DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - " "Creating Publisher\n")); - DDS_PublisherQos ccm_dds_qos = DDS_PUBLISHER_QOS_DEFAULT; + DDS_PublisherQos rti_qos = DDS_PUBLISHER_QOS_DEFAULT; - CCM_DDS_PublisherListener_i *ccm_dds_pl = 0; + CCM_DDS_PublisherListener_i *rti_pl = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_pl, + ACE_NEW_THROW_EX (rti_pl, CCM_DDS_PublisherListener_i (a_listener), CORBA::NO_MEMORY ()); } - DDSPublisher * ccm_dds_pub = - this->impl ()->create_publisher (ccm_dds_qos, - ccm_dds_pl, + DDSPublisher * rti_pub = + this->impl ()->create_publisher (rti_qos, + rti_pl, mask); - if (!ccm_dds_pub) + if (!rti_pub) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - " "Error: Unable to create Publisher\n")); @@ -124,13 +124,13 @@ namespace CIAO ::DDS::Publisher_var retval = ::DDS::Publisher::_nil (); ACE_NEW_THROW_EX (retval, - CCM_DDS_Publisher_i (ccm_dds_pub), + CCM_DDS_Publisher_i (rti_pub), CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - " "Successfully created a DDSPublisher\n")); - ccm_dds_pub->enable (); + rti_pub->enable (); return retval._retn (); #else return this->impl ()->create_publisher (qos, a_listener, mask); @@ -141,9 +141,9 @@ namespace CIAO CCM_DDS_DomainParticipant_i::delete_publisher (::DDS::Publisher_ptr p) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_Publisher_i *ccm_dds_pub = dynamic_cast < CCM_DDS_Publisher_i * > (p); + CCM_DDS_Publisher_i *rti_pub = dynamic_cast < CCM_DDS_Publisher_i * > (p); - if (!ccm_dds_pub) + if (!rti_pub) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - " "Unable to cast provided object refence to servant pointer.\n")); @@ -153,7 +153,7 @@ namespace CIAO DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - " "Successfully casted provided object refence to CCM_DDS_Publisher_i\n")); - DDS_ReturnCode_t const retval = this->impl ()->delete_publisher (ccm_dds_pub->get_impl ()); + DDS_ReturnCode_t const retval = this->impl ()->delete_publisher (rti_pub->get_impl ()); if (retval != DDS_RETCODE_OK) { @@ -183,37 +183,37 @@ namespace CIAO DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber_with_profile - " "Creating Subscriber\n")); - CCM_DDS_SubscriberListener_i *ccm_dds_sl = 0; + CCM_DDS_SubscriberListener_i *rti_sl = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_sl, + ACE_NEW_THROW_EX (rti_sl, CCM_DDS_SubscriberListener_i (a_listener), CORBA::NO_MEMORY ()); } - DDSSubscriber * ccm_dds_sub = + DDSSubscriber * rti_sub = this->impl ()->create_subscriber_with_profile ( library_name, profile_name, - ccm_dds_sl, + rti_sl, mask); - if (!ccm_dds_sub) + if (!rti_sub) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber_with_profile - " "Error: Unable to create Subscriber\n")); - delete ccm_dds_sl; + delete rti_sl; throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil (); ACE_NEW_THROW_EX (retval, - CCM_DDS_Subscriber_i (ccm_dds_sub), + CCM_DDS_Subscriber_i (rti_sub), CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber_with_profile - " "Successfully created a DDSSubscriber\n")); - ccm_dds_sub->enable (); + rti_sub->enable (); return retval._retn (); } #endif @@ -231,37 +231,37 @@ namespace CIAO DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - " "Creating Subscriber\n")); - CCM_DDS_SubscriberListener_i *ccm_dds_sl = 0; + CCM_DDS_SubscriberListener_i *rti_sl = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_sl, + ACE_NEW_THROW_EX (rti_sl, CCM_DDS_SubscriberListener_i (a_listener), CORBA::NO_MEMORY ()); } - DDS_SubscriberQos ccm_dds_qos = DDS_SUBSCRIBER_QOS_DEFAULT; - DDSSubscriber * ccm_dds_sub = - this->impl ()->create_subscriber (ccm_dds_qos, - ccm_dds_sl, + DDS_SubscriberQos rti_qos = DDS_SUBSCRIBER_QOS_DEFAULT; + DDSSubscriber * rti_sub = + this->impl ()->create_subscriber (rti_qos, + rti_sl, mask); - if (!ccm_dds_sub) + if (!rti_sub) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - " "Error: Unable to create Subscriber\n")); - delete ccm_dds_sl; + delete rti_sl; throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil (); ACE_NEW_THROW_EX (retval, - CCM_DDS_Subscriber_i (ccm_dds_sub), + CCM_DDS_Subscriber_i (rti_sub), CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - " "Successfully created a DDSSubscriber\n")); - ccm_dds_sub->enable (); + rti_sub->enable (); return retval._retn (); #else return this->impl ()->create_subscriber (qos, a_listener, mask); @@ -272,9 +272,9 @@ namespace CIAO CCM_DDS_DomainParticipant_i::delete_subscriber (::DDS::Subscriber_ptr s) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_Subscriber_i *ccm_dds_sub = dynamic_cast < CCM_DDS_Subscriber_i * > (s); + CCM_DDS_Subscriber_i *rti_sub = dynamic_cast < CCM_DDS_Subscriber_i * > (s); - if (!ccm_dds_sub) + if (!rti_sub) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - " "Unable to cast provided object refence to servant pointer.\n")); @@ -284,7 +284,7 @@ namespace CIAO DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - " "Successfully casted provided object refence to CCM_DDS_Subscriber_i\n")); - DDS_ReturnCode_t const retval = this->impl ()->delete_subscriber (ccm_dds_sub->get_impl ()); + DDS_ReturnCode_t const retval = this->impl ()->delete_subscriber (rti_sub->get_impl ()); if (retval != DDS_RETCODE_OK) { @@ -360,33 +360,33 @@ namespace CIAO "Attempting to create topic with name %C and type %C\n", impl_name, type_name)); - CCM_DDS_TopicListener_i *ccm_dds_tl = 0; + CCM_DDS_TopicListener_i *rti_tl = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_tl, + ACE_NEW_THROW_EX (rti_tl, CCM_DDS_TopicListener_i (a_listener), CORBA::NO_MEMORY ()); } - DDS_TopicQos ccm_dds_qos = DDS_TOPIC_QOS_DEFAULT; + DDS_TopicQos rti_qos = DDS_TOPIC_QOS_DEFAULT; - DDSTopic *ccm_dds_topic = this->impl ()->create_topic (impl_name, + DDSTopic *rti_topic = this->impl ()->create_topic (impl_name, type_name, - ccm_dds_qos, - ccm_dds_tl, + rti_qos, + rti_tl, mask); - if (ccm_dds_topic == 0) + if (rti_topic == 0) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " "Error: RTI DDS returned a nil topic\n")); - delete ccm_dds_tl; + delete rti_tl; throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::Topic_var retval = ::DDS::Topic::_nil (); ACE_NEW_THROW_EX (retval, - CCM_DDS_Topic_i (ccm_dds_topic), + CCM_DDS_Topic_i (rti_topic), CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic - " @@ -437,31 +437,31 @@ namespace CIAO ::DDS::Topic_var tp = this->find_topic (impl_name, dur); if (CORBA::is_nil (tp)) { - CCM_DDS_TopicListener_i *ccm_dds_tl = 0; + CCM_DDS_TopicListener_i *rti_tl = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_tl, + ACE_NEW_THROW_EX (rti_tl, CCM_DDS_TopicListener_i (a_listener), CORBA::NO_MEMORY ()); } - DDSTopic *ccm_dds_topic = this->impl ()->create_topic_with_profile (impl_name, + DDSTopic *rti_topic = this->impl ()->create_topic_with_profile (impl_name, type_name, library_name, profile_name, - ccm_dds_tl, + rti_tl, mask); - if (ccm_dds_topic == 0) + if (rti_topic == 0) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " "Error: RTI DDS returned a nil topic\n")); - delete ccm_dds_tl; + delete rti_tl; throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::Topic_var retval = ::DDS::Topic::_nil (); ACE_NEW_THROW_EX (retval, - CCM_DDS_Topic_i (ccm_dds_topic), + CCM_DDS_Topic_i (rti_topic), CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " @@ -598,13 +598,13 @@ namespace CIAO DDS_StringSeq parameters (expression_parameters.length ()); parameters.from_array (parameterlist, expression_parameters.length ()); - DDSContentFilteredTopic * ccm_dds_cft = this->impl ()->create_contentfilteredtopic ( + DDSContentFilteredTopic * rti_cft = this->impl ()->create_contentfilteredtopic ( name, top->get_impl (), filter_expression, parameters); delete [] parameterlist; - if (!ccm_dds_cft) + if (!rti_cft) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_contentfilteredtopic - " "RTI DDS returned a nil ContentFilteredTopic.\n")); @@ -613,7 +613,7 @@ namespace CIAO ::DDS::ContentFilteredTopic_var retval = ::DDS::ContentFilteredTopic::_nil (); ACE_NEW_THROW_EX (retval, - CCM_DDS_ContentFilteredTopic_i (ccm_dds_cft), + CCM_DDS_ContentFilteredTopic_i (rti_cft), CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_contentfilteredtopic - " @@ -670,9 +670,9 @@ namespace CIAO { DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DomainParticipantQos ccm_dds_qos; - ccm_dds_qos <<= qos; - return this->impl()->set_qos (ccm_dds_qos); + ::DDS_DomainParticipantQos rti_qos; + rti_qos <<= qos; + return this->impl()->set_qos (rti_qos); #else return this->impl()->set_qos (qos); #endif @@ -683,9 +683,9 @@ namespace CIAO { DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DomainParticipantQos ccm_dds_qos; - ::DDS::ReturnCode_t retcode = this->impl()-> get_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; + ::DDS_DomainParticipantQos rti_qos; + ::DDS::ReturnCode_t retcode = this->impl()-> get_qos (rti_qos); + qos <<= rti_qos; return retcode; #else return this->impl()->get_qos (qos); @@ -697,14 +697,14 @@ namespace CIAO ::DDS::StatusMask mask) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_DomainPublisherListener_i* ccm_dds_impl_list = 0; + CCM_DDS_DomainPublisherListener_i* rti_impl_list = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_impl_list, + ACE_NEW_THROW_EX (rti_impl_list, CCM_DDS_DomainPublisherListener_i (a_listener), CORBA::NO_MEMORY ()); } - return this->impl_->set_listener (ccm_dds_impl_list, mask); + return this->impl_->set_listener (rti_impl_list, mask); #else return this->impl_->set_listener (a_listener, mask); #endif @@ -716,8 +716,8 @@ namespace CIAO DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_listener"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDomainParticipantListener *ccm_dds_dp_list = this->impl ()->get_listener (); - CCM_DDS_DomainPublisherListener_i *list_proxy = dynamic_cast <CCM_DDS_DomainPublisherListener_i *> (ccm_dds_dp_list); + DDSDomainParticipantListener *rti_dp_list = this->impl ()->get_listener (); + CCM_DDS_DomainPublisherListener_i *list_proxy = dynamic_cast <CCM_DDS_DomainPublisherListener_i *> (rti_dp_list); if (!list_proxy) { DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DomainParticipant_i::get_listener - " @@ -734,9 +734,9 @@ namespace CIAO CCM_DDS_DomainParticipant_i::ignore_participant (DDS_INSTANCE_HANDLE_T_IN handle) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t ccm_dds_handle; - ccm_dds_handle <<= handle; - return this->impl ()->ignore_participant (ccm_dds_handle); + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= handle; + return this->impl ()->ignore_participant (rti_handle); #else return this->impl ()->ignore_participant (handle); #endif @@ -746,9 +746,9 @@ namespace CIAO CCM_DDS_DomainParticipant_i::ignore_topic (DDS_INSTANCE_HANDLE_T_IN handle) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t ccm_dds_handle; - ccm_dds_handle <<= handle; - return this->impl ()->ignore_topic (ccm_dds_handle); + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= handle; + return this->impl ()->ignore_topic (rti_handle); #else return this->impl ()->ignore_topic (handle); #endif @@ -758,9 +758,9 @@ namespace CIAO CCM_DDS_DomainParticipant_i::ignore_publication (DDS_INSTANCE_HANDLE_T_IN handle) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t ccm_dds_handle; - ccm_dds_handle <<= handle; - return this->impl ()->ignore_publication (ccm_dds_handle); + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= handle; + return this->impl ()->ignore_publication (rti_handle); #else return this->impl ()->ignore_publication (handle); #endif @@ -770,9 +770,9 @@ namespace CIAO CCM_DDS_DomainParticipant_i::ignore_subscription (DDS_INSTANCE_HANDLE_T_IN handle) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t ccm_dds_handle; - ccm_dds_handle <<= handle; - return this->impl ()->ignore_subscription (ccm_dds_handle); + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= handle; + return this->impl ()->ignore_subscription (rti_handle); #else return this->impl ()->ignore_subscription (handle); #endif @@ -795,9 +795,9 @@ namespace CIAO { DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_publisher_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_PublisherQos ccm_dds_qos; - ccm_dds_qos <<= qos; - return this->impl()->set_default_publisher_qos (ccm_dds_qos); + ::DDS_PublisherQos rti_qos; + rti_qos <<= qos; + return this->impl()->set_default_publisher_qos (rti_qos); #else return this->impl()->set_default_publisher_qos (qos); #endif @@ -808,9 +808,9 @@ namespace CIAO { DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_publisher_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_PublisherQos ccm_dds_qos; - ::DDS::ReturnCode_t retcode = this->impl()-> get_default_publisher_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; + ::DDS_PublisherQos rti_qos; + ::DDS::ReturnCode_t retcode = this->impl()-> get_default_publisher_qos (rti_qos); + qos <<= rti_qos; return retcode; #else return this->impl()->get_default_publisher_qos (qos); @@ -822,9 +822,9 @@ namespace CIAO { DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_subscriber_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_SubscriberQos ccm_dds_qos; - ccm_dds_qos <<= qos; - return this->impl()->set_default_subscriber_qos (ccm_dds_qos); + ::DDS_SubscriberQos rti_qos; + rti_qos <<= qos; + return this->impl()->set_default_subscriber_qos (rti_qos); #else return this->impl()->set_default_subscriber_qos (qos); #endif @@ -835,10 +835,10 @@ namespace CIAO { DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_subscriber_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_SubscriberQos ccm_dds_qos; + ::DDS_SubscriberQos rti_qos; ::DDS::ReturnCode_t retcode = - this->impl()-> get_default_subscriber_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; + this->impl()-> get_default_subscriber_qos (rti_qos); + qos <<= rti_qos; return retcode; #else return this->impl()->get_default_subscriber_qos (qos); @@ -850,9 +850,9 @@ namespace CIAO { DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_topic_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_TopicQos ccm_dds_qos; - ccm_dds_qos <<= qos; - return this->impl()->set_default_topic_qos (ccm_dds_qos); + ::DDS_TopicQos rti_qos; + rti_qos <<= qos; + return this->impl()->set_default_topic_qos (rti_qos); #else return this->impl()->set_default_topic_qos (qos); #endif @@ -863,10 +863,10 @@ namespace CIAO { DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_topic_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_TopicQos ccm_dds_qos; + ::DDS_TopicQos rti_qos; ::DDS::ReturnCode_t retcode = - this->impl()-> get_default_topic_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; + this->impl()-> get_default_topic_qos (rti_qos); + qos <<= rti_qos; return retcode; #else return this->impl()->get_default_topic_qos (qos); @@ -879,7 +879,7 @@ namespace CIAO #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) ::DDS_InstanceHandleSeq rtiseq; ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_participants (rtiseq); - impl_handles <<= rtiseq; + rtiseq >>= impl_handles; return retval; #else return this->impl ()->get_discovered_participants (impl_handles); @@ -900,7 +900,7 @@ namespace CIAO #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) ::DDS_InstanceHandleSeq rtiseq; ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_topics (rtiseq); - impl_handles <<= rtiseq; + rtiseq >>= impl_handles; return retval; #else return this->impl ()->get_discovered_topics (impl_handles); @@ -919,9 +919,9 @@ namespace CIAO CCM_DDS_DomainParticipant_i::contains_entity (DDS_INSTANCE_HANDLE_T_IN a_handle) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t ccm_dds_handle; - ccm_dds_handle <<= a_handle; - return this->impl ()->contains_entity (ccm_dds_handle); + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= a_handle; + return this->impl ()->contains_entity (rti_handle); #else return this->impl ()->contains_entity (a_handle); #endif @@ -931,9 +931,9 @@ namespace CIAO CCM_DDS_DomainParticipant_i::get_current_time (::DDS::Time_t & current_time) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_Time_t ccm_dds_time; - ::DDS::ReturnCode_t const retval = this->impl ()->get_current_time (ccm_dds_time); - current_time <<= ccm_dds_time; + DDS_Time_t rti_time; + ::DDS::ReturnCode_t const retval = this->impl ()->get_current_time (rti_time); + rti_time >>= current_time; return retval; #else return this->impl ()->get_current_time (current_time); diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h index 71e2a69457f..f8658668c1b 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h @@ -13,8 +13,8 @@ #include "tao/LocalObject.h" #include "dds4ccm/idl/dds_rtf2_dcpsC.h" #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" -#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/InstanceHandle_t.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) #include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp index 794bf1283d4..4ba2b73fc42 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp @@ -3,9 +3,8 @@ #include "DomainParticipantFactory.h" #include "DomainParticipant.h" #include "DomainParticipantListener.h" - -#include "ndds/DomainParticipantFactoryQos.h" -#include "ndds/DomainParticipantQos.h" +#include "DomainParticipantFactoryQos.h" +#include "DomainParticipantQos.h" #include "Utils.h" @@ -45,10 +44,10 @@ namespace CIAO "Creating domain participant for domain <%d>\n", domain_id)); - CCM_DDS_DomainPublisherListener_i *ccm_dds_dpl = 0; + CCM_DDS_DomainPublisherListener_i *rti_dpl = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_dpl, + ACE_NEW_THROW_EX (rti_dpl, CCM_DDS_DomainPublisherListener_i (a_listener), CORBA::NO_MEMORY ()); } @@ -56,7 +55,7 @@ namespace CIAO DDSDomainParticipant *part = DDSDomainParticipantFactory::get_instance ()-> create_participant (domain_id, DDS_PARTICIPANT_QOS_DEFAULT, - ccm_dds_dpl, + rti_dpl, mask); if (!part) @@ -72,8 +71,8 @@ namespace CIAO CCM_DDS_DomainParticipant_i (part), CORBA::NO_MEMORY ()); part->enable (); - CCM_DDS_DomainParticipant_i *ccm_dds_dp = dynamic_cast < CCM_DDS_DomainParticipant_i *> (retval.in ()); - ccm_dds_dp->set_impl (part); + CCM_DDS_DomainParticipant_i *rti_dp = dynamic_cast < CCM_DDS_DomainParticipant_i *> (retval.in ()); + rti_dp->set_impl (part); return retval._retn (); #else @@ -99,10 +98,10 @@ namespace CIAO DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - " "Creating domain participant: profile <%C#%C> - domain <%d>\n", library_name, profile_name, domain_id)); - CCM_DDS_DomainPublisherListener_i *ccm_dds_dpl = 0; + CCM_DDS_DomainPublisherListener_i *rti_dpl = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_dpl, + ACE_NEW_THROW_EX (rti_dpl, CCM_DDS_DomainPublisherListener_i (a_listener), CORBA::NO_MEMORY ()); } @@ -111,14 +110,14 @@ namespace CIAO qos_profile += ACE_TEXT ("#"); qos_profile += profile_name; - CCM_DDS_DomainParticipant_i *ccm_dds_dp = 0; + CCM_DDS_DomainParticipant_i *rti_dp = 0; ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, this->dps_mutex_, CORBA::INTERNAL ()); { - ccm_dds_dp = this->dps_[qos_profile]; + rti_dp = this->dps_[qos_profile]; - if (!ccm_dds_dp) + if (!rti_dp) { DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - " "Creating participant: profile <%C> - domain <%d>\n", @@ -128,7 +127,7 @@ namespace CIAO create_participant_with_profile (domain_id, library_name, profile_name, - ccm_dds_dpl, + rti_dpl, mask); if (!part) { @@ -143,9 +142,9 @@ namespace CIAO part->enable (); - ccm_dds_dp = dynamic_cast < CCM_DDS_DomainParticipant_i *> (retval.in ()); - ccm_dds_dp->set_impl (part); - this->dps_[qos_profile] = ccm_dds_dp; + rti_dp = dynamic_cast < CCM_DDS_DomainParticipant_i *> (retval.in ()); + rti_dp->set_impl (part); + this->dps_[qos_profile] = rti_dp; return retval._retn (); } else @@ -154,7 +153,7 @@ namespace CIAO "Re-using participant for QOS profile <%C> and domin <%d>.\n", qos_profile.c_str (), domain_id)); - return ::DDS::DomainParticipant::_duplicate (ccm_dds_dp); + return ::DDS::DomainParticipant::_duplicate (rti_dp); } } } @@ -259,9 +258,9 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_DomainParticipantQos ccm_dds_qos; - ccm_dds_qos <<= qos; - return DDSDomainParticipantFactory::get_instance ()->set_default_participant_qos (ccm_dds_qos); + DDS_DomainParticipantQos rti_qos; + rti_qos <<= qos; + return DDSDomainParticipantFactory::get_instance ()->set_default_participant_qos (rti_qos); #else return DDSDomainParticipantFactory::get_instance ()->set_default_participant_qos (qos); #endif @@ -272,10 +271,10 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::get_default_participant_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_DomainParticipantQos ccm_dds_qos; + DDS_DomainParticipantQos rti_qos; ::DDS::ReturnCode_t retcode = - DDSDomainParticipantFactory::get_instance ()->get_default_participant_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; + DDSDomainParticipantFactory::get_instance ()->get_default_participant_qos (rti_qos); + qos <<= rti_qos; return retcode; #else return DDSDomainParticipantFactory::get_instance ()->get_default_participant_qos (qos); @@ -287,9 +286,9 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::set_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_DomainParticipantFactoryQos ccm_dds_qos; - ccm_dds_qos <<= qos; - return DDSDomainParticipantFactory::get_instance ()->set_qos (ccm_dds_qos); + DDS_DomainParticipantFactoryQos rti_qos; + rti_qos <<= qos; + return DDSDomainParticipantFactory::get_instance ()->set_qos (rti_qos); #else return DDSDomainParticipantFactory::get_instance ()->set_qos (qos); #endif @@ -300,10 +299,10 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::get_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_DomainParticipantFactoryQos ccm_dds_qos; + DDS_DomainParticipantFactoryQos rti_qos; ::DDS::ReturnCode_t retcode = - DDSDomainParticipantFactory::get_instance ()->get_qos (ccm_dds_qos); - ccm_dds_qos <<= qos; + DDSDomainParticipantFactory::get_instance ()->get_qos (rti_qos); + rti_qos <<= qos; return retcode; #else return DDSDomainParticipantFactory::get_instance ()->get_qos (qos); diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h index 694955f52bc..bb27d7cc1ab 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h @@ -14,7 +14,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #include "tao/LocalObject.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h index 4abb893ee4b..19ebdea5b16 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h @@ -28,6 +28,17 @@ operator<<= (::DDS_DomainParticipantFactoryQos &ddsqos, const ::DDS::DomainParti ddsqos.entity_factory <<= qos.entity_factory; } +inline void +operator>>= (const ::DDS_DomainParticipantFactoryQos &qos, ::DDS::DomainParticipantFactoryQos & ddsqos) +{ + ddsqos.entity_factory <<= qos.entity_factory; +} + +inline void +operator>>= (const ::DDS::DomainParticipantFactoryQos &qos, ::DDS_DomainParticipantFactoryQos & ddsqos) +{ + ddsqos.entity_factory <<= qos.entity_factory; +} #endif #endif /* DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp index 90d81e1a7cb..828eda9a2b1 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp @@ -2,13 +2,12 @@ #include "DomainParticipantListener.h" #include "DomainParticipant.h" - -#include "ndds/SampleLostStatus.h" -#include "ndds/SubscriptionMatchedStatus.h" -#include "ndds/RequestedDeadlineMissedStatus.h" -#include "ndds/SampleRejectedStatus.h" -#include "ndds/LivelinessChangedStatus.h" -#include "ndds/RequestedIncompatibleQosStatus.h" +#include "SampleLostStatus.h" +#include "SubscriptionMatchedStatus.h" +#include "RequestedDeadlineMissedStatus.h" +#include "SampleRejectedStatus.h" +#include "LivelinessChangedStatus.h" +#include "RequestedIncompatibleQosStatus.h" #include "dds4ccm/idl/dds4ccm_BaseC.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h index ef0b7f6aee9..ef0b7f6aee9 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp index 609e38355c1..136904aa34a 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" -#include "dds4ccm/impl/dds/DataReader.h" +#include "dds4ccm/impl/ndds/DataReader.h" #include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds/DataReaderHandler_T.h" +#include "dds4ccm/impl/ndds/DataReaderHandler_T.h" #include "tao/ORB_Core.h" template <typename DDS_TYPE, typename CCM_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h index 76acc73cc16..50b8b59806f 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h @@ -106,4 +106,4 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/DomainParticipantListener_T.cpp" +#include "dds4ccm/impl/ndds/DomainParticipantListener_T.cpp" diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h index 26922038746..bc023e1c5e5 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h @@ -31,6 +31,18 @@ operator<<= (::DDS_DomainParticipantQos &ddsqos, const ::DDS::DomainParticipantQ ddsqos.entity_factory <<= qos.entity_factory; } +inline void +operator>>= (const ::DDS_DomainParticipantQos &qos, ::DDS::DomainParticipantQos & ddsqos) +{ + ddsqos.entity_factory <<= qos.entity_factory; +} + +inline void +operator>>= (const ::DDS::DomainParticipantQos &qos, ::DDS_DomainParticipantQos & ddsqos) +{ + ddsqos.user_data <<= qos.user_data; + ddsqos.entity_factory <<= qos.entity_factory; +} #endif #endif /* DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h index 4154ce750d4..6b56460f3db 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h @@ -26,6 +26,17 @@ operator<<= (::DDS_DurabilityQosPolicy &ddsqos, const ::DDS::DurabilityQosPolicy ddsqos.kind = static_cast < ::DDS_DurabilityQosPolicyKind> (qos.kind); } +inline void +operator>>= (const ::DDS_DurabilityQosPolicy &qos, ::DDS::DurabilityQosPolicy & ddsqos) +{ + ddsqos.kind = static_cast < ::DDS::DurabilityQosPolicyKind> (qos.kind); +} + +inline void +operator>>= (const ::DDS::DurabilityQosPolicy &qos, ::DDS_DurabilityQosPolicy & ddsqos) +{ + ddsqos.kind = static_cast < ::DDS_DurabilityQosPolicyKind> (qos.kind); +} #endif #endif /* DDS4CCM_DURABILITYQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h index 2c0486fdc82..f1bbc26325a 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h @@ -38,6 +38,27 @@ operator<<= (::DDS_DurabilityServiceQosPolicy &ddsqos, const ::DDS::DurabilitySe ddsqos.max_samples_per_instance = qos.max_samples_per_instance; } +inline void +operator>>= (const ::DDS_DurabilityServiceQosPolicy &qos, ::DDS::DurabilityServiceQosPolicy & ddsqos) +{ + ddsqos.service_cleanup_delay <<= qos.service_cleanup_delay; + ddsqos.history_kind = static_cast < ::DDS::HistoryQosPolicyKind> (qos.history_kind); + ddsqos.history_depth = qos.history_depth; + ddsqos.max_samples = qos.max_samples; + ddsqos.max_instances = qos.max_instances; + ddsqos.max_samples_per_instance = qos.max_samples_per_instance; +} + +inline void +operator>>= (const ::DDS::DurabilityServiceQosPolicy &qos, ::DDS_DurabilityServiceQosPolicy & ddsqos) +{ + ddsqos.service_cleanup_delay <<= qos.service_cleanup_delay; + ddsqos.history_kind = static_cast < ::DDS_HistoryQosPolicyKind> (qos.history_kind); + ddsqos.history_depth = qos.history_depth; + ddsqos.max_samples = qos.max_samples; + ddsqos.max_instances = qos.max_instances; + ddsqos.max_samples_per_instance = qos.max_samples_per_instance; +} #endif #endif /* DDS4CCM_DURABILITYSERVICEQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/Duration_t.h b/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h index 73e8eef0cfa..74d6815b2a7 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/Duration_t.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h @@ -29,6 +29,12 @@ operator<<= (::DDS_Duration_t &ddsduration, const ::DDS::Duration_t & duration) ddsduration.nanosec = duration.nanosec; } +inline void +operator>>= (const ::DDS_Duration_t &duration, ::DDS::Duration_t & ddsduration) +{ + ddsduration.sec = duration.sec; + ddsduration.nanosec = duration.nanosec; +} #endif #endif /* DDS4CCM_DURATION_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h index afa363c243a..ec0a24a23f2 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h @@ -26,6 +26,17 @@ operator<<= (::DDS_EntityFactoryQosPolicy &ddsqos, const ::DDS::EntityFactoryQos ddsqos.autoenable_created_entities = qos.autoenable_created_entities; } +inline void +operator>>= (const ::DDS_EntityFactoryQosPolicy &qos, ::DDS::EntityFactoryQosPolicy & ddsqos) +{ + ddsqos.autoenable_created_entities = qos.autoenable_created_entities; +} + +inline void +operator>>= (const ::DDS::EntityFactoryQosPolicy &qos, ::DDS_EntityFactoryQosPolicy & ddsqos) +{ + ddsqos.autoenable_created_entities = qos.autoenable_created_entities; +} #endif #endif /* DDS4CCM_ENTITYFACTORYQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp index f13db77d845..5fa9c34fd36 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp @@ -1,14 +1,13 @@ // $Id$ -#include "dds4ccm/impl/dds/DataReader.h" -#include "dds4ccm/impl/dds/Utils.h" - -#include "dds4ccm/impl/dds/ndds/Duration_t.h" -#include "dds4ccm/impl/dds/ndds/SampleInfo.h" +#include "dds4ccm/impl/ndds/DataReader.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/Duration_t.h" +#include "dds4ccm/impl/ndds/SampleInfo.h" #include "dds4ccm/impl/logger/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE> -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::Getter_Base_T (void) : +CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::Getter_Base_T (void) : impl_ (0), condition_(0), time_out_ (), @@ -16,19 +15,19 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::Getter_Base_T (void) ws_ (0), rd_condition_ (0) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::Getter_Base_T"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Getter_Base_T::Getter_Base_T"); } template <typename DDS_TYPE, typename CCM_TYPE> -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::~Getter_Base_T (void) +CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::~Getter_Base_T (void) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::~Getter_Base_T"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Getter_Base_T::~Getter_Base_T"); delete ws_; } template <typename DDS_TYPE, typename CCM_TYPE> typename DDS_TYPE::data_reader * -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::impl (void) +CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::impl (void) { if (this->impl_) { @@ -42,7 +41,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::impl (void) template <typename DDS_TYPE, typename CCM_TYPE> bool -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::wait ( +CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::wait ( DDSConditionSeq& active_conditions) { DDS_Duration_t timeout; @@ -58,18 +57,12 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::wait ( template <typename DDS_TYPE, typename CCM_TYPE> bool -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::get_many ( +CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::get_many ( typename CCM_TYPE::seq_type::_out_type instances, ::CCM_DDS::ReadInfoSeq_out infos) { - instances = 0; - ACE_NEW_THROW_EX (instances, - typename CCM_TYPE::seq_type, - CORBA::NO_MEMORY ()); - infos = 0; - ACE_NEW_THROW_EX (infos, - ::CCM_DDS::ReadInfoSeq, - CORBA::NO_MEMORY ()); + instances = new typename CCM_TYPE::seq_type; + infos = new ::CCM_DDS::ReadInfoSeq; DDSConditionSeq active_conditions; if (!this->wait (active_conditions)) @@ -132,7 +125,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::get_many ( // because after a timeout there should be // data. DDS4CCM_ERROR (1, (LM_ERROR, CLINFO - "CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::Getter_Base_T::get_many - " + "CIAO::DDS4CCM::RTI::Getter_Base_T::Getter_Base_T::get_many - " "Error while reading from DDS: <%C>\n", translate_retcode (retcode))); this->impl ()->return_loan(data,sample_info); @@ -152,14 +145,14 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::get_many ( template <typename DDS_TYPE, typename CCM_TYPE> ::DDS::Duration_t -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::time_out (void) +CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::time_out (void) { return this->time_out_; } template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::time_out ( +CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::time_out ( const ::DDS::Duration_t & time_out) { this->time_out_ = time_out; @@ -167,14 +160,14 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::time_out ( template <typename DDS_TYPE, typename CCM_TYPE> ::CCM_DDS::DataNumber_t -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::max_delivered_data (void) +CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::max_delivered_data (void) { return this->max_delivered_data_; } template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::max_delivered_data ( +CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::max_delivered_data ( ::CCM_DDS::DataNumber_t max_delivered_data) { this->max_delivered_data_ = max_delivered_data; @@ -182,7 +175,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::max_delivered_data ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::passivate () +CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::passivate () { DDS_ReturnCode_t retcode = this->ws_->detach_condition (this->rd_condition_); if (retcode != DDS_RETCODE_OK) @@ -220,10 +213,10 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::passivate () template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::set_impl ( +CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::set_impl ( ::DDS::DataReader_ptr reader) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::set_impl"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Getter_Base_T::set_impl"); if (::CORBA::is_nil (reader)) { @@ -236,7 +229,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::set_impl ( CCM_DDS_DataReader_i *rdr = dynamic_cast <CCM_DDS_DataReader_i *> (reader); if (!rdr) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::data_reader - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Getter_Base_T::data_reader - " "Unable to cast provided DataReader to servant\n")); throw CORBA::INTERNAL (); } @@ -245,16 +238,14 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::set_impl ( if (!this->impl_) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::data_reader - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Getter_Base_T::data_reader - " "Unable to narrow the provided writer entity to the specific " "type necessary to publish messages\n")); throw CORBA::INTERNAL (); } // Now create the waitset conditions - ACE_NEW_THROW_EX (this->ws_, - DDSWaitSet (), - CORBA::NO_MEMORY ()); + this->ws_ = new DDSWaitSet (); this->rd_condition_ = this->impl ()->create_readcondition (DDS_NOT_READ_SAMPLE_STATE, DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE); @@ -269,7 +260,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE>::set_impl ( template <typename DDS_TYPE, typename CCM_TYPE> bool -CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one ( +CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one ( typename DDS_TYPE::value_type::_out_type an_instance, ::CCM_DDS::ReadInfo_out info) { @@ -297,21 +288,21 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one ( if (retcode == DDS_RETCODE_NO_DATA) { DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - "CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - " + "CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - " "DDS returned DDS_RETCODE_NO_DATA. No data available in DDS.\n")); return false; } else if (retcode != DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO - "CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - " + "CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - " "Error while reading from DDS: <%C>\n", translate_retcode (retcode))); if (this->impl ()->return_loan (data, sample_info) != DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Getter_T") + ACE_TEXT ("CIAO::DDS4CCM::RTI::Getter_T") ACE_TEXT ("<DDS_TYPE, CCM_TYPE, true>::get_one - ") ACE_TEXT ("return loan error\n"))); } @@ -327,7 +318,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one ( else { DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - "CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - " + "CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - " "No valid available in DDS.\n")); } //return the loan of each read. @@ -335,7 +326,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one ( DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Getter_T") + ACE_TEXT ("CIAO::DDS4CCM::RTI::Getter_T") ACE_TEXT ("<DDS_TYPE, CCM_TYPE, true>::get_one - ") ACE_TEXT ("return loan error\n"))); } @@ -348,14 +339,11 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one ( template <typename DDS_TYPE, typename CCM_TYPE> bool -CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, false>::get_one ( +CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, false>::get_one ( typename DDS_TYPE::value_type::_out_type an_instance, ::CCM_DDS::ReadInfo_out info) { - an_instance = 0; - ACE_NEW_THROW_EX (an_instance, - typename DDS_TYPE::value_type, - CORBA::NO_MEMORY ()); + an_instance = new typename DDS_TYPE::value_type; DDSConditionSeq active_conditions; if (!this->wait (active_conditions)) { @@ -382,21 +370,21 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, false>::get_one ( if (retcode == DDS_RETCODE_NO_DATA) { DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - "CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - " + "CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - " "DDS returned DDS_RETCODE_NO_DATA. No data available in DDS.\n")); return false; } else if (retcode != DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO - "CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - " + "CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - " "Error while reading from DDS: <%C>\n", translate_retcode (retcode))); if (this->impl ()->return_loan (data, sample_info) != DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Getter_T") + ACE_TEXT ("CIAO::DDS4CCM::RTI::Getter_T") ACE_TEXT ("<DDS_TYPE, CCM_TYPE, true>::get_one - ") ACE_TEXT ("return loan error\n"))); } @@ -412,7 +400,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, false>::get_one ( else { DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - "CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - " + "CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - " "No valid available in DDS.\n")); } //return the loan of each read. @@ -420,7 +408,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, false>::get_one ( DDS_RETCODE_OK) { DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Getter_T") + ACE_TEXT ("CIAO::DDS4CCM::RTI::Getter_T") ACE_TEXT ("<DDS_TYPE, CCM_TYPE, true>::get_one - ") ACE_TEXT ("return loan error\n"))); } diff --git a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h index 3849319fcc4..d797ec32b27 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h @@ -23,7 +23,7 @@ namespace CIAO { namespace DDS4CCM { - namespace DDS_CCM + namespace RTI { /** * @class Getter_Base_T<DDS_TYPE,CCM_TYPE> @@ -136,6 +136,6 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/Getter_T.cpp" +#include "dds4ccm/impl/ndds/Getter_T.cpp" #endif /* GETTER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h new file mode 100644 index 00000000000..096016416e7 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h @@ -0,0 +1,51 @@ +/** + * @author Johnny Willemsen <jwillemsen@remedy.nl> + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_GROUPDATAQOSPOLICY_H +#define DDS4CCM_GROUPDATAQOSPOLICY_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::GroupDataQosPolicy DDS_GroupDataQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +// @todo here +inline void +operator<<= (::DDS::GroupDataQosPolicy &ddsqos, const ::DDS_GroupDataQosPolicy & qos) +{ + ACE_UNUSED_ARG (ddsqos); + ACE_UNUSED_ARG (qos); +// ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value)); +} + +inline void +operator<<= (::DDS_GroupDataQosPolicy &ddsqos, const ::DDS::GroupDataQosPolicy & qos) +{ + ACE_UNUSED_ARG (ddsqos); + ACE_UNUSED_ARG (qos); +// ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value)); +} + +inline void +operator>>= (const ::DDS_GroupDataQosPolicy &qos, ::DDS::GroupDataQosPolicy & ddsqos) +{ + ACE_UNUSED_ARG (ddsqos); + ACE_UNUSED_ARG (qos); +// ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value)); +} + +inline void +operator>>= (const ::DDS::GroupDataQosPolicy &qos, ::DDS_GroupDataQosPolicy & ddsqos) +{ + ACE_UNUSED_ARG (ddsqos); + ACE_UNUSED_ARG (qos); +// ACE_OS::memcpy (qos.value, ddsqos.value, sizeof (ddsqos.value)); +} +#endif + +#endif /* DDS4CCM_GROUPDATAQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h index e463616de9a..0a4ce342254 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h @@ -28,6 +28,19 @@ operator<<= (::DDS_HistoryQosPolicy &ddsqos, const ::DDS::HistoryQosPolicy & qos ddsqos.depth = qos.depth; } +inline void +operator>>= (const ::DDS_HistoryQosPolicy &qos, ::DDS::HistoryQosPolicy & ddsqos) +{ + ddsqos.kind = static_cast < ::DDS::HistoryQosPolicyKind> (qos.kind); + ddsqos.depth = qos.depth; +} + +inline void +operator>>= (const ::DDS::HistoryQosPolicy &qos, ::DDS_HistoryQosPolicy & ddsqos) +{ + ddsqos.kind = static_cast < ::DDS_HistoryQosPolicyKind> (qos.kind); + ddsqos.depth = qos.depth; +} #endif #endif /* DDS4CCM_HISTORYQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h index a87e5dfaa96..841b28e1660 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h @@ -29,6 +29,19 @@ operator<<= (::DDS_InconsistentTopicStatus &ddsstatus, const ::DDS::Inconsistent ddsstatus.total_count_change = status.total_count_change; } +inline void +operator>>= (const ::DDS_InconsistentTopicStatus &status, ::DDS::InconsistentTopicStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; +} + +inline void +operator>>= (const ::DDS::InconsistentTopicStatus &status, ::DDS_InconsistentTopicStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; +} #endif #endif /* DDS4CCM_INCONSISTENTTOPICSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp index a8699e10c1d..9eff3682e48 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp @@ -1,10 +1,8 @@ // $Id$ -#include "dds4ccm/impl/dds/DataWriter.h" -#include "dds4ccm/impl/dds/Utils.h" - -#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h" - +#include "dds4ccm/impl/ndds/DataWriter.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/InstanceHandle_t.h" #include "dds4ccm/impl/logger/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h index ef5f78fdbae..a232161c718 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h @@ -46,6 +46,6 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/InstanceHandleManager_T.cpp" +#include "dds4ccm/impl/ndds/InstanceHandleManager_T.cpp" #endif /* INSTANCE_HANDLEMANGER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h index 4e4f65dede1..e5c49ba137c 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h @@ -42,6 +42,25 @@ operator<<= (::DDS_InstanceHandleSeq &ddsinstancehandleseqseq, const ::DDS::Inst } } +inline void +operator>>= (const ::DDS_InstanceHandleSeq &instancehandle, ::DDS::InstanceHandleSeq & ddsinstancehandleseqseq) +{ + ddsinstancehandleseqseq.length (instancehandle.length ()); + for (::DDS_Long index = 0; index < instancehandle.length (); index++) + { + ddsinstancehandleseqseq[index] <<= instancehandle[index]; + } +} + +inline void +operator>>= (const ::DDS::InstanceHandleSeq &instancehandle, ::DDS_InstanceHandleSeq & ddsinstancehandleseqseq) +{ + ddsinstancehandleseqseq.length (instancehandle.length ()); + for (::DDS::InstanceHandleSeq::size_type index = 0; index < instancehandle.length (); index++) + { + ddsinstancehandleseqseq[index] <<= instancehandle[index]; + } +} #endif #endif /* DDS4CCM_INSTANCEHANDLESEQ_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h index b3c37b61e8d..ea731ea7f28 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h @@ -38,6 +38,22 @@ operator<<= (::DDS_InstanceHandle_t &ddsinstancehandle, const ::DDS::InstanceHan ddsinstancehandle.isValid = instancehandle.isValid; } +inline void +operator>>= (const ::DDS_InstanceHandle_t &instancehandle, ::DDS::InstanceHandle_t & ddsinstancehandle) +{ + ACE_OS::memcpy (ddsinstancehandle.value, instancehandle.keyHash.value, sizeof (instancehandle.keyHash.value)); + ddsinstancehandle.length = instancehandle.keyHash.length; + ddsinstancehandle.isValid = instancehandle.isValid; +} + +inline void +operator>>= (const ::DDS::InstanceHandle_t &instancehandle, ::DDS_InstanceHandle_t & ddsinstancehandle) +{ + ACE_OS::memcpy (ddsinstancehandle.keyHash.value, instancehandle.value, sizeof (instancehandle.value)); + ddsinstancehandle.keyHash.length = instancehandle.length; + ddsinstancehandle.isValid = instancehandle.isValid; +} + inline bool operator== (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2) { diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h index 51cced4320c..0aaee70207c 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h @@ -28,6 +28,17 @@ operator<<= (::DDS_LatencyBudgetQosPolicy &ddsqos, const ::DDS::LatencyBudgetQos ddsqos.duration <<= qos.duration; } +inline void +operator>>= (const ::DDS_LatencyBudgetQosPolicy &qos, ::DDS::LatencyBudgetQosPolicy & ddsqos) +{ + ddsqos.duration <<= qos.duration; +} + +inline void +operator>>= (const ::DDS::LatencyBudgetQosPolicy &qos, ::DDS_LatencyBudgetQosPolicy & ddsqos) +{ + ddsqos.duration <<= qos.duration; +} #endif #endif /* DDS4CCM_LATENCYBUDGETQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h index ab15e75a5d4..a40e0cae31f 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h @@ -28,6 +28,17 @@ operator<<= (::DDS_LifespanQosPolicy &ddsqos, const ::DDS::LifespanQosPolicy & q ddsqos.duration <<= qos.duration; } +inline void +operator>>= (const ::DDS_LifespanQosPolicy &qos, ::DDS::LifespanQosPolicy & ddsqos) +{ + ddsqos.duration <<= qos.duration; +} + +inline void +operator>>= (const ::DDS::LifespanQosPolicy &qos, ::DDS_LifespanQosPolicy & ddsqos) +{ + ddsqos.duration <<= qos.duration; +} #endif #endif /* DDS4CCM_LIFESPANQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h index e57ecde72a5..6828b018a51 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h @@ -37,6 +37,25 @@ operator<<= (::DDS_LivelinessChangedStatus &ddsstatus, const ::DDS::LivelinessCh ddsstatus.last_publication_handle <<= status.last_publication_handle; } +inline void +operator>>= (const ::DDS_LivelinessChangedStatus &status, ::DDS::LivelinessChangedStatus & ddsstatus) +{ + ddsstatus.alive_count = status.alive_count; + ddsstatus.not_alive_count = status.not_alive_count; + ddsstatus.alive_count_change = status.alive_count_change; + ddsstatus.not_alive_count_change = status.not_alive_count_change; + ddsstatus.last_publication_handle <<= status.last_publication_handle; +} + +inline void +operator>>= (const ::DDS::LivelinessChangedStatus &status, ::DDS_LivelinessChangedStatus & ddsstatus) +{ + ddsstatus.alive_count = status.alive_count; + ddsstatus.not_alive_count = status.not_alive_count; + ddsstatus.alive_count_change = status.alive_count_change; + ddsstatus.not_alive_count_change = status.not_alive_count_change; + ddsstatus.last_publication_handle <<= status.last_publication_handle; +} #endif #endif /* DDS4CCM_LIVELINESSCHANGEDSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h index 4c4f5199c92..6561f6fe2c4 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h @@ -29,6 +29,19 @@ operator<<= (::DDS_LivelinessLostStatus &ddsstatus, const ::DDS::LivelinessLostS ddsstatus.total_count_change = status.total_count_change; } +inline void +operator>>= (const ::DDS_LivelinessLostStatus &status, ::DDS::LivelinessLostStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; +} + +inline void +operator>>= (const ::DDS::LivelinessLostStatus &status, ::DDS_LivelinessLostStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; +} #endif #endif /* DDS4CCM_LIVELINESSLOSTSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h index e760d16737e..ec3121e9efb 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h @@ -30,6 +30,19 @@ operator<<= (::DDS_LivelinessQosPolicy &ddsqos, const ::DDS::LivelinessQosPolicy ddsqos.lease_duration <<= qos.lease_duration; } +inline void +operator>>= (const ::DDS_LivelinessQosPolicy &qos, ::DDS::LivelinessQosPolicy & ddsqos) +{ + ddsqos.kind = static_cast < ::DDS::LivelinessQosPolicyKind> (qos.kind); + ddsqos.lease_duration <<= qos.lease_duration; +} + +inline void +operator>>= (const ::DDS::LivelinessQosPolicy &qos, ::DDS_LivelinessQosPolicy & ddsqos) +{ + ddsqos.kind = static_cast < ::DDS_LivelinessQosPolicyKind> (qos.kind); + ddsqos.lease_duration <<= qos.lease_duration; +} #endif #endif /* DDS4CCM_LIVELINESSQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h index ec60fe1d145..8c242eec417 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h @@ -33,6 +33,21 @@ operator<<= (::DDS_OfferedDeadlineMissedStatus &ddsstatus, const ::DDS::OfferedD ddsstatus.last_instance_handle <<= status.last_instance_handle; } +inline void +operator>>= (const ::DDS_OfferedDeadlineMissedStatus &status, ::DDS::OfferedDeadlineMissedStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.last_instance_handle <<= status.last_instance_handle; +} + +inline void +operator>>= (const ::DDS::OfferedDeadlineMissedStatus &status, ::DDS_OfferedDeadlineMissedStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.last_instance_handle <<= status.last_instance_handle; +} #endif #endif /* DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h index c1e190ea35e..4ac14dc690b 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h @@ -35,6 +35,23 @@ operator<<= (::DDS_OfferedIncompatibleQosStatus &ddsstatus, const ::DDS::Offered ddsstatus.policies <<= status.policies; } +inline void +operator>>= (const ::DDS_OfferedIncompatibleQosStatus &status, ::DDS::OfferedIncompatibleQosStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.last_policy_id = status.last_policy_id; + ddsstatus.policies <<= status.policies; +} + +inline void +operator>>= (const ::DDS::OfferedIncompatibleQosStatus &status, ::DDS_OfferedIncompatibleQosStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.last_policy_id = static_cast <DDS_QosPolicyId_t>(status.last_policy_id); + ddsstatus.policies <<= status.policies; +} #endif #endif /* DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h index c7983adc110..1553d5d4ddb 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h @@ -26,6 +26,17 @@ operator<<= (::DDS_OwnershipQosPolicy &ddsqos, const ::DDS::OwnershipQosPolicy & ddsqos.kind = static_cast < ::DDS_OwnershipQosPolicyKind> (qos.kind); } +inline void +operator>>= (const ::DDS_OwnershipQosPolicy &qos, ::DDS::OwnershipQosPolicy & ddsqos) +{ + ddsqos.kind = static_cast < ::DDS::OwnershipQosPolicyKind> (qos.kind); +} + +inline void +operator>>= (const ::DDS::OwnershipQosPolicy &qos, ::DDS_OwnershipQosPolicy & ddsqos) +{ + ddsqos.kind = static_cast < ::DDS_OwnershipQosPolicyKind> (qos.kind); +} #endif #endif /* DDS4CCM_OWNERSHIPQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h index 84b7471d47f..64e905a4faa 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h @@ -26,6 +26,17 @@ operator<<= (::DDS_OwnershipStrengthQosPolicy &ddsqos, const ::DDS::OwnershipStr ddsqos.value = qos.value; } +inline void +operator>>= (const ::DDS_OwnershipStrengthQosPolicy &qos, ::DDS::OwnershipStrengthQosPolicy & ddsqos) +{ + ddsqos.value = qos.value; +} + +inline void +operator>>= (const ::DDS::OwnershipStrengthQosPolicy &qos, ::DDS_OwnershipStrengthQosPolicy & ddsqos) +{ + ddsqos.value = qos.value; +} #endif #endif /* DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h index e9425c13a71..49a84ebc20c 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h @@ -9,7 +9,7 @@ #ifndef DDS4CCM_PARTITIONQOSPOLICY_H #define DDS4CCM_PARTITIONQOSPOLICY_H -#include "StringSeq.h" +#include "dds4ccm/impl/ndds/StringSeq.h" #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) typedef ::DDS::PartitionQosPolicy DDS_PartitionQosPolicy; @@ -28,6 +28,17 @@ operator<<= (::DDS_PartitionQosPolicy &ddsqos, const ::DDS::PartitionQosPolicy & ddsqos.name <<= qos.name; } +inline void +operator>>= (const ::DDS_PartitionQosPolicy &qos, ::DDS::PartitionQosPolicy & ddsqos) +{ + ddsqos.name <<= qos.name; +} + +inline void +operator>>= (const ::DDS::PartitionQosPolicy &qos, ::DDS_PartitionQosPolicy & ddsqos) +{ + ddsqos.name <<= qos.name; +} #endif #endif /* DDS4CCM_PARTITIONQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp index 02c81857d3e..1344dd510fd 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" -#include "dds4ccm/impl/dds/DataReader.h" +#include "dds4ccm/impl/ndds/DataReader.h" #include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds/DataReaderHandler_T.h" +#include "dds4ccm/impl/ndds/DataReaderHandler_T.h" #include "tao/ORB_Core.h" template <typename DDS_TYPE, typename CCM_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.h index 14cbecb1e5a..f228db9bcca 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.h @@ -79,6 +79,6 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/PortStatusListener_T.cpp" +#include "dds4ccm/impl/ndds/PortStatusListener_T.cpp" #endif /* DDS4CCM_PORTSTATUSLISTENER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h index c9456173af1..b2018f2ec82 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h @@ -30,6 +30,21 @@ operator<<= (::DDS_PresentationQosPolicy &ddsqos, const ::DDS::PresentationQosPo ddsqos.ordered_access = qos.ordered_access; } +inline void +operator>>= (const ::DDS_PresentationQosPolicy &qos, ::DDS::PresentationQosPolicy & ddsqos) +{ + ddsqos.access_scope = static_cast < ::DDS::PresentationQosPolicyAccessScopeKind> (qos.access_scope); + ddsqos.coherent_access = qos.coherent_access; + ddsqos.ordered_access = qos.ordered_access; +} + +inline void +operator>>= (const ::DDS::PresentationQosPolicy &qos, ::DDS_PresentationQosPolicy & ddsqos) +{ + ddsqos.access_scope = static_cast < DDS_PresentationQosPolicyAccessScopeKind> (qos.access_scope); + ddsqos.coherent_access = qos.coherent_access; + ddsqos.ordered_access = qos.ordered_access; +} #endif #endif /* DDS4CCM_PRESENTATIONQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h index 52ba73ee8ce..3ecbb2b2699 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h @@ -74,6 +74,54 @@ operator<<= (::DDS_PublicationBuiltinTopicData & ddstopicdata, const ::DDS::Publ ddstopicdata.group_data <<= topicdata.group_data; } +inline void +operator>>= (const ::DDS_PublicationBuiltinTopicData & topicdata, ::DDS::PublicationBuiltinTopicData & ddstopicdata) +{ + ddstopicdata.key <<= topicdata.key; + ddstopicdata.participant_key <<= topicdata.participant_key; + ddstopicdata.topic_name = topicdata.topic_name; + ddstopicdata.type_name = topicdata.type_name; + ddstopicdata.durability <<= topicdata.durability; + ddstopicdata.durability_service <<= topicdata.durability_service; + ddstopicdata.deadline <<= topicdata.deadline; + ddstopicdata.latency_budget <<= topicdata.latency_budget; + ddstopicdata.liveliness <<= topicdata.liveliness; + ddstopicdata.reliability <<= topicdata.reliability; + ddstopicdata.lifespan <<= topicdata.lifespan; + ddstopicdata.user_data <<= topicdata.user_data; + ddstopicdata.ownership <<= topicdata.ownership; + ddstopicdata.ownership_strength <<= topicdata.ownership_strength; + ddstopicdata.destination_order <<= topicdata.destination_order; + ddstopicdata.presentation <<= topicdata.presentation; + ddstopicdata.partition <<= topicdata.partition; + ddstopicdata.topic_data <<= topicdata.topic_data; + ddstopicdata.group_data <<= topicdata.group_data; +} + +inline void +operator>>= (const ::DDS::PublicationBuiltinTopicData & topicdata, ::DDS_PublicationBuiltinTopicData & ddstopicdata) +{ + ddstopicdata.key <<= topicdata.key; + ddstopicdata.participant_key <<= topicdata.participant_key; + ddstopicdata.topic_name = CORBA::string_dup (topicdata.topic_name); + ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name); + ddstopicdata.durability <<= topicdata.durability; + ddstopicdata.durability_service <<= topicdata.durability_service; + ddstopicdata.deadline <<= topicdata.deadline; + ddstopicdata.latency_budget <<= topicdata.latency_budget; + ddstopicdata.liveliness <<= topicdata.liveliness; + ddstopicdata.reliability <<= topicdata.reliability; + ddstopicdata.lifespan <<= topicdata.lifespan; + ddstopicdata.user_data <<= topicdata.user_data; + ddstopicdata.ownership <<= topicdata.ownership; + ddstopicdata.ownership_strength <<= topicdata.ownership_strength; + ddstopicdata.destination_order <<= topicdata.destination_order; + ddstopicdata.presentation <<= topicdata.presentation; + ddstopicdata.partition <<= topicdata.partition; + ddstopicdata.topic_data <<= topicdata.topic_data; + ddstopicdata.group_data <<= topicdata.group_data; +} + #endif #endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h index a3fe72f1e62..819a2d447aa 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h @@ -37,6 +37,25 @@ operator<<= (::DDS_PublicationMatchedStatus &ddsstatus, const ::DDS::Publication ddsstatus.last_subscription_handle <<= status.last_subscription_handle; } +inline void +operator>>= (const ::DDS_PublicationMatchedStatus &status, ::DDS::PublicationMatchedStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.current_count = status.current_count; + ddsstatus.current_count_change = status.current_count_change; + ddsstatus.last_subscription_handle <<= status.last_subscription_handle; +} + +inline void +operator>>= (const ::DDS::PublicationMatchedStatus &status, ::DDS_PublicationMatchedStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.current_count = status.current_count; + ddsstatus.current_count_change = status.current_count_change; + ddsstatus.last_subscription_handle <<= status.last_subscription_handle; +} #endif #endif /* DDS4CCM_PUBLICATIONMATCHEDSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp index 73f596c11b5..5e3efc9217b 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Publisher.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp @@ -6,13 +6,12 @@ #include "DataWriter.h" #include "StatusCondition.h" #include "Utils.h" +#include "Duration_t.h" +#include "InstanceHandle_t.h" #include "DataWriterListener.h" - -#include "ndds/InstanceHandle_t.h" -#include "ndds/Duration_t.h" -#include "ndds/DataWriterQos.h" -#include "ndds/PublisherQos.h" -#include "ndds/TopicQos.h" +#include "DataWriterQos.h" +#include "PublisherQos.h" +#include "TopicQos.h" #include "dds4ccm/idl/dds4ccm_BaseC.h" @@ -53,36 +52,36 @@ namespace CIAO throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); } - DDSDataWriterListener *ccm_dds_drl = 0; + DDSDataWriterListener *rti_drl = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_drl, + ACE_NEW_THROW_EX (rti_drl, CCM_DDS_DataWriterListener_i (a_listener), CORBA::NO_MEMORY ()); } - DDS_DataWriterQos ccm_dds_qos = DDS_DATAWRITER_QOS_DEFAULT; - DDSDataWriter *ccm_dds_dw = this->impl ()->create_datawriter ( + DDS_DataWriterQos rti_qos = DDS_DATAWRITER_QOS_DEFAULT; + DDSDataWriter *rti_dw = this->impl ()->create_datawriter ( topic->get_impl (), - ccm_dds_qos, - ccm_dds_drl, + rti_qos, + rti_drl, mask); - if (!ccm_dds_dw) + if (!rti_dw) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter - " "Error: RTI Topic returned a nil datawriter.\n")); - delete ccm_dds_drl; + delete rti_drl; throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil (); ACE_NEW_THROW_EX (retval, - CCM_DDS_DataWriter_i (ccm_dds_dw), + CCM_DDS_DataWriter_i (rti_dw), CORBA::NO_MEMORY ()); - ccm_dds_dw->enable (); + rti_dw->enable (); CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ()); - dw->set_impl (ccm_dds_dw); + dw->set_impl (rti_dw); return retval._retn (); #else @@ -113,36 +112,36 @@ namespace CIAO throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); } - DDSDataWriterListener *ccm_dds_drl = 0; + DDSDataWriterListener *rti_drl = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_drl, + ACE_NEW_THROW_EX (rti_drl, CCM_DDS_DataWriterListener_i (a_listener), CORBA::NO_MEMORY ()); } - DDSDataWriter *ccm_dds_dw = this->impl ()->create_datawriter_with_profile ( + DDSDataWriter *rti_dw = this->impl ()->create_datawriter_with_profile ( topic->get_impl (), library_name, profile_name, - ccm_dds_drl, + rti_drl, mask); - if (!ccm_dds_dw) + if (!rti_dw) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter_with_profile - " "Error: RTI Topic returned a nil datawriter.\n")); - delete ccm_dds_drl; + delete rti_drl; throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil (); ACE_NEW_THROW_EX (retval, - CCM_DDS_DataWriter_i (ccm_dds_dw), + CCM_DDS_DataWriter_i (rti_dw), CORBA::NO_MEMORY ()); - ccm_dds_dw->enable (); + rti_dw->enable (); CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ()); - dw->set_impl (ccm_dds_dw); + dw->set_impl (rti_dw); return retval._retn (); } @@ -212,9 +211,9 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_Publisher_i::set_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_PublisherQos ccm_dds_qos; - ccm_dds_qos <<= qos; - return this->impl()->set_qos (ccm_dds_qos); + ::DDS_PublisherQos rti_qos; + rti_qos <<= qos; + return this->impl()->set_qos (rti_qos); #else return this->impl ()->set_qos (qos); #endif @@ -225,11 +224,11 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_PublisherQos ccm_dds_qos; - ccm_dds_qos <<= qos; + ::DDS_PublisherQos rti_qos; + rti_qos <<= qos; ::DDS::ReturnCode_t retcode = this->impl()-> - get_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; + get_qos (rti_qos); + qos <<= rti_qos; return retcode; #else return this->impl ()->get_qos (qos); @@ -243,14 +242,14 @@ namespace CIAO DDS4CCM_TRACE ("CCM_DDS_Publisher_i::set_listener"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_PublisherListener_i *ccm_dds_impl_list = 0; + CCM_DDS_PublisherListener_i *rti_impl_list = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_impl_list, + ACE_NEW_THROW_EX (rti_impl_list, CCM_DDS_PublisherListener_i (a_listener), CORBA::NO_MEMORY ()); } - return this->impl ()->set_listener (ccm_dds_impl_list, mask); + return this->impl ()->set_listener (rti_impl_list, mask); #else return this->impl ()->set_listener (a_listener, mask); #endif @@ -262,8 +261,8 @@ namespace CIAO DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_listener"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSPublisherListener *ccm_dds_pub_list = this->impl ()->get_listener (); - CCM_DDS_PublisherListener_i *list_proxy = dynamic_cast <CCM_DDS_PublisherListener_i *> (ccm_dds_pub_list); + DDSPublisherListener *rti_pub_list = this->impl ()->get_listener (); + CCM_DDS_PublisherListener_i *list_proxy = dynamic_cast <CCM_DDS_PublisherListener_i *> (rti_pub_list); if (!list_proxy) { DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Publisher_i::get_listener - " @@ -304,9 +303,9 @@ namespace CIAO CCM_DDS_Publisher_i::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_Duration_t ccm_dds_dds_duration; - ccm_dds_dds_duration <<= max_wait; - return this->impl ()->wait_for_acknowledgments (ccm_dds_dds_duration); + DDS_Duration_t rti_dds_duration; + rti_dds_duration <<= max_wait; + return this->impl ()->wait_for_acknowledgments (rti_dds_duration); #else return this->impl ()->wait_for_acknowledgments (max_wait); #endif @@ -336,9 +335,9 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_Publisher_i::set_default_datawriter_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DataWriterQos ccm_dds_qos; - ccm_dds_qos <<= qos; - return this->impl()->set_default_datawriter_qos (ccm_dds_qos); + ::DDS_DataWriterQos rti_qos; + rti_qos <<= qos; + return this->impl()->set_default_datawriter_qos (rti_qos); #else return this->impl()->set_default_datawriter_qos (qos); #endif @@ -349,10 +348,10 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_default_datawriter_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DataWriterQos ccm_dds_qos; + ::DDS_DataWriterQos rti_qos; ::DDS::ReturnCode_t retcode = - this->impl()->get_default_datawriter_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; + this->impl()->get_default_datawriter_qos (rti_qos); + qos <<= rti_qos; return retcode; #else return this->impl()->get_default_datawriter_qos (qos); @@ -365,15 +364,15 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_Publisher_i::copy_from_topic_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DataWriterQos ccm_dds_qos; - ::DDS_TopicQos ccm_dds_topic_qos; + ::DDS_DataWriterQos rti_qos; + ::DDS_TopicQos rti_topic_qos; - ccm_dds_qos <<= a_dataimpl_qos; - ccm_dds_topic_qos <<= a_impl_qos; + rti_qos <<= a_dataimpl_qos; + rti_topic_qos <<= a_impl_qos; ::DDS::ReturnCode_t retcode = - this->impl()->copy_from_topic_qos (ccm_dds_qos, - ccm_dds_topic_qos); - a_dataimpl_qos <<= ccm_dds_qos; + this->impl()->copy_from_topic_qos (rti_qos, + rti_topic_qos); + a_dataimpl_qos <<= rti_qos; return retcode; #else return this->impl()->copy_from_topic_qos (a_dataimpl_qos, diff --git a/CIAO/connectors/dds4ccm/impl/dds/Publisher.h b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h index 6943c2783da..f090330c618 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Publisher.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h @@ -15,7 +15,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" #include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) # include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp index 3c71be88f87..8cd479f7d89 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp @@ -3,16 +3,14 @@ #include "PublisherListener.h" #include "Publisher.h" #include "DataWriter.h" - -#include "ndds/PublicationMatchedStatus.h" -#include "ndds/LivelinessLostStatus.h" -#include "ndds/OfferedIncompatibleQosStatus.h" -#include "ndds/OfferedDeadlineMissedStatus.h" +#include "PublicationMatchedStatus.h" +#include "LivelinessLostStatus.h" +#include "OfferedIncompatibleQosStatus.h" +#include "OfferedDeadlineMissedStatus.h" +#include "dds4ccm/impl/logger/Log_Macros.h" #include "dds4ccm/idl/dds4ccm_BaseC.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - namespace CIAO { namespace DDS4CCM diff --git a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h index 0c408332357..4feaaeb4e31 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h @@ -15,7 +15,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" #include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) # include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp index 5eba489e62c..f1789309e7c 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" -#include "dds4ccm/impl/dds/DataReader.h" +#include "dds4ccm/impl/ndds/DataReader.h" #include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds/DataReaderHandler_T.h" -#include "dds4ccm/impl/dds/DDSCallbackStatusHandler.h" +#include "dds4ccm/impl/ndds/DataReaderHandler_T.h" +#include "dds4ccm/impl/ndds/DDSCallbackStatusHandler.h" #include "tao/ORB_Core.h" template <typename DDS_TYPE, typename CCM_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h index d094cee1567..0543b5a4de0 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h @@ -72,7 +72,7 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/PublisherListener_T.cpp" +#include "dds4ccm/impl/ndds/PublisherListener_T.cpp" #endif /* DDS_PUBLISHERLISTENER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublisherQos.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h index 0b074b1e368..f948216ebe7 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublisherQos.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h @@ -37,6 +37,23 @@ operator<<= (::DDS_PublisherQos &ddsqos, const ::DDS::PublisherQos & qos) ddsqos.entity_factory <<= qos.entity_factory; } +inline void +operator>>= (const ::DDS_PublisherQos &qos, ::DDS::PublisherQos & ddsqos) +{ + ddsqos.presentation <<= qos.presentation; + ddsqos.partition <<= qos.partition; + ddsqos.group_data <<= qos.group_data; + ddsqos.entity_factory <<= qos.entity_factory; +} + +inline void +operator>>= (const ::DDS::PublisherQos &qos, ::DDS_PublisherQos & ddsqos) +{ + ddsqos.presentation <<= qos.presentation; + ddsqos.partition <<= qos.partition; + ddsqos.group_data <<= qos.group_data; + ddsqos.entity_factory <<= qos.entity_factory; +} #endif #endif /* DDS4CCM_PUBLISHERQOS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h index ebe11431d1e..01b6abd175c 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h @@ -37,6 +37,27 @@ operator<<= (::DDS_QosPolicyCountSeq & ddspolicycount, const ::DDS::QosPolicyCou } } +inline void +operator>>= (const ::DDS_QosPolicyCountSeq & policycount, ::DDS::QosPolicyCountSeq & ddspolicycount) +{ + ddspolicycount.length (policycount.length ()); + for (::DDS_Long i = 0 ; i < policycount.length (); ++i) + { + ddspolicycount[i].policy_id = policycount[i].policy_id; + ddspolicycount[i].count = policycount[i].count; + } +} + +inline void +operator>>= (const ::DDS::QosPolicyCountSeq & policycount, ::DDS_QosPolicyCountSeq & ddspolicycount) +{ + ddspolicycount.length (policycount.length ()); + for (::CORBA::ULong i = 0 ; i < policycount.length (); ++i) + { + ddspolicycount[i].policy_id = static_cast <DDS_QosPolicyId_t> (policycount[i].policy_id); + ddspolicycount[i].count = policycount[i].count; + } +} #endif #endif /* DDS4CCM_QOSPOLICYCOUNTSEQ_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp index 84f742d3e10..2d9b6b8ee97 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp @@ -3,8 +3,7 @@ #include "QueryCondition.h" #include "Subscriber.h" #include "DataReader.h" - -#include "ndds/StringSeq.h" +#include "StringSeq.h" #include "dds4ccm/idl/dds4ccm_BaseC.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h index 5fd66fc5584..e0a5abee529 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h @@ -15,7 +15,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" #include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) #include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/ReadCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp index e8459b51e0a..e8459b51e0a 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ReadCondition.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp diff --git a/CIAO/connectors/dds4ccm/impl/dds/ReadCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h index 450102cb5b2..10ee871c817 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ReadCondition.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h @@ -15,7 +15,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" #include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) #include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h index b7fe64725a1..b383e26b23c 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h @@ -14,9 +14,6 @@ typedef ::DDS::ReaderDataLifecycleQosPolicy DDS_ReaderDataLifecycleQosPolicy; #endif #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - -#include "Duration_t.h" - inline void operator<<= (::DDS::ReaderDataLifecycleQosPolicy &ddsqos, const ::DDS_ReaderDataLifecycleQosPolicy & qos) { @@ -31,6 +28,19 @@ operator<<= (::DDS_ReaderDataLifecycleQosPolicy &ddsqos, const ::DDS::ReaderData ddsqos.autopurge_disposed_samples_delay <<= qos.autopurge_disposed_samples_delay; } +inline void +operator>>= (const ::DDS_ReaderDataLifecycleQosPolicy &qos, ::DDS::ReaderDataLifecycleQosPolicy & ddsqos) +{ + ddsqos.autopurge_nowriter_samples_delay <<= qos.autopurge_nowriter_samples_delay; + ddsqos.autopurge_disposed_samples_delay <<= qos.autopurge_disposed_samples_delay; +} + +inline void +operator>>= (const ::DDS::ReaderDataLifecycleQosPolicy &qos, ::DDS_ReaderDataLifecycleQosPolicy & ddsqos) +{ + ddsqos.autopurge_nowriter_samples_delay <<= qos.autopurge_nowriter_samples_delay; + ddsqos.autopurge_disposed_samples_delay <<= qos.autopurge_disposed_samples_delay; +} #endif #endif /* DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp index 8989c8a1b1d..5a58128b760 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Reader_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp @@ -1,23 +1,21 @@ // $Id$ -#include "dds4ccm/impl/dds/DataReader.h" -#include "dds4ccm/impl/dds/DataReaderListener_T.h" -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/Subscriber.h" -#include "dds4ccm/impl/dds/QueryCondition.h" - -#include "dds4ccm/impl/dds/ndds/SampleInfo.h" - +#include "dds4ccm/impl/ndds/DataReader.h" +#include "dds4ccm/impl/ndds/DataReaderListener_T.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/SampleInfo.h" +#include "dds4ccm/impl/ndds/Subscriber.h" +#include "dds4ccm/impl/ndds/QueryCondition.h" #include "dds4ccm/impl/logger/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE> -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::Reader_T (void) +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::Reader_T (void) : topic_ (0), library_name_ (""), profile_name_ (""), impl_ (0) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Reader_T::Reader_T"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::Reader_T"); #if defined DDS4CCM_USES_QUERY_CONDITION this->qc_ = DDS::QueryCondition::_nil (); #else @@ -26,14 +24,14 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::Reader_T (void) } template <typename DDS_TYPE, typename CCM_TYPE> -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::~Reader_T (void) +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::~Reader_T (void) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Reader_T::~Reader_T"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::~Reader_T"); } template <typename DDS_TYPE, typename CCM_TYPE> typename DDS_TYPE::data_reader * -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::impl (void) +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::impl (void) { if (this->impl_) { @@ -49,7 +47,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::impl (void) // ordered_access -> true and DDS_INSTANCE_PRESENTATION_QOS (default) . template <typename DDS_TYPE, typename CCM_TYPE> CORBA::ULong -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::get_nr_valid_samples ( +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::get_nr_valid_samples ( const DDS_SampleInfoSeq& sample_info, bool determine_last) { @@ -73,33 +71,22 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::get_nr_valid_samples ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_without_instance ( +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_without_instance ( typename DDS_TYPE::dds_seq_type & data, DDS_SampleInfoSeq & sample_info) { - DDS_ReturnCode_t retval = DDS_RETCODE_ERROR; -#if defined DDS4CCM_USES_QUERY_CONDITION - if (!CORBA::is_nil (this->qc_)) - { - this->impl ()->read_w_condition (data, - sample_info, - DDS_LENGTH_UNLIMITED, - this->qc_->get_impl ()); - } - else - throw ::CCM_DDS::InternalError (retval, 0); -#else - retval = this->impl ()->read (data, + DDS_ReturnCode_t const retval = this->impl ()->read ( + data, sample_info, DDS_LENGTH_UNLIMITED, DDS_READ_SAMPLE_STATE | DDS_NOT_READ_SAMPLE_STATE, DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, DDS_ALIVE_INSTANCE_STATE); -#endif + if (retval != DDS_RETCODE_OK && retval != DDS_RETCODE_NO_DATA) { this->impl ()->return_loan(data, sample_info); - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Reader_T::read_without_instance - ") + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_without_instance - ") ACE_TEXT ("retval is %C\n"), translate_retcode(retval))); throw ::CCM_DDS::InternalError (retval, 0); } @@ -108,7 +95,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_without_instance ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_last ( +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_last ( typename CCM_TYPE::seq_type::_out_type instances, ::CCM_DDS::ReadInfoSeq_out infos) { @@ -118,18 +105,12 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_last ( this->read_without_instance (data, sample_info); - typename CCM_TYPE::seq_type * inst_seq = 0; - ACE_NEW_THROW_EX (inst_seq, - typename CCM_TYPE::seq_type, - CORBA::NO_MEMORY ()); - ::CCM_DDS::ReadInfoSeq * infoseq = 0; - ACE_NEW_THROW_EX (infoseq, - ::CCM_DDS::ReadInfoSeq, - CORBA::NO_MEMORY ()); + typename CCM_TYPE::seq_type::_var_type inst_seq = new typename CCM_TYPE::seq_type; + ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq; CORBA::ULong const nr_of_last_samples = this->get_nr_valid_samples (sample_info, true); - DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Reader_T::read_last - ") + DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_last - ") ACE_TEXT ("total number of samples <%u> - ") ACE_TEXT ("last number of samples <%u>\n"), data.length(), @@ -144,21 +125,21 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_last ( { if((sample_info[i].sample_rank == 0) && (sample_info[i].valid_data)) { - (*infoseq)[ix] <<= sample_info[i]; - (*inst_seq)[ix] = data[i]; + infoseq[ix] <<= sample_info[i]; + inst_seq[ix] = data[i]; ++ix; } } // Return the loan this->impl ()->return_loan(data,sample_info); - infos = infoseq; - instances = inst_seq; + infos = infoseq._retn (); + instances = inst_seq._retn(); } template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_all ( +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_all ( typename CCM_TYPE::seq_type::_out_type instances, ::CCM_DDS::ReadInfoSeq_out infos) { @@ -169,20 +150,14 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_all ( this->read_without_instance (data, sample_info); CORBA::ULong const nr_of_valid_samples = this->get_nr_valid_samples (sample_info); - DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Reader_T::read_all - ") + DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_all - ") ACE_TEXT ("total number of samples <%u> - ") ACE_TEXT ("valid number of samples <%u>\n"), data.length (), nr_of_valid_samples)); - typename CCM_TYPE::seq_type * inst_seq = 0; - ACE_NEW_THROW_EX (inst_seq, - typename CCM_TYPE::seq_type, - CORBA::NO_MEMORY ()); - ::CCM_DDS::ReadInfoSeq * infoseq = 0; - ACE_NEW_THROW_EX (infoseq, - ::CCM_DDS::ReadInfoSeq, - CORBA::NO_MEMORY ()); + typename CCM_TYPE::seq_type::_var_type inst_seq = new typename CCM_TYPE::seq_type; + ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq; infoseq->length (nr_of_valid_samples); inst_seq->length (nr_of_valid_samples); @@ -193,8 +168,8 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_all ( { if(sample_info[i].valid_data) { - (*infoseq)[ix] <<= sample_info[i]; - (*inst_seq)[ix] = data[i]; + infoseq[ix] <<= sample_info[i]; + inst_seq[ix] = data[i]; ++ix; } } @@ -202,13 +177,13 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_all ( // Return the loan this->impl ()->return_loan(data,sample_info); - infos = infoseq; - instances = inst_seq; + infos = infoseq._retn (); + instances = inst_seq._retn(); } template <typename DDS_TYPE, typename CCM_TYPE> DDS_InstanceHandle_t -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::check_handle ( +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::check_handle ( const typename DDS_TYPE::value_type& an_instance, const ::DDS::InstanceHandle_t & instance_handle) { @@ -231,12 +206,12 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::check_handle ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_with_instance ( +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_with_instance ( typename DDS_TYPE::dds_seq_type & data, const ::DDS_InstanceHandle_t & lookup_hnd, DDS_SampleInfoSeq & sample_info) { - DDS4CCM_DEBUG (6, (LM_INFO, ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Reader_T::read_with_instance - ") + DDS4CCM_DEBUG (6, (LM_INFO, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_with_instance - ") ACE_TEXT ("Reading with instance.\n"))); DDS_ReturnCode_t const retval = this->impl ()->read_instance ( data, @@ -249,7 +224,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_with_instance ( if (retval != DDS_RETCODE_OK && retval != DDS_RETCODE_NO_DATA) { this->impl ()->return_loan(data, sample_info); - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Reader_T::read_with_instance - ") + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_with_instance - ") ACE_TEXT ("retval is %C\n"), translate_retcode(retval))); throw ::CCM_DDS::InternalError (retval, 0); } @@ -257,7 +232,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_with_instance ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_last ( +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_last ( typename DDS_TYPE::value_type& an_instance, ::CCM_DDS::ReadInfo_out info, const ::DDS::InstanceHandle_t & instance_handle) @@ -272,7 +247,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_last ( ::DDS_Long sample = data.length(); DDS4CCM_DEBUG (6, (LM_INFO, - ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Reader_T::read_one_last - ") + ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_one_last - ") ACE_TEXT ("total number of samples <%u>\n"), sample)); while (sample >= 0 && !sample_info[sample-1].valid_data) @@ -293,7 +268,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_last ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_all ( +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_all ( const typename DDS_TYPE::value_type& an_instance, typename CCM_TYPE::seq_type::_out_type instances, ::CCM_DDS::ReadInfoSeq_out infos, @@ -309,20 +284,14 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_all ( // Count the number of valid samples CORBA::ULong const nr_of_valid_samples = this->get_nr_valid_samples (sample_info); - DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Reader_T::read_all - ") + DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_all - ") ACE_TEXT ("total number of samples <%u> - ") ACE_TEXT ("valid number of samples <%u>\n"), data.length (), nr_of_valid_samples)); - typename CCM_TYPE::seq_type * inst_seq = 0; - ACE_NEW_THROW_EX (inst_seq, - typename CCM_TYPE::seq_type (nr_of_valid_samples), - CORBA::NO_MEMORY ()); - ::CCM_DDS::ReadInfoSeq * infoseq = 0; - ACE_NEW_THROW_EX (infoseq, - ::CCM_DDS::ReadInfoSeq (nr_of_valid_samples), - CORBA::NO_MEMORY ()); + typename CCM_TYPE::seq_type::_var_type inst_seq = new typename CCM_TYPE::seq_type (nr_of_valid_samples); + ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq (nr_of_valid_samples); infoseq->length (nr_of_valid_samples); inst_seq->length (nr_of_valid_samples); @@ -333,8 +302,8 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_all ( { if(sample_info[i].valid_data) { - (*infoseq)[ix] <<= sample_info[i]; - (*inst_seq)[ix] = data[i]; + infoseq[ix] <<= sample_info[i]; + inst_seq[ix] = data[i]; ++ix; } } @@ -342,27 +311,27 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_all ( // Return the loan this->impl ()->return_loan(data, sample_info); - infos = infoseq; - instances = inst_seq; + infos = infoseq._retn (); + instances = inst_seq._retn(); } template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::create_filter ( +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::create_filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Reader_T::create_filter"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::create_filter"); ::DDS::Subscriber_var sub = this->reader_->get_subscriber (); if (CORBA::is_nil (sub)) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::create_filter - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - " "Error: Unable to get Subscriber.\n")); throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::DomainParticipant_var dp = sub->get_participant (); if (CORBA::is_nil (dp)) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::create_filter - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - " "Error: Unable to get Participant.\n")); throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1); } @@ -374,7 +343,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::create_filter ( filter.query_parameters); if (CORBA::is_nil (this->cft_)) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::create_filter - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - " "Error: Unable to create ContentFilteredTopic.\n")); throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1); } @@ -388,7 +357,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::create_filter ( ::DDS::ReturnCode_t const retval = sub->delete_datareader (this->reader_); if (retval != ::DDS::RETCODE_OK) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::create_filter - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - " "Error: Unable to delete DataReader.\n")); } this->reader_ = ::DDS::CCM_DataReader::_nil (); @@ -417,7 +386,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::create_filter ( } if (CORBA::is_nil(reader)) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::create_filter - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - " "Error: Unable to create a new DataReader.\n")); } this->reader_ = ::DDS::CCM_DataReader::_narrow (reader); @@ -426,54 +395,48 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::create_filter ( template <typename DDS_TYPE, typename CCM_TYPE> ::CCM_DDS::QueryFilter * - CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::filter (void) + CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::filter (void) { #if defined DDS4CCM_USES_QUERY_CONDITION if (CORBA::is_nil (this->qc_)) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::filter - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - " "Error: No QueryCondition set yet. First set a filter.\n")); throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } - ::CCM_DDS::QueryFilter_var filter = 0; - ACE_NEW_THROW_EX (filter, - ::CCM_DDS::QueryFilter(), - CORBA::NO_MEMORY ()); + ::CCM_DDS::QueryFilter * filter = new ::CCM_DDS::QueryFilter(); filter->query = this->qc_->get_query_expression (); this->qc_->get_query_parameters (filter->query_parameters); - return filter._retn (); + return filter; #else if (CORBA::is_nil (this->cft_)) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::filter - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - " "Error: No ContentFilter set yet. First set a filter.\n")); throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } - ::CCM_DDS::QueryFilter_var filter = 0; - ACE_NEW_THROW_EX (filter, - ::CCM_DDS::QueryFilter(), - CORBA::NO_MEMORY ()); + ::CCM_DDS::QueryFilter * filter = new ::CCM_DDS::QueryFilter(); filter->query = this->cft_->get_filter_expression (); ::DDS::ReturnCode_t const retval = this->cft_->get_expression_parameters ( filter->query_parameters); if (retval != DDS::RETCODE_OK) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::filter - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - " "Error getting expression_parameters. " "Retval is %C\n", translate_retcode(retval))); throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, retval); } - return filter._retn (); + return filter; #endif } template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::filter ( +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Reader_T::filter"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::filter"); #if defined DDS4CCM_USES_QUERY_CONDITION if (CORBA::is_nil (this->qc_)) { @@ -485,7 +448,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::filter ( filter.query_parameters); if (CORBA::is_nil (this->qc_)) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::filter - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - " "Error creating query condition.")); throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1); } @@ -496,7 +459,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::filter ( filter.query_parameters); if (retval != ::DDS::RETCODE_OK) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::filter - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - " "Error setting expression_parameters. " "Retval is %C\n", translate_retcode(retval))); @@ -514,7 +477,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::filter ( filter.query_parameters); if (retval != ::DDS::RETCODE_OK) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::filter - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - " "Error setting expression_parameters. " "Retval is %C\n", translate_retcode(retval))); @@ -526,7 +489,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::filter ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::set_qos ( +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::set_qos ( ::DDS::Topic_ptr topic, const char * library_name, const char * profile_name) @@ -538,10 +501,10 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::set_qos ( template <typename DDS_TYPE, typename CCM_TYPE> void -CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::set_impl ( +CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::set_impl ( ::DDS::DataReader_ptr reader) { - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Reader_T::set_impl"); + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::set_impl"); if (::CORBA::is_nil (reader)) { @@ -554,7 +517,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::set_impl ( if (!rdr) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::data_reader - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::data_reader - " "Unable to cast provided DataReader to servant\n")); throw ::CORBA::INTERNAL (); } @@ -563,7 +526,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE>::set_impl ( if (!this->impl ()) { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::data_reader - " + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::data_reader - " "Unable to narrow the provided reader entity to the specific " "type necessary to publish messages\n")); throw ::CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/impl/dds/Reader_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h index 056920f1921..de473f0e4c7 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Reader_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h @@ -21,7 +21,7 @@ namespace CIAO { namespace DDS4CCM { - namespace DDS_CCM + namespace RTI { template <typename DDS_TYPE, typename CCM_TYPE> class Reader_T : @@ -106,7 +106,7 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/Reader_T.cpp" +#include "dds4ccm/impl/ndds/Reader_T.cpp" #endif /* DDS_READER_T */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h index 68b94c506d1..031474a4484 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h @@ -30,6 +30,19 @@ operator<<= (::DDS_ReliabilityQosPolicy &ddsqos, const ::DDS::ReliabilityQosPoli ddsqos.max_blocking_time <<= qos.max_blocking_time; } +inline void +operator>>= (const ::DDS_ReliabilityQosPolicy &qos, ::DDS::ReliabilityQosPolicy & ddsqos) +{ + ddsqos.kind = static_cast < ::DDS::ReliabilityQosPolicyKind> (qos.kind); + ddsqos.max_blocking_time <<= qos.max_blocking_time; +} + +inline void +operator>>= (const ::DDS::ReliabilityQosPolicy &qos, ::DDS_ReliabilityQosPolicy & ddsqos) +{ + ddsqos.kind = static_cast < ::DDS_ReliabilityQosPolicyKind> (qos.kind); + ddsqos.max_blocking_time <<= qos.max_blocking_time; +} #endif #endif /* DDS4CCM_RELIABILITYSQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h index 3491e007a36..fe0fa067115 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h @@ -33,6 +33,21 @@ operator<<= (::DDS_RequestedDeadlineMissedStatus &ddsstatus, const ::DDS::Reques ddsstatus.last_instance_handle <<= status.last_instance_handle; } +inline void +operator>>= (const ::DDS_RequestedDeadlineMissedStatus &status, ::DDS::RequestedDeadlineMissedStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.last_instance_handle <<= status.last_instance_handle; +} + +inline void +operator>>= (const ::DDS::RequestedDeadlineMissedStatus &status, ::DDS_RequestedDeadlineMissedStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.last_instance_handle <<= status.last_instance_handle; +} #endif #endif /* DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h index 7aa47631de4..2300236f884 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h @@ -35,6 +35,23 @@ operator<<= (::DDS_RequestedIncompatibleQosStatus &ddsstatus, const ::DDS::Reque ddsstatus.policies <<= status.policies; } +inline void +operator>>= (const ::DDS_RequestedIncompatibleQosStatus &status, ::DDS::RequestedIncompatibleQosStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.last_policy_id = status.last_policy_id; + ddsstatus.policies <<= status.policies; +} + +inline void +operator>>= (const ::DDS::RequestedIncompatibleQosStatus &status, ::DDS_RequestedIncompatibleQosStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.last_policy_id = static_cast <DDS_QosPolicyId_t>(status.last_policy_id); + ddsstatus.policies <<= status.policies; +} #endif #endif /* DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h index 3666c21ecd5..439c4c0047b 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h @@ -30,6 +30,21 @@ operator<<= (::DDS_ResourceLimitsQosPolicy &ddsqos, const ::DDS::ResourceLimitsQ ddsqos.max_samples_per_instance = qos.max_samples_per_instance; } +inline void +operator>>= (const ::DDS_ResourceLimitsQosPolicy &qos, ::DDS::ResourceLimitsQosPolicy & ddsqos) +{ + ddsqos.max_samples = qos.max_samples; + ddsqos.max_instances = qos.max_instances; + ddsqos.max_samples_per_instance = qos.max_samples_per_instance; +} + +inline void +operator>>= (const ::DDS::ResourceLimitsQosPolicy &qos, ::DDS_ResourceLimitsQosPolicy & ddsqos) +{ + ddsqos.max_samples = qos.max_samples; + ddsqos.max_instances = qos.max_instances; + ddsqos.max_samples_per_instance = qos.max_samples_per_instance; +} #endif #endif /* DDS4CCM_RESOURCELIMITSQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleInfo.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h index 8d3d816576d..8d3d816576d 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleInfo.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h index 920f4051bd4..920f4051bd4 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h index 1623d9b3ce8..032aca41a8c 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h @@ -35,6 +35,23 @@ operator<<= (::DDS_SampleRejectedStatus &ddsstatus, const ::DDS::SampleRejectedS ddsstatus.last_instance_handle <<= status.last_instance_handle; } +inline void +operator>>= (const ::DDS_SampleRejectedStatus &status, ::DDS::SampleRejectedStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.last_reason = static_cast < ::DDS::SampleRejectedStatusKind> (status.last_reason); + ddsstatus.last_instance_handle <<= status.last_instance_handle; +} + +inline void +operator>>= (const ::DDS::SampleRejectedStatus &status, ::DDS_SampleRejectedStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.last_reason = static_cast < ::DDS_SampleRejectedStatusKind> (status.last_reason); + ddsstatus.last_instance_handle <<= status.last_instance_handle; +} #endif #endif /* DDS4CCM_SAMPLEREJECTEDSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp index 197e999eae8..197e999eae8 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp diff --git a/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.h index bbee0e73a71..87ed1de1034 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.h @@ -4,7 +4,7 @@ #ifndef DDS4CCM_STATELISTENERCONTROLI_H_ #define DDS4CCM_STATELISTENERCONTROLI_H_ -#include "dds4ccm/impl/dds/DataListenerControl_T.h" +#include "dds4ccm/impl/ndds/DataListenerControl_T.h" #include "dds4ccm/idl/dds4ccm_StateListenerControlEC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -32,7 +32,7 @@ private: ACE_Atomic_Op <TAO_SYNCH_MUTEX, ::CORBA::Boolean> is_filter_interpreted_; }; -#include "dds4ccm/impl/dds/StateListenerControl_T.cpp" +#include "dds4ccm/impl/ndds/StateListenerControl_T.cpp" #endif /* DDS4CCM_STATELISTENERCONTROLI_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp index 37baef77d72..37baef77d72 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp diff --git a/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h index 1cccb4a3fa1..1101549109a 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h @@ -15,7 +15,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" #include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) # include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/StringSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h index 6f75683fd3f..6f75683fd3f 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/StringSeq.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h diff --git a/CIAO/connectors/dds4ccm/impl/dds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp index 51f57c7b4b1..41ea04b1552 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Subscriber.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp @@ -8,11 +8,11 @@ #include "DataReaderListener.h" #include "Utils.h" #include "StatusCondition.h" +#include "InstanceHandle_t.h" -#include "ndds/InstanceHandle_t.h" -#include "ndds/DataReaderQos.h" -#include "ndds/SubscriberQos.h" -#include "ndds/TopicQos.h" +#include "DataReaderQos.h" +#include "SubscriberQos.h" +#include "TopicQos.h" #include "dds4ccm/idl/dds4ccm_BaseC.h" @@ -85,21 +85,21 @@ namespace CIAO DDSDataReader * CCM_DDS_Subscriber_i::create_datareader ( DDSContentFilteredTopic * topic, - DDSDataReaderListener * ccm_dds_drl, + DDSDataReaderListener * rti_drl, ::DDS::StatusMask mask, const ::DDS::DataReaderQos & qos) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) ACE_UNUSED_ARG (qos); - DDS_DataReaderQos ccm_dds_qos = DDS_DATAREADER_QOS_DEFAULT; + DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT; return this->impl ()->create_datareader (topic, - ccm_dds_qos, - ccm_dds_drl, + rti_qos, + rti_drl, mask); #else return this->impl ()->create_datareader (topic, qos, - ccm_dds_drl, + rti_drl, mask); #endif } @@ -107,21 +107,21 @@ namespace CIAO DDSDataReader * CCM_DDS_Subscriber_i::create_datareader ( DDSTopic * topic, - DDSDataReaderListener * ccm_dds_drl, + DDSDataReaderListener * rti_drl, ::DDS::StatusMask mask, const ::DDS::DataReaderQos & qos) { #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) ACE_UNUSED_ARG (qos); - DDS_DataReaderQos ccm_dds_qos = DDS_DATAREADER_QOS_DEFAULT; + DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT; return this->impl ()->create_datareader (topic, - ccm_dds_qos, - ccm_dds_drl, + rti_qos, + rti_drl, mask); #else return this->impl ()->create_datareader (topic, qos, - ccm_dds_drl, + rti_drl, mask); #endif } @@ -132,13 +132,13 @@ namespace CIAO DDSContentFilteredTopic * topic, const char * library_name, const char * profile_name, - DDSDataReaderListener * ccm_dds_drl, + DDSDataReaderListener * rti_drl, ::DDS::StatusMask mask) { return this->impl ()->create_datareader_with_profile (topic, library_name, profile_name, - ccm_dds_drl, + rti_drl, mask); } #endif @@ -149,13 +149,13 @@ namespace CIAO DDSTopic * topic, const char * library_name, const char * profile_name, - DDSDataReaderListener * ccm_dds_drl, + DDSDataReaderListener * rti_drl, ::DDS::StatusMask mask) { return this->impl ()->create_datareader_with_profile (topic, library_name, profile_name, - ccm_dds_drl, + rti_drl, mask); } #endif @@ -169,15 +169,15 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::create_datareader"); ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); - DDSDataReaderListener *ccm_dds_drl = 0; + DDSDataReaderListener *rti_drl = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_drl, + ACE_NEW_THROW_EX (rti_drl, CCM_DDS_DataReaderListener_i (a_listener), CORBA::NO_MEMORY ()); } - DDSDataReader * ccm_dds_dr = 0; + DDSDataReader * rti_dr = 0; CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); if (!topic) @@ -188,20 +188,20 @@ namespace CIAO { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::create_datareader - " "Error: Unable to cast provided topic to one of its servant.\n")); - delete ccm_dds_drl; + delete rti_drl; throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); } else - ccm_dds_dr = this->create_datareader (cf_topic->get_impl (), ccm_dds_drl, mask, qos); + rti_dr = this->create_datareader (cf_topic->get_impl (), rti_drl, mask, qos); } else - ccm_dds_dr = this->create_datareader (topic->get_impl (), ccm_dds_drl, mask, qos); + rti_dr = this->create_datareader (topic->get_impl (), rti_drl, mask, qos); - if (!ccm_dds_dr) + if (!rti_dr) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::create_datareader - " "Error: RTI Topic returned a nil datareader.\n")); - delete ccm_dds_drl; + delete rti_drl; throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } else @@ -210,9 +210,9 @@ namespace CIAO "Successfully created datareader.\n")); } - ccm_dds_dr->enable (); + rti_dr->enable (); ACE_NEW_THROW_EX (retval, - CCM_DDS_DataReader_i (ccm_dds_dr), + CCM_DDS_DataReader_i (rti_dr), CORBA::NO_MEMORY ()); return retval._retn (); } @@ -227,15 +227,15 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::create_datareader_with_profile"); ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); - DDSDataReaderListener *ccm_dds_drl = 0; + DDSDataReaderListener *rti_drl = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_drl, + ACE_NEW_THROW_EX (rti_drl, CCM_DDS_DataReaderListener_i (a_listener), CORBA::NO_MEMORY ()); } - DDSDataReader * ccm_dds_dr = 0; + DDSDataReader * rti_dr = 0; CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); if (!topic) @@ -246,28 +246,28 @@ namespace CIAO { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - " "Error: Unable to cast provided topic to one of its servant.\n")); - delete ccm_dds_drl; + delete rti_drl; throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); } else - ccm_dds_dr = this->create_datareader_with_profile (cf_topic->get_impl (), + rti_dr = this->create_datareader_with_profile (cf_topic->get_impl (), library_name, profile_name, - ccm_dds_drl, + rti_drl, mask); } else - ccm_dds_dr = this->create_datareader_with_profile (topic->get_impl (), + rti_dr = this->create_datareader_with_profile (topic->get_impl (), library_name, profile_name, - ccm_dds_drl, + rti_drl, mask); - if (!ccm_dds_dr) + if (!rti_dr) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - " "Error: RTI Topic returned a nil datareader.\n")); - delete ccm_dds_drl; + delete rti_drl; throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } else @@ -278,9 +278,9 @@ namespace CIAO profile_name)); } - ccm_dds_dr->enable (); + rti_dr->enable (); ACE_NEW_THROW_EX (retval, - CCM_DDS_DataReader_i (ccm_dds_dr), + CCM_DDS_DataReader_i (rti_dr), CORBA::NO_MEMORY ()); return retval._retn (); } @@ -361,9 +361,9 @@ namespace CIAO { CIAO_TRACE ("CCM_DDS_Subscriber_i::set_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_SubscriberQos ccm_dds_qos; - ccm_dds_qos <<= qos; - return this->impl ()->get_qos (ccm_dds_qos); + ::DDS_SubscriberQos rti_qos; + rti_qos <<= qos; + return this->impl ()->get_qos (rti_qos); #else return this->impl ()->set_qos (qos); #endif @@ -375,9 +375,9 @@ namespace CIAO { CIAO_TRACE ("CCM_DDS_Subscriber_i::get_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_SubscriberQos ccm_dds_qos; - ::DDS::ReturnCode_t retcode = this->impl ()->get_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; + ::DDS_SubscriberQos rti_qos; + ::DDS::ReturnCode_t retcode = this->impl ()->get_qos (rti_qos); + qos <<= rti_qos; return retcode; #else return this->impl ()->get_qos (qos); @@ -391,14 +391,14 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::set_listener"); - CCM_DDS_SubscriberListener_i* ccm_dds_impl_list = 0; + CCM_DDS_SubscriberListener_i* rti_impl_list = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_impl_list, + ACE_NEW_THROW_EX (rti_impl_list, CCM_DDS_SubscriberListener_i (a_listener), CORBA::NO_MEMORY ()); } - return this->impl ()->set_listener (ccm_dds_impl_list, mask); + return this->impl ()->set_listener (rti_impl_list, mask); } ::DDS::SubscriberListener_ptr @@ -406,8 +406,8 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::get_listener"); - DDSSubscriberListener *ccm_dds_impl_list = this->impl ()->get_listener (); - CCM_DDS_SubscriberListener_i *list_proxy = dynamic_cast <CCM_DDS_SubscriberListener_i *> (ccm_dds_impl_list); + DDSSubscriberListener *rti_impl_list = this->impl ()->get_listener (); + CCM_DDS_SubscriberListener_i *list_proxy = dynamic_cast <CCM_DDS_SubscriberListener_i *> (rti_impl_list); if (!list_proxy) { DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Subscriber_i::get_listener - " @@ -459,9 +459,9 @@ namespace CIAO { CIAO_TRACE ("CCM_DDS_Subscriber_i::set_default_datareader_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DataReaderQos ccm_dds_qos; - ccm_dds_qos <<= qos; - return this->impl ()->set_default_datareader_qos (ccm_dds_qos); + ::DDS_DataReaderQos rti_qos; + rti_qos <<= qos; + return this->impl ()->set_default_datareader_qos (rti_qos); #else return this->impl ()->set_default_datareader_qos (qos); #endif @@ -473,9 +473,9 @@ namespace CIAO { CIAO_TRACE ("CCM_DDS_Subscriber_i::get_default_datareader_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DataReaderQos ccm_dds_qos; - ::DDS::ReturnCode_t retcode = this->impl ()->get_default_datareader_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; + ::DDS_DataReaderQos rti_qos; + ::DDS::ReturnCode_t retcode = this->impl ()->get_default_datareader_qos (rti_qos); + qos <<= rti_qos; return retcode; #else return this->impl ()->get_default_datareader_qos (qos); @@ -489,15 +489,15 @@ namespace CIAO { DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::copy_from_topic_qos"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DataReaderQos ccm_dds_qos; - ::DDS_TopicQos ccm_dds_topic_qos; + ::DDS_DataReaderQos rti_qos; + ::DDS_TopicQos rti_topic_qos; - ccm_dds_qos <<= a_datareader_qos; - ccm_dds_topic_qos <<= a_impl_qos; + rti_qos <<= a_datareader_qos; + rti_topic_qos <<= a_impl_qos; ::DDS::ReturnCode_t retcode = - this->impl()->copy_from_topic_qos (ccm_dds_qos, - ccm_dds_topic_qos); - a_datareader_qos <<= ccm_dds_qos; + this->impl()->copy_from_topic_qos (rti_qos, + rti_topic_qos); + a_datareader_qos <<= rti_qos; return retcode; #else return this->impl()->copy_from_topic_qos (a_datareader_qos, diff --git a/CIAO/connectors/dds4ccm/impl/dds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h index b1a0d974572..c1ed651728e 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Subscriber.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h @@ -15,7 +15,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" #include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #include "tao/LocalObject.h" @@ -139,14 +139,14 @@ namespace CIAO DDSDataReader * create_datareader ( DDSTopic * topic, - DDSDataReaderListener * ccm_dds_drl, + DDSDataReaderListener * rti_drl, ::DDS::StatusMask mask, const ::DDS::DataReaderQos & qos); DDSDataReader * create_datareader ( DDSContentFilteredTopic * topic, - DDSDataReaderListener * ccm_dds_drl, + DDSDataReaderListener * rti_drl, ::DDS::StatusMask mask, const ::DDS::DataReaderQos & qos); @@ -156,7 +156,7 @@ namespace CIAO DDSContentFilteredTopic * topic, const char* library_name, const char *profile_name, - DDSDataReaderListener * ccm_dds_drl, + DDSDataReaderListener * rti_drl, ::DDS::StatusMask mask); #endif @@ -166,7 +166,7 @@ namespace CIAO DDSTopic * topic, const char* library_name, const char *profile_name, - DDSDataReaderListener * ccm_dds_drl, + DDSDataReaderListener * rti_drl, ::DDS::StatusMask mask); #endif }; diff --git a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp index 9d88d94f8ea..f5897fa3945 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp @@ -3,14 +3,12 @@ #include "SubscriberListener.h" #include "Subscriber.h" #include "DataReader.h" - -#include "ndds/SampleLostStatus.h" -#include "ndds/SubscriptionMatchedStatus.h" -#include "ndds/RequestedDeadlineMissedStatus.h" -#include "ndds/SampleRejectedStatus.h" -#include "ndds/LivelinessChangedStatus.h" -#include "ndds/RequestedIncompatibleQosStatus.h" - +#include "SampleLostStatus.h" +#include "SubscriptionMatchedStatus.h" +#include "RequestedDeadlineMissedStatus.h" +#include "SampleRejectedStatus.h" +#include "LivelinessChangedStatus.h" +#include "RequestedIncompatibleQosStatus.h" #include "dds4ccm/impl/logger/Log_Macros.h" namespace CIAO diff --git a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h index 585744c9f93..6ccfa187656 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h @@ -13,7 +13,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" #include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) #include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp index bd3e0ef7161..1dd1b95f0c4 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" -#include "dds4ccm/impl/dds/DataReader.h" +#include "dds4ccm/impl/ndds/DataReader.h" #include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds/DDSCallbackStatusHandler.h" -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/DDSCallbackStatusHandler.h" +#include "dds4ccm/impl/ndds/Utils.h" #include "tao/ORB_Core.h" template <typename DDS_TYPE, typename CCM_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.h index 7cdf42eb1a5..fd39a011c6f 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.h @@ -82,6 +82,6 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/SubscriberListener_T.cpp" +#include "dds4ccm/impl/ndds/SubscriberListener_T.cpp" #endif /* DDS_SUBSCRIBERLISTENER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h index 9ccabb98f45..0460ac99fa7 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h @@ -37,6 +37,23 @@ operator<<= (::DDS_SubscriberQos &ddsqos, const ::DDS::SubscriberQos & qos) ddsqos.entity_factory <<= qos.entity_factory; } +inline void +operator>>= (const ::DDS_SubscriberQos &qos, ::DDS::SubscriberQos & ddsqos) +{ + ddsqos.presentation <<= qos.presentation; + ddsqos.partition <<= qos.partition; + ddsqos.group_data <<= qos.group_data; + ddsqos.entity_factory <<= qos.entity_factory; +} + +inline void +operator>>= (const ::DDS::SubscriberQos &qos, ::DDS_SubscriberQos & ddsqos) +{ + ddsqos.presentation <<= qos.presentation; + ddsqos.partition <<= qos.partition; + ddsqos.group_data <<= qos.group_data; + ddsqos.entity_factory <<= qos.entity_factory; +} #endif #endif /* DDS4CCM_SUBSCRIBERQOS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h index 0658188dace..01a6f04c5e7 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h @@ -37,6 +37,25 @@ operator<<= (::DDS_SubscriptionMatchedStatus &ddsstatus, const ::DDS::Subscripti ddsstatus.last_publication_handle <<= status.last_publication_handle; } +inline void +operator>>= (const ::DDS_SubscriptionMatchedStatus &status, ::DDS::SubscriptionMatchedStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.current_count = status.current_count; + ddsstatus.current_count_change = status.current_count_change; + ddsstatus.last_publication_handle <<= status.last_publication_handle; +} + +inline void +operator>>= (const ::DDS::SubscriptionMatchedStatus &status, ::DDS_SubscriptionMatchedStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.current_count = status.current_count; + ddsstatus.current_count_change = status.current_count_change; + ddsstatus.last_publication_handle <<= status.last_publication_handle; +} #endif #endif /* DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h index 96da82f6f33..19aaaf31251 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h @@ -28,6 +28,17 @@ operator<<= (::DDS_TimeBasedFilterQosPolicy &ddsqos, const ::DDS::TimeBasedFilte ddsqos.minimum_separation <<= qos.minimum_separation; } +inline void +operator>>= (const ::DDS_TimeBasedFilterQosPolicy &qos, ::DDS::TimeBasedFilterQosPolicy & ddsqos) +{ + ddsqos.minimum_separation <<= qos.minimum_separation; +} + +inline void +operator>>= (const ::DDS::TimeBasedFilterQosPolicy &qos, ::DDS_TimeBasedFilterQosPolicy & ddsqos) +{ + ddsqos.minimum_separation <<= qos.minimum_separation; +} #endif #endif /* DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/TimeUtilities.h b/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h index e6f1050e518..1ebb682c1b9 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/TimeUtilities.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h @@ -31,4 +31,18 @@ operator<<= (::ACE_Time_Value & ace_time, const ::DDS::Time_t &dds_time) ace_time.usec (dds_time.nanosec/1000); } +inline void +operator>>= (const ::DDS::Time_t & dds_time, ::ACE_Time_Value & ace_time) +{ + ace_time.sec (dds_time.sec); + ace_time.usec (dds_time.nanosec/1000); +} + +inline void +operator>>= (const ::ACE_Time_Value & ace_time, ::DDS::Time_t &dds_time) +{ + dds_time.sec = static_cast < ::CORBA::Long> (ace_time.sec ()); + dds_time.nanosec = ace_time.usec () * 1000; +} + #endif /* DDS4CCM_TIME_UTILITIES_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/Time_t.h b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h index 118b46d68cf..a78b01a4058 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/Time_t.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h @@ -29,6 +29,12 @@ operator<<= (::DDS_Time_t &ddstime, const ::DDS::Time_t & time) ddstime.nanosec = time.nanosec; } +inline void +operator>>= (const ::DDS_Time_t &time, ::DDS::Time_t & ddstime) +{ + ddstime.sec = time.sec; + ddstime.nanosec = time.nanosec; +} #endif #endif /* DDS4CCM_TIME_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/Topic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp index 28f5c7d48b2..935db7d77e3 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Topic.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp @@ -4,11 +4,9 @@ #include "ContentFilteredTopic.h" #include "StatusCondition.h" #include "TopicListener.h" - -#include "ndds/InstanceHandle_t.h" -#include "ndds/InconsistentTopicStatus.h" -#include "ndds/TopicQos.h" - +#include "InstanceHandle_t.h" +#include "InconsistentTopicStatus.h" +#include "TopicQos.h" #include "dds4ccm/impl/logger/Log_Macros.h" namespace CIAO @@ -57,14 +55,14 @@ namespace CIAO DDS4CCM_TRACE ("CCM_DDS_Topic_i::set_listener"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_TopicListener_i *ccm_dds_impl_list = 0; + CCM_DDS_TopicListener_i *rti_impl_list = 0; if (!CORBA::is_nil (a_listener)) { - ACE_NEW_THROW_EX (ccm_dds_impl_list, + ACE_NEW_THROW_EX (rti_impl_list, CCM_DDS_TopicListener_i (a_listener), CORBA::NO_MEMORY ()); } - return this->impl ()->set_listener (ccm_dds_impl_list, mask); + return this->impl ()->set_listener (rti_impl_list, mask); #else return this->impl ()->set_listener (a_listener, mask); #endif @@ -76,8 +74,8 @@ namespace CIAO DDS4CCM_TRACE ("CCM_DDS_Topic_i::get_listener"); #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSTopicListener *ccm_dds_topic_list = this->impl ()->get_listener (); - CCM_DDS_TopicListener_i *list_proxy = dynamic_cast <CCM_DDS_TopicListener_i *> (ccm_dds_topic_list); + DDSTopicListener *rti_topic_list = this->impl ()->get_listener (); + CCM_DDS_TopicListener_i *list_proxy = dynamic_cast <CCM_DDS_TopicListener_i *> (rti_topic_list); if (!list_proxy) { DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Topic_i::get_listener - " diff --git a/CIAO/connectors/dds4ccm/impl/dds/Topic.h b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h index b6a495ceecc..20b40839cd9 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Topic.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h @@ -12,7 +12,7 @@ #include "DomainParticipant.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #include "tao/LocalObject.h" #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h index 0a792fcb9f9..0769149068f 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h @@ -9,8 +9,6 @@ #ifndef DDS4CCM_TOPICDATAQOSPOLICY_H #define DDS4CCM_TOPICDATAQOSPOLICY_H -#include "OctetSeq.h" - #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) typedef ::DDS::TopicDataQosPolicy DDS_TopicDataQosPolicy; #endif @@ -19,15 +17,35 @@ typedef ::DDS::TopicDataQosPolicy DDS_TopicDataQosPolicy; inline void operator<<= (::DDS::TopicDataQosPolicy &ddsqos, const ::DDS_TopicDataQosPolicy & qos) { - ddsqos.value <<= qos.value; + // @todo + ACE_UNUSED_ARG (ddsqos); + ACE_UNUSED_ARG (qos); +// ddsqos.value = qos.value; } inline void operator<<= (::DDS_TopicDataQosPolicy &ddsqos, const ::DDS::TopicDataQosPolicy & qos) { - ddsqos.value <<= qos.value; + ACE_UNUSED_ARG (ddsqos); + ACE_UNUSED_ARG (qos); +// ddsqos.value = qos.value; +} + +inline void +operator>>= (const ::DDS_TopicDataQosPolicy &qos, ::DDS::TopicDataQosPolicy & ddsqos) +{ + ACE_UNUSED_ARG (ddsqos); + ACE_UNUSED_ARG (qos); +// ddsqos.value = qos.value; } +inline void +operator>>= (const ::DDS::TopicDataQosPolicy &qos, ::DDS_TopicDataQosPolicy & ddsqos) +{ + ACE_UNUSED_ARG (ddsqos); + ACE_UNUSED_ARG (qos); +// ddsqos.value = qos.value; +} #endif #endif /* DDS4CCM_TOPICDATAQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp index 95a71927d4c..95a71927d4c 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h index 63453d6c60e..e00754ba14e 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h @@ -15,7 +15,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" #include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) #include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp index e6624770ec5..0a2b0f673a8 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp @@ -2,8 +2,7 @@ #include "TopicListener.h" #include "Topic.h" - -#include "ndds/InconsistentTopicStatus.h" +#include "InconsistentTopicStatus.h" #include "dds4ccm/idl/dds4ccm_BaseC.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicListener.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h index e991ac8257e..e991ac8257e 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.cpp index 96b0a259cb8..2f018babcf5 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" -#include "dds4ccm/impl/dds/Topic.h" -#include "dds4ccm/impl/dds/DDSCallbackStatusHandler.h" +#include "dds4ccm/impl/ndds/Topic.h" +#include "dds4ccm/impl/ndds/DDSCallbackStatusHandler.h" #include "dds4ccm/impl/logger/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.h index 609978767e8..1fdb833b885 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.h @@ -44,4 +44,4 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/TopicListener_T.cpp" +#include "dds4ccm/impl/ndds/TopicListener_T.cpp" diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicQos.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h index e5ee0fe199b..f26f376dd6c 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicQos.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h @@ -64,6 +64,41 @@ operator<<= (::DDS_TopicQos &ddsqos, const ::DDS::TopicQos & qos) ddsqos.ownership <<= qos.ownership; } +inline void +operator>>= (const ::DDS_TopicQos &qos, ::DDS::TopicQos & ddsqos) +{ + ddsqos.topic_data <<= qos.topic_data; + ddsqos.durability <<= qos.durability; + ddsqos.durability_service <<= qos.durability_service; + ddsqos.deadline <<= qos.deadline; + ddsqos.latency_budget <<= qos.latency_budget; + ddsqos.liveliness <<= qos.liveliness; + ddsqos.reliability <<= qos.reliability; + ddsqos.destination_order <<= qos.destination_order; + ddsqos.history <<= qos.history; + ddsqos.resource_limits <<= qos.resource_limits; + ddsqos.transport_priority <<= qos.transport_priority; + ddsqos.lifespan <<= qos.lifespan; + ddsqos.ownership <<= qos.ownership; +} + +inline void +operator>>= (const ::DDS::TopicQos &qos, ::DDS_TopicQos & ddsqos) +{ + ddsqos.topic_data <<= qos.topic_data; + ddsqos.durability <<= qos.durability; + ddsqos.durability_service <<= qos.durability_service; + ddsqos.deadline <<= qos.deadline; + ddsqos.latency_budget <<= qos.latency_budget; + ddsqos.liveliness <<= qos.liveliness; + ddsqos.reliability <<= qos.reliability; + ddsqos.destination_order <<= qos.destination_order; + ddsqos.history <<= qos.history; + ddsqos.resource_limits <<= qos.resource_limits; + ddsqos.transport_priority <<= qos.transport_priority; + ddsqos.lifespan <<= qos.lifespan; + ddsqos.ownership <<= qos.ownership; +} #endif #endif /* DDS4CCM_TOPICQOS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h index 6a318a7b4ad..7778cdce0d5 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h @@ -17,15 +17,26 @@ typedef ::DDS::TransportPriorityQosPolicy DDS_TransportPriorityQosPolicy; inline void operator<<= (::DDS::TransportPriorityQosPolicy &ddsqos, const ::DDS_TransportPriorityQosPolicy & qos) { - ddsqos.value = qos.value; + ddsqos.value <<= qos.value; } inline void operator<<= (::DDS_TransportPriorityQosPolicy &ddsqos, const ::DDS::TransportPriorityQosPolicy & qos) { - ddsqos.value = qos.value; + ddsqos.value <<= qos.value; } +inline void +operator>>= (const ::DDS_TransportPriorityQosPolicy &qos, ::DDS::TransportPriorityQosPolicy & ddsqos) +{ + ddsqos.value <<= qos.value; +} + +inline void +operator>>= (const ::DDS::TransportPriorityQosPolicy &qos, ::DDS_TransportPriorityQosPolicy & ddsqos) +{ + ddsqos.value <<= qos.value; +} #endif #endif /* DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp index ee905982084..da03259c7ab 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Updater_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "dds4ccm/impl/dds/DataWriter.h" -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/Coherent_Changes_Guard.h" +#include "dds4ccm/impl/ndds/DataWriter.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/Coherent_Changes_Guard.h" #include "dds4ccm/impl/logger/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/dds/Updater_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h index 376e333005e..49ab380604e 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Updater_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h @@ -81,6 +81,6 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/Updater_T.cpp" +#include "dds4ccm/impl/ndds/Updater_T.cpp" #endif /* DDS4CCM_UPDATER_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h new file mode 100644 index 00000000000..aaa0950e1bf --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h @@ -0,0 +1,50 @@ +/** + * @author Johnny Willemsen <jwillemsen@remedy.nl> + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_USERDATAQOSPOLICY_H +#define DDS4CCM_USERDATAQOSPOLICY_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::UserDataQosPolicy DDS_UserDataQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::UserDataQosPolicy &ddsqos, const ::DDS_UserDataQosPolicy & qos) +{ + ACE_UNUSED_ARG (ddsqos); + ACE_UNUSED_ARG (qos); +// ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value)); +} + +inline void +operator<<= (::DDS_UserDataQosPolicy &ddsqos, const ::DDS::UserDataQosPolicy & qos) +{ + ACE_UNUSED_ARG (ddsqos); + ACE_UNUSED_ARG (qos); +// ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value)); +} + +inline void +operator>>= (const ::DDS_UserDataQosPolicy &qos, ::DDS::UserDataQosPolicy & ddsqos) +{ + ACE_UNUSED_ARG (ddsqos); + ACE_UNUSED_ARG (qos); +// ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value)); +} + +inline void +operator>>= (const ::DDS::UserDataQosPolicy &qos, ::DDS_UserDataQosPolicy & ddsqos) +{ + ACE_UNUSED_ARG (ddsqos); + ACE_UNUSED_ARG (qos); +// ACE_OS::memcpy (qos.value, ddsqos.value, sizeof (ddsqos.value)); +} +#endif + +#endif /* DDS4CCM_USERDATAQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/Utils.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp index 0f270083afb..0f270083afb 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Utils.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp diff --git a/CIAO/connectors/dds4ccm/impl/dds/Utils.h b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h index 5401a887ce1..5401a887ce1 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Utils.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h index ef084365142..09b32871a32 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h @@ -26,6 +26,17 @@ operator<<= (::DDS_WriterDataLifecycleQosPolicy &ddsqos, const ::DDS::WriterData ddsqos.autodispose_unregistered_instances = qos.autodispose_unregistered_instances; } +inline void +operator>>= (const ::DDS_WriterDataLifecycleQosPolicy &qos, ::DDS::WriterDataLifecycleQosPolicy & ddsqos) +{ + ddsqos.autodispose_unregistered_instances = qos.autodispose_unregistered_instances; +} + +inline void +operator>>= (const ::DDS::WriterDataLifecycleQosPolicy &qos, ::DDS_WriterDataLifecycleQosPolicy & ddsqos) +{ + ddsqos.autodispose_unregistered_instances = qos.autodispose_unregistered_instances; +} #endif #endif /* DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp index f7837a19975..e0a83492589 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Writer_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "dds4ccm/impl/dds/DataWriter.h" -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/Coherent_Changes_Guard.h" - -#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h" - +#include "dds4ccm/impl/ndds/DataWriter.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/Coherent_Changes_Guard.h" +#include "dds4ccm/impl/ndds/InstanceHandle_t.h" #include "dds4ccm/impl/logger/Log_Macros.h" template <typename DDS_TYPE, typename CCM_TYPE > diff --git a/CIAO/connectors/dds4ccm/impl/dds/Writer_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h index d38887768c5..2565f8337e8 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Writer_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h @@ -50,6 +50,6 @@ namespace CIAO } } -#include "dds4ccm/impl/dds/Writer_T.cpp" +#include "dds4ccm/impl/ndds/Writer_T.cpp" #endif /* WRITER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h b/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h index 7ca68d771eb..7ca68d771eb 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds_impl.mpc b/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc index a447300384f..1edb2b0195d 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds_impl.mpc +++ b/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc @@ -9,7 +9,6 @@ project(CIAO_DDS4CCM_NDDS_Impl) : dds4ccm_skel, taolib, ciao_output, ccm_stub, c macros += BUILDING_NDDS_LIB Header_Files { *.h - ndds/*.h } Template_Files { diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc index a219c04cc49..1dce8c89cc5 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc @@ -5,12 +5,11 @@ project (DDS_Perf_Keyed_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_t dynamicflags += PERF_KEYED_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=PERF_KEYED_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Perf_Keyed_Test_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Perf_Keyed_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl index 90de4395350..72c16054137 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl @@ -214,7 +214,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl index c196308730d..670e9c5e9ea 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl @@ -214,7 +214,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl index 9c34ed8fedb..424bcb0d749 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl @@ -214,7 +214,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl index 21f430bd5d0..dae8581f1d5 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl @@ -214,7 +214,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl index 8ce4dbd85c8..ed0e4e307ca 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl @@ -214,7 +214,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl index a5b08f0a8bb..ac188a024d8 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl @@ -214,7 +214,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl index fe020962693..22ac79d6086 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl @@ -214,7 +214,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl index c0ea51d4d5c..5ed32dfb116 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl @@ -216,7 +216,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl index 2c5d1abe554..737864b741c 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl @@ -11,10 +11,10 @@ #pragma ndds typesupport "Base/Latency_Test_BaseSupport.h" const short MAX_DATA_SEQUENCE_LENGTH = 8192; -typedef sequence<octet, MAX_DATA_SEQUENCE_LENGTH> OctetSeq; +typedef sequence<octet> OctetSeq; struct LatencyTest { -// string key; + string key; long seq_num; long ping; OctetSeq data; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc index 9d110fb1d27..c297a36867e 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc @@ -5,12 +5,11 @@ project (DDS_Latency_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_d dynamicflags += LATENCY_KEYED_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=LATENCY_KEYED_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Latency_Keyed_Test_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Latency_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp index 56985aed704..5952a6ff9ad 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp @@ -31,7 +31,7 @@ namespace CIAO_Latency_Test_Receiver_Impl { this->callback_.write_one(an_instance); } - } + } void LatencyTest_Listener_exec_i::on_many_data ( diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl index d57b08797a9..a8b44055aa4 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl @@ -18,6 +18,7 @@ module Latency_Test component Sender { port CCM_DDS::LatencyTest::DDS_Write info_write; + attribute unsigned short keys; attribute unsigned long iterations; attribute unsigned short sleep; attribute unsigned short datalen; //minimal 32 diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp index 977950884dc..66ae2f02a67 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp @@ -9,7 +9,6 @@ #include "ace/Reactor.h" #include "ace/High_Res_Timer.h" - namespace CIAO_Latency_Test_Sender_Impl { //============================================================ @@ -33,13 +32,13 @@ namespace CIAO_Latency_Test_Sender_Impl { ACE_UINT64 receive_time = 0; - //only interested in messages received with a latency_ping = 0 (messages sent back by receiver) + //only interested in messages received with a latency_ping = 0 (messages sent beck by receiver) if( an_instance.ping == 0) - { - ACE_High_Res_Timer::gettimeofday_hr ().to_usec ( receive_time); - this->callback_.read(an_instance, receive_time); - } - } + { + ACE_High_Res_Timer::gettimeofday_hr ().to_usec ( receive_time); + this->callback_.read(an_instance, receive_time); + } + } void LatencyTest_Listener_exec_i::on_many_data ( @@ -124,6 +123,7 @@ namespace CIAO_Latency_Test_Sender_Impl //============================================================ Sender_exec_i::Sender_exec_i (void) : iterations_ (1000), + keys_ (1), datalen_(100), sleep_(10), matched_(false), @@ -135,8 +135,7 @@ namespace CIAO_Latency_Test_Sender_Impl number_of_msg_(0), //number of sent messages timer_(false), received_(false), - seq_num_(0), - sigma_duration_squared_(0) + seq_num_(0) { this->ticker_ = new WriteTicker (*this); } @@ -145,11 +144,6 @@ namespace CIAO_Latency_Test_Sender_Impl { } - static int compare_two_longs(const void *long1, const void *long2) - { - return (*(CORBA::Long*)long1 - *(CORBA::Long*)long2 ); - } - void Sender_exec_i::write_one (void) { @@ -158,9 +152,9 @@ namespace CIAO_Latency_Test_Sender_Impl if( (this->number_of_msg_ == 0) || ( this->received_.value())) { // all messages send, stop timer - if((this->iterations_ != 0) && (this->number_of_msg_ >= this->iterations_ )) + if((this->iterations_ != 0) && (this->number_of_msg_ >= (this->iterations_ * this->keys_))) { - this->stop(); + this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_); this->timer_ = false; } else @@ -168,20 +162,20 @@ namespace CIAO_Latency_Test_Sender_Impl try { //send messages with indicator (ping = 1L) so that subscriber knows that this message has to sent back. - this->test_topic_.ping = 1L; - this->test_topic_.seq_num = this->number_of_msg_;; + this->last_key_->second->ping = 1L; + this->last_key_->second->seq_num = this->number_of_msg_; //keep last sent seq_num, in order to control if message is sent back. this->seq_num_ = this->number_of_msg_; - this->received_ = false; - ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->start_time_); - this->writer_->write_one (this->test_topic_, ::DDS::HANDLE_NIL); - } + + ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->start_time_); + this->writer_->write_one (this->last_key_->second, ::DDS::HANDLE_NIL); + } catch (const CCM_DDS::InternalError& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") - ACE_TEXT ("while updating writer info for <%u>.\n"), - this->test_topic_.seq_num)); + ACE_TEXT ("while updating writer info for <%C>.\n"), + this->last_key_->first.c_str ())); } ++this->number_of_msg_; } @@ -189,7 +183,7 @@ namespace CIAO_Latency_Test_Sender_Impl } void - Sender_exec_i::read(LatencyTest an_instance,ACE_UINT64 receive_time) + Sender_exec_i::read(LatencyTest an_instance,ACE_UINT64 receive_time) { if (an_instance.seq_num == this->seq_num_.value()) { @@ -224,6 +218,19 @@ namespace CIAO_Latency_Test_Sender_Impl { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, this->mutex_, CORBA::INTERNAL ()); + for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i) + { + char key[7]; + LatencyTest *new_key = new LatencyTest; + ACE_OS::sprintf (key, "KEY_%d", i); + new_key->key = CORBA::string_dup(key); + new_key->seq_num = 0; + new_key->data.allocbuf(this->datalen_); + // to do : freebuf, where ? + this->samples_[key] = new_key; + } + this->last_key_ = this->samples_.begin (); + //this->sleep_ is in ms unsigned int sec = this->sleep_/1000; unsigned int usec = (this->sleep_ % 1000) * 1000; @@ -244,13 +251,9 @@ namespace CIAO_Latency_Test_Sender_Impl void Sender_exec_i::record_time (ACE_UINT64 receive_time) { - ACE_UINT64 interval = ( receive_time - this->start_time_); - ++this->count_; + ACE_UINT64 interval = ( receive_time - this->start_time_); + ++this->count_; long duration = static_cast <CORBA::Long>(interval); - int i = this->count_; - // keep all duration times for statistics - this->duration_times[i-1] = duration; - this->sigma_duration_squared_ += (double)duration * (double)duration; this->tv_total_ += duration; if (duration > this->tv_max_.value ()|| (this->tv_max_.value () == 0L)) this->tv_max_ = duration; @@ -267,16 +270,19 @@ Sender_exec_i::record_time (ACE_UINT64 receive_time) void Sender_exec_i::iterations (::CORBA::ULong iterations) { - if (iterations == 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: iterations must be greater as '0'\n"))); - throw ::CORBA::BAD_PARAM (); - } - else - { - this->iterations_ = iterations; - } + this->iterations_ = iterations; + } + + ::CORBA::UShort + Sender_exec_i::keys (void) + { + return this->keys_; + } + + void + Sender_exec_i::keys (::CORBA::UShort keys) + { + this->keys_ = keys; } ::CORBA::UShort @@ -319,7 +325,8 @@ Sender_exec_i::record_time (ACE_UINT64 receive_time) void Sender_exec_i::datalen (::CORBA::UShort datalen) { - int overhead_size = sizeof(CORBA::ULong) + sizeof(CORBA::ULong); + // 7 is length of key, has to be removed + int overhead_size = sizeof(CORBA::ULong) + sizeof(CORBA::ULong) + 7; if((datalen <= overhead_size) || (datalen > MAX_DATA_SEQUENCE_LENGTH)) { ACE_ERROR ((LM_ERROR, @@ -327,9 +334,9 @@ Sender_exec_i::record_time (ACE_UINT64 receive_time) throw ::CORBA::BAD_PARAM (); } this->datalen_ = datalen - overhead_size; - this->duration_times = new CORBA::Long[this->iterations_]; } + void Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) { @@ -368,81 +375,43 @@ Sender_exec_i::record_time (ACE_UINT64 receive_time) ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n"))); } - //make instances of Topic - this->test_topic_.seq_num = 0; - this->test_topic_.ping = 0; - this->test_topic_.data.length (this->datalen_); - } - - void - Sender_exec_i::stop (void) - { - if (this->timer_.value ()) - { - this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); - delete this->ticker_; - } } - + void Sender_exec_i::ccm_passivate (void) { - this->stop(); + if (this->timer_.value ()) + this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_); } void Sender_exec_i::ccm_remove (void) { - ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER number of messages sent: %u\n", - (this->number_of_msg_))); - - //sort all duration times - qsort(this->duration_times, this->count_,sizeof(CORBA::Long), compare_two_longs); - /* Show latency_50_percentile, latency_90_percentile, latency_99_percentile and - * latency_99.99_percentile. - * For example duration_times[per50] is the median i.e. 50% of the - * samples have a latency time <= duration_times[per50] - */ - int per50 = this->count_/2; - int per90 = (int)(this->count_ * 0.90); - int per99 = (int)(this->count_ * 0.990); - int per999 = (int)(this->count_ * 0.999); - - double avg = this->tv_total_.value () / this->count_; - //calculate standard deviation - double _roundtrip_time_std = sqrt( - (this->sigma_duration_squared_ / (double)this->count_) - - (avg * avg)); - - int overhead_size = sizeof(CORBA::ULong) + sizeof(CORBA::ULong); - CORBA::UShort datalen = overhead_size + this->datalen_; -// if( this->count_.value () > 0) - if( this->count_ > 0) - { - ACE_DEBUG ((LM_DEBUG,"Collecting statistics on %d samples with message size %u.\n" - "This is the roundtrip time, *not* the one-way-latency\n" - "bytes ,stdev us,ave us, min us, 50%% us, 90%% us, 99%% us, 99.9%%, max us\n" - "------,-------,-------,-------,-------,-------,-------,-------,-------\n" - "%6d,%7.1f,%7.1f,%7u,%7u,%7u,%7u,%7u,%7u\n", - this->count_, - datalen, - datalen, - _roundtrip_time_std, - avg, - this->tv_min_.value (), - this->duration_times[per50-1], - this->duration_times[per90-1], - this->duration_times[per99-1], - this->duration_times[per999-1], - this->tv_max_.value ())); - } - else - { - ACE_ERROR ((LM_ERROR, "SUMMARY SENDER latency time:\n " + ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER number of messages sent: %u\n", + (this->number_of_msg_ + 1))); + + if( this->count_.value () > 0) + { + double avg = this->tv_total_.value () / this->count_.value (); + ACE_DEBUG ((LM_DEBUG,"Collecting statistics on %d samples with message size %u.\n" + " TO DO: calculate stdev, 50%%,90%%,99%% and 99.99%%\n" + "This is the roundtrip time, *not* the one-way-latency\n" + "bytes ,stdev us,ave us, min us, 50%% us, 90%% us, 99%% us, 99.99%%, max us\n" + "------,-------,-------,-------,-------,-------,-------,-------,-------\n" + "%6d,-------,%7.1f,%7u,-------,-------,-------,-------,%7u\n", + this->count_.value (), + this->datalen_, + this->datalen_, + avg, + this->tv_min_.value (), + this->tv_max_.value ())); + } + else + { + ACE_ERROR ((LM_ERROR, "SUMMARY SENDER latency time:\n " "No samples reveived back.\n")); - } + } } extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h index 7ecd150c6d5..407b8524f07 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h @@ -20,8 +20,8 @@ namespace CIAO_Latency_Test_Sender_Impl { typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long > Atomic_Long; - typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong; - typedef ACE_Atomic_Op <ACE_Recursive_Thread_Mutex, CORBA::Boolean > Atomic_Boolean; + typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long > Atomic_ULong; + typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean; class Sender_exec_i; //============================================================ @@ -116,6 +116,9 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i virtual ::CORBA::ULong iterations (void); virtual void iterations (::CORBA::ULong iterations); + virtual ::CORBA::UShort keys (void); + virtual void keys (::CORBA::UShort keys); + virtual ::CORBA::UShort sleep (void); virtual void sleep (::CORBA::UShort sleep); @@ -133,8 +136,7 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i virtual void ccm_passivate (void); virtual void ccm_remove (void); - void start(void); - void stop (void); + void start (void); void write_one (void); void read(LatencyTest instance,ACE_UINT64 receive_time); @@ -144,6 +146,7 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i WriteTicker *ticker_; CORBA::UShort iterations_; + CORBA::UShort keys_; CORBA::UShort datalen_; CORBA::UShort sleep_; @@ -152,19 +155,19 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i Atomic_Long tv_total_; Atomic_Long tv_max_; Atomic_Long tv_min_; - CORBA::UShort count_; + Atomic_Long count_; CORBA::UShort number_of_msg_; Atomic_Boolean timer_; Atomic_Boolean received_; Atomic_ULong seq_num_; - CORBA::Double sigma_duration_squared_; ACE_UINT64 start_time_; TAO_SYNCH_MUTEX mutex_; - LatencyTest test_topic_; - CORBA::Octet* buffer_; - CORBA::Long* duration_times; -}; + typedef std::map<ACE_CString, LatencyTest_var> Writer_Table; + Writer_Table samples_; + + Writer_Table::iterator last_key_; + }; extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr create_Latency_Test_Sender_Impl (void); diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp index dd5d8430507..33145eef113 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp @@ -232,13 +232,24 @@ <source/> <implementation xmi:idref="SenderComponentImplementation" /> <configProperty> + <name>keys</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>1</ushort> + </value> + </value> + </configProperty> + <configProperty> <name>iterations</name> <value> <type> <kind>tk_ulong</kind> </type> <value> - <ulong>1000</ulong> + <ulong>10000</ulong> </value> </value> </configProperty> @@ -249,7 +260,7 @@ <kind>tk_ushort</kind> </type> <value> - <ushort>100</ushort> + <ushort>2</ushort> </value> </value> </configProperty> diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp index eb702b501a4..2bd8d98972b 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp @@ -133,7 +133,7 @@ <kind>tk_string</kind> </type> <value> - <string>HelloTest_Library#LatencyPubQoS</string> + <string>HelloTest_Library#LatencyQoS</string> </value> </value> </configProperty> @@ -145,6 +145,17 @@ <source/> <implementation xmi:idref="SenderComponentImplementation" /> <configProperty> + <name>keys</name> + <value> + <type> + <kind>tk_ushort</kind> + </type> + <value> + <ushort>1</ushort> + </value> + </value> + </configProperty> + <configProperty> <name>iterations</name> <value> <type> diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp index ec60487f40e..5d8e36c520a 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp @@ -140,7 +140,7 @@ <kind>tk_string</kind> </type> <value> - <string>HelloTest_Library#LatencySubQoS</string> + <string>HelloTest_Library#LatencyQoS</string> </value> </value> </configProperty> diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README deleted file mode 100644 index acc1aab79df..00000000000 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README +++ /dev/null @@ -1,17 +0,0 @@ - -This performace test shows the latency. The test can run with different options. - -- separate publisher and subscriber: - run_pub.pl and run_sub.pl with resp. Plan_pub.cdp and Plan_sub.cdp . - -- to check if test still compiles and runs , use this test - one publisher and one subscriber in 1 process : - run_test.pl with resp. Plan.cdp - - - - -To test changes in the next attributes, changes this values in the publisher cdp-files: -iterations : the number of messages from one instance to send. Has to be greater as 0. -datalen: the datalen of a message (minimal 32). -sleep: time in ms to sleep before writing the next message diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml index a69acd07537..9b472b3f879 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml @@ -39,9 +39,7 @@ RTI Data Distribution Service user manual. <kind>KEEP_ALL_HISTORY_QOS</kind> </history> <durability> - <!--kind>TRANSIENT_DURABILITY_QOS</kind--> - <kind>VOLATILE_DURABILITY_QOS</kind> - <direct_communication>true</direct_communication> + <kind>TRANSIENT_DURABILITY_QOS</kind> </durability> <resource_limits> <max_instances>1</max_instances> @@ -72,86 +70,22 @@ RTI Data Distribution Service user manual. <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance> </resource_limits> <durability> - <!--kind>TRANSIENT_DURABILITY_QOS</kind--> - <kind>VOLATILE_DURABILITY_QOS</kind> - <direct_communication>true</direct_communication> + <kind>TRANSIENT_DURABILITY_QOS</kind> </durability> </datareader_qos> + </qos_profile> - - <qos_profile name="LatencyPubQoS" is_default_qos="true"> - <!-- QoS used to configure the data writer created in the example code --> - <datawriter_qos> - <reliability> - <kind>RELIABLE_RELIABILITY_QOS</kind> - <max_blocking_time> - <sec>DURATION_INFINITE_SEC</sec> - <nanosec>DURATION_INFINITE_NSEC</nanosec> - </max_blocking_time> - </reliability> - <history> - <kind>KEEP_ALL_HISTORY_QOS</kind> - </history> - <durability> - <!--kind>TRANSIENT_DURABILITY_QOS</kind--> - <kind>VOLATILE_DURABILITY_QOS</kind> - <direct_communication>true</direct_communication> - </durability> - <resource_limits> - <max_instances>1</max_instances> - <initial_instances>1</initial_instances> - <max_samples>LENGTH_UNLIMITED</max_samples> - <initial_samples>100</initial_samples> - <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance> - </resource_limits> - <protocol> - <rtps_reliable_writer> - <max_heartbeat_retries>10</max_heartbeat_retries> - </rtps_reliable_writer> - </protocol> - </datawriter_qos> - <!-- QoS used to configure the data reader created in the example code --> - <datareader_qos> - <reliability> - <kind>RELIABLE_RELIABILITY_QOS</kind> - </reliability> - <history> - <kind>KEEP_ALL_HISTORY_QOS</kind> - </history> - <resource_limits> - <initial_samples>100</initial_samples> - <initial_instances>1</initial_instances> - <max_samples>LENGTH_UNLIMITED</max_samples> - <max_instances>1</max_instances> - <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance> - </resource_limits> - <durability> - <!--kind>TRANSIENT_DURABILITY_QOS</kind--> - <kind>VOLATILE_DURABILITY_QOS</kind> - <direct_communication>true</direct_communication> - </durability> - <ownership> - <kind>EXCLUSIVE_OWNERSHIP_QOS</kind> - </ownership> - </datareader_qos> - </qos_profile> - - <qos_profile name="LatencySubQoS" is_default_qos="true"> + <qos_profile name="BestEffortQoS" is_default_qos="false"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> - <kind>RELIABLE_RELIABILITY_QOS</kind> - <max_blocking_time> - <sec>DURATION_INFINITE_SEC</sec> - <nanosec>DURATION_INFINITE_NSEC</nanosec> - </max_blocking_time> - </reliability> + <kind>BEST_EFFORT_RELIABILITY_QOS</kind> + </reliability> <history> <kind>KEEP_ALL_HISTORY_QOS</kind> </history> <durability> - <kind>VOLATILE_DURABILITY_QOS</kind> - <direct_communication>true</direct_communication> + <kind>TRANSIENT_DURABILITY_QOS</kind> </durability> <resource_limits> <max_instances>1</max_instances> @@ -160,12 +94,6 @@ RTI Data Distribution Service user manual. <initial_samples>100</initial_samples> <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance> </resource_limits> - <ownership> - <kind>EXCLUSIVE_OWNERSHIP_QOS</kind> - </ownership> - <ownership_strength> - <value>2</value> - </ownership_strength> <protocol> <rtps_reliable_writer> <max_heartbeat_retries>10</max_heartbeat_retries> @@ -175,7 +103,7 @@ RTI Data Distribution Service user manual. <!-- QoS used to configure the data reader created in the example code --> <datareader_qos> <reliability> - <kind>RELIABLE_RELIABILITY_QOS</kind> + <kind>BEST_EFFORT_RELIABILITY_QOS</kind> </reliability> <history> <kind>KEEP_ALL_HISTORY_QOS</kind> @@ -188,12 +116,9 @@ RTI Data Distribution Service user manual. <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance> </resource_limits> <durability> - <!--kind>TRANSIENT_DURABILITY_QOS</kind--> - <kind>VOLATILE_DURABILITY_QOS</kind> - <direct_communication>true</direct_communication> + <kind>TRANSIENT_DURABILITY_QOS</kind> </durability> </datareader_qos> - </qos_profile> </qos_library> diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl index 0bddce23b81..72c16054137 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl @@ -206,15 +206,15 @@ for ($i = 0; $i < $nr_daemon; ++$i) { } } -print "Sleeping 300 seconds to allow task to complete\n"; -sleep (300); +print "Sleeping 180 seconds to allow task to complete\n"; +sleep (180); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl index 11699c42b49..dae8581f1d5 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl @@ -206,15 +206,15 @@ for ($i = 0; $i < $nr_daemon; ++$i) { } } -print "Sleeping 300 seconds to allow task to complete\n"; -sleep (300); +print "Sleeping 180 seconds to allow task to complete\n"; +sleep (180); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl index c0ea51d4d5c..5ed32dfb116 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl @@ -216,7 +216,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc index 40aac3f95d9..c59af4ade6f 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc @@ -5,12 +5,11 @@ project (DDS_CSL_DeadlineTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ dynamicflags += CSL_DEADLINETEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=CSL_DEADLINETEST_BASE_STUB_Export \ -Wb,stub_export_include=CSL_DeadlineTest_Base_stub_export.h IDL_Files { - idlflags += -Gxhst CSL_DeadlineTest_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl index b2a5229d554..a625ecd9216 100755 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc index 63ab9a3f374..051332cbc91 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc @@ -5,12 +5,11 @@ project (DDS_CSL_QoSTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_de dynamicflags += CSL_QOSTEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=CSL_QOSTEST_BASE_STUB_Export \ -Wb,stub_export_include=CSL_QoSTest_Base_stub_export.h IDL_Files { - idlflags += -Gxhst CSL_QoSTest_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl index b2a5229d554..a625ecd9216 100755 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc index ce968a4a7eb..012f8b0cde3 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc @@ -5,12 +5,11 @@ project (DDS_CSL_SRTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_def dynamicflags += CSL_SRTEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=CSL_SRTEST_BASE_STUB_Export \ -Wb,stub_export_include=CSL_SRTest_Base_stub_export.h IDL_Files { - idlflags += -Gxhst CSL_SRTest_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp index 1eb3926d226..382de258e7d 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp @@ -9,8 +9,8 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_time.h" -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/TimeUtilities.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/TimeUtilities.h" namespace CIAO_CSL_SRTest_Receiver_Impl { diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp index 0ed59ddaf1a..b15959abf79 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp @@ -10,7 +10,7 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/Reactor.h" -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" namespace CIAO_CSL_SRTest_Sender_Impl { diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl index 5d0ab35419d..a625ecd9216 100755 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl @@ -223,10 +223,10 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc index d6df1c193f7..cef5dad5e96 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc @@ -5,12 +5,11 @@ project (DDS_CSL_USTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_def dynamicflags += CSL_USTEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=CSL_USTEST_BASE_STUB_Export \ -Wb,stub_export_include=CSL_USTest_Base_stub_export.h IDL_Files { - idlflags += -Gxhst CSL_USTest_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp index eefa1e74fde..9d5da5e08a6 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp @@ -8,7 +8,7 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_time.h" -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" namespace CIAO_CSL_USTest_Receiver_Impl { diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp index 586054a81d0..d16f7c1e436 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp @@ -8,7 +8,7 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/Reactor.h" -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" namespace CIAO_CSL_USTest_Sender_Impl { diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl index 66cc403a1fb..edfa27e2a1f 100755 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl deleted file mode 100644 index cbb0c246148..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl +++ /dev/null @@ -1,20 +0,0 @@ -// $Id$ - -/** - * @file CoherentWrite_Test_Base.idl - * @author Marcel Smit <msmit@remedy.nl> - */ - -#ifndef COHERENT_WRITE_TEST_BASE_IDL -#define COHERENT_WRITE_TEST_BASE_IDL - -#pragma ndds typesupport "Base/CoherentWrite_Test_BaseSupport.h" - -struct CoherentWriteTest { - string symbol; //@key - long iteration; -}; - -typedef sequence<CoherentWriteTest> CoherentWriteTest_Seq; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc deleted file mode 100755 index 03aaeccd529..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc +++ /dev/null @@ -1,26 +0,0 @@ -// $Id$ - -project (CoherentWrite_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { - sharedname = CoherentWrite_Test_Base_stub - dynamicflags += COHERENT_WRITE_TEST_BASE_STUB_BUILD_DLL - libout = ../lib - - idlflags += -SS -Sci \ - -Wb,stub_export_macro=COHERENT_WRITE_TEST_BASE_STUB_Export \ - -Wb,stub_export_include=CoherentWrite_Test_Base_stub_export.h - - IDL_Files { - idlflags += -Gxhst - CoherentWrite_Test_Base.idl - } - - opendds_ts_flags += --export=COHERENT_WRITE_TEST_BASE_STUB_Export - - DDSGenerator_Files { - CoherentWrite_Test_Base.idl - } - - Source_Files { - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl deleted file mode 100644 index 46dd49922d6..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl +++ /dev/null @@ -1,24 +0,0 @@ -// $Id$ - -/** - * @file Reader_Starter.idl - * @author Marcel Smit <msmit@remedy.nl> - */ - -#ifndef COHERENT_WRITE_STARTER_IDL -#define COHERENT_WRITE_STARTER_IDL - -#pragma ciao lem "Base/Reader_StarterE.idl" - -interface CoherentWriteStarter -{ - void set_reader_properties (in unsigned short nr_iterations); - void start_read (in unsigned short run); -}; - -interface CoherentWriteRestarter -{ - void restart_write (); -}; - -#endif /* COHERENT_WRITE_STARTER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc deleted file mode 100755 index 7ba671f97d8..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc +++ /dev/null @@ -1,114 +0,0 @@ -// $Id$ - -project(DDS_Coherent_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \ - -Wb,stub_export_include=Reader_Starter_stub_export.h \ - -Wb,skel_export_macro=READER_STARTER_SVNT_Export \ - -Wb,skel_export_include=Reader_Starter_svnt_export.h \ - -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \ - -Wb,svnt_export_include=Reader_Starter_svnt_export.h \ - -Wb,exec_export_macro=READER_STARTER_EXEC_Export \ - -Wb,exec_export_include=Reader_Starter_exec_export.h -I.. - - IDL_Files { - Reader_Starter.idl - } -} - -project(DDS_Coherent_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm { - after += DDS_Coherent_Reader_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \ - -Wb,stub_export_include=Reader_Starter_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - Reader_StarterE.idl - } -} - -project(DDS_Coherent_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base { - after += DDS_Coherent_Reader_Starter_lem_gen DDS_Coherent_Reader_Starter_stub - libs += Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Reader_Starter_lem_stub - dynamicflags = READER_STARTER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterEC.cpp - } - - Header_Files { - Reader_StarterEC.h - Reader_Starter_lem_stub_export.h - } - - Inline_Files { - Reader_StarterEC.inl - } -} - -project(DDS_Coherent_Reader_Starter_stub) : ccm_stub, dds4ccm_base { - after += DDS_Coherent_Reader_Starter_idl_gen - libs += - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Reader_Starter_stub - dynamicflags = READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterC.cpp - } - - Header_Files { - Reader_StarterC.h - Reader_Starter_stub_export.h - } - - Inline_Files { - Reader_StarterC.inl - } -} - - -project(DDS_Coherent_Reader_Starter_svnt) : ciao_servant, dds4ccm_base { - after += DDS_Coherent_Reader_Starter_lem_stub DDS_Coherent_Reader_Starter_stub\ - DDS4CCM_lem_stub DDS4CCM_skel - sharedname = Reader_Starter_svnt - libs += Reader_Starter_stub Reader_Starter_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags = READER_STARTER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Reader_StarterS.cpp - Reader_Starter_svnt.cpp - } - - Header_Files { - Reader_StarterS.h - Reader_Starter_svnt.h - Reader_Starter_svnt_export.h - } - - Inline_Files { - Reader_StarterS.inl - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl deleted file mode 100644 index fdbdf59aa40..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl +++ /dev/null @@ -1,29 +0,0 @@ -// $Id$ - -/** - * @file CoherentWrite_Test_Connector.idl - * @author Marcel Smit <msmit@remedy.nl> - */ - -#ifndef COHERENT_WRITE_TEST_CONNECTOR_IDL_ -#define COHERENT_WRITE_TEST_CONNECTOR_IDL_ - -#include <Components.idl> -#include "Base/CoherentWrite_Test_Base.idl" -#include "connectors/dds4ccm/idl/ccm_dds.idl" - -#pragma ciao lem "Connector/CoherentWrite_Test_ConnectorE.idl" - -module CCM_DDS -{ - module ::CCM_DDS::Typed < ::CoherentWriteTest, ::CoherentWriteTest_Seq> CoherentWriteTest; -}; - -module CoherentWrite_Test -{ - connector CoherentWrite_Test_Connector : ::CCM_DDS::CoherentWriteTest::DDS_Event - { - }; -}; - -#endif /* CoherentWrite_Test_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc deleted file mode 100755 index b05a815d4ee..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc +++ /dev/null @@ -1,145 +0,0 @@ -// $Id$ -// This file is generated with "generate_component_mpc.pl -p CoherentWrite_Test_Base -l .. -o ../lib -u DDS CoherentWrite_Test_Connector" - -project(CoherentWrite_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=CoherentWrite_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \ - -Wb,skel_export_include=CoherentWrite_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=COHERENT_WRITE_TEST_CONNECTOR_SVNT_Export \ - -Wb,svnt_export_include=CoherentWrite_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=COHERENT_WRITE_TEST_CONNECTOR_CONN_Export \ - -Wb,conn_export_include=CoherentWrite_Test_Connector_conn_export.h \ - -I .. - - IDL_Files { - CoherentWrite_Test_Connector.idl - } -} - -project(CoherentWrite_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += CoherentWrite_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=CoherentWrite_Test_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl - - IDL_Files { - CoherentWrite_Test_ConnectorE.idl - } -} - -project(CoherentWrite_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { - after += CoherentWrite_Test_Connector_lem_gen CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub DDS4CCM_lem_stub - libs += CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub DDS4CCM_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CoherentWrite_Test_Connector_lem_stub - dynamicflags = COHERENT_WRITE_TEST_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_ConnectorEC.cpp - } - - Header_Files { - CoherentWrite_Test_ConnectorEC.h - CoherentWrite_Test_Connector_lem_stub_export.h - } - - Inline_Files { - CoherentWrite_Test_ConnectorEC.inl - } -} - -project(CoherentWrite_Test_Connector_stub) : ccm_stub, dds4ccm_base { - after += CoherentWrite_Test_Connector_idl_gen CoherentWrite_Test_Base_stub - libs += CoherentWrite_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = CoherentWrite_Test_Connector_stub - dynamicflags = COHERENT_WRITE_TEST_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_ConnectorC.cpp - } - - Header_Files { - CoherentWrite_Test_ConnectorC.h - CoherentWrite_Test_Connector_stub_export.h - } - - Inline_Files { - CoherentWrite_Test_ConnectorC.inl - } -} - -project(CoherentWrite_Test_Connector_exec) : ciao_executor, dds4ccm_impl { - after += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub DDS4CCM_lem_stub CoherentWrite_Test_Base_stub - sharedname = CoherentWrite_Test_Connector_exec - libs += CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Base_stub DDS4CCM_lem_stub CoherentWrite_Test_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags = COHERENT_WRITE_TEST_CONNECTOR_CONN_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_Connector_conn.cpp - } - - Header_Files { - CoherentWrite_Test_Connector_conn.h - CoherentWrite_Test_Connector_conn_export.h - } - - Inline_Files { - } -} - - -project(CoherentWrite_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_exec CoherentWrite_Test_Connector_stub DDS4CCM_lem_stub - sharedname = CoherentWrite_Test_Connector_svnt - libs += CoherentWrite_Test_Connector_stub \ - CoherentWrite_Test_Connector_lem_stub \ - CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_exec \ - DDS4CCM_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags = COHERENT_WRITE_TEST_CONNECTOR_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_ConnectorS.cpp - CoherentWrite_Test_Connector_svnt.cpp - } - - Header_Files { - CoherentWrite_Test_ConnectorS.h - CoherentWrite_Test_Connector_svnt.h - CoherentWrite_Test_Connector_svnt_export.h - } - - Inline_Files { - CoherentWrite_Test_ConnectorS.inl - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl deleted file mode 100644 index 9d464e71125..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl +++ /dev/null @@ -1,27 +0,0 @@ -// $Id$ - -/** - * @file - * @author Marcel Smit <msmit@remedy.nl> - */ - -#ifndef RECEIVER_IDL -#define RECEIVER_IDL - -#include "Connector/CoherentWrite_Test_Connector.idl" -#include "Base/Reader_Starter.idl" - -module CoherentWrite_Test -{ - component Receiver - { - port CCM_DDS::CoherentWriteTest::DDS_Read info_out; - - provides CoherentWriteStarter reader_start; - uses CoherentWriteRestarter writer_restart; - - attribute unsigned short nr_runs; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc deleted file mode 100755 index f5870a7e346..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc +++ /dev/null @@ -1,157 +0,0 @@ -// $Id$ - -project(CoherentWrite_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm { - custom_only = 1 - after += CoherentWrite_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ - -Wb,stub_export_include=Receiver_stub_export.h \ - -Wb,skel_export_macro=RECEIVER_SVNT_Export \ - -Wb,skel_export_include=Receiver_svnt_export.h \ - -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ - -Wb,svnt_export_include=Receiver_svnt_export.h \ - -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. - - IDL_Files { - CoherentWrite_Test_Receiver.idl - } -} - -project(CoherentWrite_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm { - after += CoherentWrite_Test_Receiver_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \ - -Wb,stub_export_include=Receiver_lem_stub_export.h \ - -SS -Gxhst -I.. - - IDL_Files { - CoherentWrite_Test_ReceiverE.idl - } -} - -project(CoherentWrite_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base { - after += CoherentWrite_Test_Receiver_lem_gen CoherentWrite_Test_Receiver_stub \ - CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub \ - DDS_Coherent_Reader_Starter_stub - libs += Receiver_stub CoherentWrite_Test_Connector_stub \ - CoherentWrite_Test_Base_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_lem_stub - dynamicflags = RECEIVER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_ReceiverEC.cpp - } - - Header_Files { - CoherentWrite_Test_ReceiverEC.h - Receiver_lem_stub_export.h - } - - Inline_Files { - CoherentWrite_Test_ReceiverEC.inl - } -} - -project(CoherentWrite_Test_Receiver_stub) : ccm_stub, dds4ccm_base { - after += CoherentWrite_Test_Receiver_idl_gen CoherentWrite_Test_Connector_stub \ - CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_lem_gen \ - DDS_Coherent_Reader_Starter_stub DDS_Coherent_Reader_Starter_lem_stub - libs += CoherentWrite_Test_Connector_stub CoherentWrite_Test_Base_stub \ - Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Receiver_stub - dynamicflags = RECEIVER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_ReceiverC.cpp - } - - Header_Files { - CoherentWrite_Test_ReceiverC.h - Receiver_stub_export.h - } - - Inline_Files { - CoherentWrite_Test_ReceiverC.inl - } -} - -project(CoherentWrite_Test_Receiver_exec) : ciao_executor, dds4ccm_base { - after += CoherentWrite_Test_Receiver_lem_stub CoherentWrite_Test_Receiver_stub \ - CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub \ - CoherentWrite_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS_Coherent_Reader_Starter_lem_stub DDS_Coherent_Reader_Starter_stub - sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_lem_stub \ - DDS4CCM_lem_stub Reader_Starter_lem_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags = RECEIVER_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_Receiver_exec.cpp - } - - Header_Files { - CoherentWrite_Test_Receiver_exec.h - Receiver_exec_export.h - } - - Inline_Files { - } -} - - -project(CoherentWrite_Test_Receiver_svnt) : ciao_servant, dds4ccm_base { - after += CoherentWrite_Test_Receiver_lem_stub CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \ - CoherentWrite_Test_Receiver_exec CoherentWrite_Test_Connector_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel DDS_Coherent_Reader_Starter_stub \ - DDS_Coherent_Reader_Starter_svnt DDS_Coherent_Reader_Starter_lem_stub - sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \ - Receiver_exec CoherentWrite_Test_Connector_lem_stub DDS4CCM_lem_stub \ - DDS4CCM_skel Reader_Starter_stub Reader_Starter_svnt \ - Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags = RECEIVER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_ReceiverS.cpp - CoherentWrite_Test_Receiver_svnt.cpp - } - - Header_Files { - CoherentWrite_Test_ReceiverS.h - CoherentWrite_Test_Receiver_svnt.h - Receiver_svnt_export.h - } - - Inline_Files { - CoherentWrite_Test_ReceiverS.inl - } -} - - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp deleted file mode 100644 index 78c3446fb22..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp +++ /dev/null @@ -1,305 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -#include "CoherentWrite_Test_Receiver_exec.h" - -#include "ace/OS_NS_unistd.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "ciao/Logger/Log_Macros.h" - -namespace CIAO_CoherentWrite_Test_Receiver_Impl -{ - //============================================================ - // read_action_Generator - //============================================================ - read_action_Generator::read_action_Generator (Receiver_exec_i &callback, - int run) - : callback_ (callback), - run_ (run) - { - } - - read_action_Generator::~read_action_Generator () - { - } - - int - read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *) - { - ACE_DEBUG ((LM_DEBUG, "Checking if last sample " - "is available in DDS...\n")); - if (this->callback_.check_last ()) - this->callback_.run (this->run_); - return 0; - } - - //============================================================ - // Starter_exec_i - //============================================================ - Starter_exec_i::Starter_exec_i (Receiver_exec_i & callback) - : callback_ (callback) - { - } - - Starter_exec_i::~Starter_exec_i (void) - { - } - - void - Starter_exec_i::set_reader_properties (CORBA::UShort nr_iterations) - { - this->callback_.iterations (nr_iterations); - } - - void - Starter_exec_i::start_read (CORBA::UShort run) - { - this->callback_.start_read (run); - } - - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - : iterations_ (10), - run_ (0), - nr_runs_ (5), - last_iter_ (0), - ticker_ (0) - { - } - - Receiver_exec_i::~Receiver_exec_i (void) - { - } - - - bool - Receiver_exec_i::check_last () - { - try - { - CoherentWriteTest coherentwrite_info; - ::CCM_DDS::ReadInfo readinfo; - coherentwrite_info.symbol = CORBA::string_dup ("KEY_1"); - this->reader_->read_one_last ( - coherentwrite_info, - readinfo, - ::DDS::HANDLE_NIL); - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last - " - "last iteration <%d> - <%d>\n", - coherentwrite_info.iteration, - (this->run_ + 1) * this->iterations_ - 1)); - return coherentwrite_info.iteration >= (this->run_ + 1) * this->iterations_ - 1; - } - catch (...) - { - // no need to catch. An error is given - // when this example didn't run at all. - ACE_DEBUG ((LM_INFO, "CRASH !\n")); - } - return false; - } - - // Supported operations and attributes. - void - Receiver_exec_i::read_all (void) - { - try - { - CoherentWriteTest_Seq *coherentwrite_info_seq; - ::CCM_DDS::ReadInfoSeq *readinfo_seq; - this->reader_->read_all ( - coherentwrite_info_seq, - readinfo_seq); - - for (CORBA::ULong it = 0; it < coherentwrite_info_seq->length (); ++it) - { - if ((*coherentwrite_info_seq)[it].iteration > this->last_iter_) - { - if ((*coherentwrite_info_seq)[it].iteration == ++this->last_iter_) - { - ACE_DEBUG ((LM_DEBUG, "OK: ")); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: ")); - } - ACE_DEBUG ((LM_DEBUG, "expected: <%u> - " - "received <%d>\n", - this->last_iter_, - (*coherentwrite_info_seq)[it].iteration)); - } - } - if (this->run_ < this->nr_runs () + 1) - { - this->restarter_->restart_write (); - } - else - { - ACE_DEBUG ((LM_DEBUG, "Finished: wait for shutdown\n")); - } - } - catch (const CCM_DDS::NonExistent& ex) - { - for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ") - ACE_TEXT ("caught expected exception: index <%u>\n"), - ex.indexes[i])); - } - } - catch (const CCM_DDS::InternalError& ex) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ") - ACE_TEXT ("caught InternalError exception: retval <%u>\n"), - ex.error_code)); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("ERROR: READ ALL: "); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n"))); - } - } - - void - Receiver_exec_i::start_read (CORBA::UShort run) - { - this->ticker_ = new read_action_Generator (*this, run); - if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer ( - this->ticker_, - 0, - ACE_Time_Value(1, 0), - ACE_Time_Value(1, 0)) == -1) - { - ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n")); - } - } - - void - Receiver_exec_i::run (CORBA::UShort run) - { - if (this->ticker_) - { - this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - " - "Starting run number <%d>\n", - run)); - this->run_ = run; - read_all (); - } - - ::CORBA::UShort - Receiver_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Receiver_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CORBA::UShort - Receiver_exec_i::nr_runs (void) - { - return this->nr_runs_; - } - - void - Receiver_exec_i::nr_runs (::CORBA::UShort nr_runs) - { - this->nr_runs_ = nr_runs; - } - - // Port operations. - ::CCM_DDS::CoherentWriteTest::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - return ::CCM_DDS::CoherentWriteTest::CCM_Listener::_nil (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - return ::CCM_DDS::CCM_PortStatusListener::_nil (); - } - - ::CCM_CoherentWriteStarter_ptr - Receiver_exec_i::get_reader_start () - { - return new Starter_exec_i (*this); - } - - // Operations from Components::SessionComponent. - void - Receiver_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::CoherentWrite_Test::CCM_Receiver_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Receiver_exec_i::configuration_complete (void) - { - } - - void - Receiver_exec_i::ccm_activate (void) - { - this->reader_ = this->context_->get_connection_info_out_data(); - this->restarter_ = this->context_->get_connection_writer_restart (); -} - - void - Receiver_exec_i::ccm_passivate (void) - { - } - - void - Receiver_exec_i::ccm_remove (void) - { - if (this->ticker_) - { - this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; - this->ticker_ = 0; - } - if (this->run_ == 1) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ") - ACE_TEXT ("Test did not run") - ACE_TEXT ("events.\n"))); - } - else - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Finished coherent write test.\n"))); - } - } - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentWrite_Test_Receiver_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Receiver_exec_i); - - return retval; - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h deleted file mode 100644 index efceb8b3c7b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h +++ /dev/null @@ -1,124 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#ifndef CIAO_RECEIVER_EXEC_H_ -#define CIAO_RECEIVER_EXEC_H_ - -#include "CoherentWrite_Test_ReceiverEC.h" - -#include /**/ "Receiver_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -#include <map> - -namespace CIAO_CoherentWrite_Test_Receiver_Impl -{ - class Receiver_exec_i; - - //============================================================ - // read_action_Generator - //============================================================ - class read_action_Generator - : public ACE_Event_Handler - { - public: - read_action_Generator (Receiver_exec_i &callback, - int run); - - ~read_action_Generator (); - - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); - private: - Receiver_exec_i &callback_; - int run_; - }; - - //============================================================ - // Starter_exec_i - //============================================================ - class Starter_exec_i - : public virtual ::CCM_CoherentWriteStarter, - public virtual ::CORBA::LocalObject - { - public: - Starter_exec_i (Receiver_exec_i & callback); - virtual ~Starter_exec_i (void); - - virtual void set_reader_properties (CORBA::UShort nr_iterations); - virtual void start_read (CORBA::UShort run); - - private: - Receiver_exec_i &callback_; - }; - - //============================================================ - // Receiver_exec_i - //============================================================ - class RECEIVER_EXEC_Export Receiver_exec_i - : public virtual Receiver_Exec, - public virtual ::CORBA::LocalObject - { - public: - Receiver_exec_i (void); - virtual ~Receiver_exec_i (void); - - // Supported operations and attributes. - // Component attributes. - - // Port operations. - virtual ::CCM_DDS::CoherentWriteTest::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_CoherentWriteStarter_ptr - get_reader_start (); - - bool check_last (); - void start_read (CORBA::UShort run); - void run (CORBA::UShort run); - - ::CORBA::UShort iterations (void); - void iterations (::CORBA::UShort iterations); - - ::CORBA::UShort nr_runs (void); - void nr_runs (::CORBA::UShort nr_runs); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - private: - ::CoherentWrite_Test::CCM_Receiver_Context_var context_; - ::CCM_DDS::CoherentWriteTest::Reader_var reader_; - CoherentWriteRestarter_var restarter_; - CORBA::UShort iterations_; - CORBA::UShort run_; - CORBA::UShort nr_runs_; - CORBA::Long last_iter_; - - read_action_Generator *ticker_; - - void read_all (void); - }; - - extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentWrite_Test_Receiver_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl deleted file mode 100644 index c496b47d1cb..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl +++ /dev/null @@ -1,29 +0,0 @@ -// $Id$ - -/** - * @file - * @author Marcel Smit <msmit@remedy.nl> - * - * by-hand idl3 translation of sender components. - */ - -#ifndef DDS_COHERENT_WRITE_TEST_SENDER_IDL -#define DDS_COHERENT_WRITE_TEST_SENDER_IDL - -#include "Connector/CoherentWrite_Test_Connector.idl" -#include "Base/Reader_Starter.idl" - -module CoherentWrite_Test -{ - component Sender - { - port CCM_DDS::CoherentWriteTest::DDS_Write info_write; - - uses CoherentWriteStarter start_reader; - provides CoherentWriteRestarter restart_writer; - - attribute unsigned short iterations; - }; -}; - -#endif diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc deleted file mode 100755 index c986fdb963c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc +++ /dev/null @@ -1,155 +0,0 @@ -// $Id$ -// This file is generated with "generate_component_mpc.pl -p CoherentWrite_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender" - -project(CoherentWrite_Test_Sender_idl_gen) : componentidldefaults, dds4ccm { - after += CoherentWrite_Test_Connector_idl_gen DDS_Starter_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ - -Wb,stub_export_include=Sender_stub_export.h \ - -Wb,skel_export_macro=SENDER_SVNT_Export \ - -Wb,skel_export_include=Sender_svnt_export.h \ - -Wb,svnt_export_macro=SENDER_SVNT_Export \ - -Wb,svnt_export_include=Sender_svnt_export.h \ - -Wb,exec_export_macro=SENDER_EXEC_Export \ - -Wb,exec_export_include=Sender_exec_export.h \ - -I .. - - IDL_Files { - CoherentWrite_Test_Sender.idl - } -} - -project(CoherentWrite_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm { - after += CoherentWrite_Test_Sender_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \ - -Wb,stub_export_include=Sender_lem_stub_export.h \ - -SS -Gxhst -I $CIAO_ROOT/connectors -I .. - - IDL_Files { - CoherentWrite_Test_SenderE.idl - } -} - -project(CoherentWrite_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base { - after += CoherentWrite_Test_Sender_lem_gen CoherentWrite_Test_Sender_stub \ - CoherentWrite_Test_Base_stub DDS_Coherent_Reader_Starter_stub - libs += CoherentWrite_Test_Base_stub Sender_stub Reader_Starter_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = Sender_lem_stub - dynamicflags = SENDER_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_SenderEC.cpp - } - - Header_Files { - CoherentWrite_Test_SenderEC.h - Sender_lem_stub_export.h - } - - Inline_Files { - CoherentWrite_Test_SenderEC.inl - } -} - -project(CoherentWrite_Test_Sender_stub) : ccm_stub, dds4ccm_base { - after += CoherentWrite_Test_Sender_idl_gen CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_stub DDS_Coherent_Reader_Starter_stub \ - DDS_Coherent_Reader_Starter_lem_stub - libs += CoherentWrite_Test_Base_stub CoherentWrite_Test_Connector_stub \ - Reader_Starter_stub - includes += .. - libpaths += ../lib - libout = ../lib - sharedname = Sender_stub - dynamicflags = SENDER_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_SenderC.cpp - } - - Header_Files { - CoherentWrite_Test_SenderC.h - Sender_stub_export.h - } - - Inline_Files { - CoherentWrite_Test_SenderC.inl - } -} - -project(CoherentWrite_Test_Sender_exec) : ciao_executor, dds4ccm_base { - after += CoherentWrite_Test_Sender_lem_stub CoherentWrite_Test_Sender_stub \ - CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub \ - DDS4CCM_lem_stub DDS_Coherent_Reader_Starter_lem_stub - sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub CoherentWrite_Test_Base_stub \ - CoherentWrite_Test_Connector_lem_stub CoherentWrite_Test_Connector_stub \ - Reader_Starter_stub DDS4CCM_lem_stub Reader_Starter_lem_stub \ - Reader_Starter_lem_stub - libpaths += ../lib - includes += .. - libout = ../lib - dynamicflags = SENDER_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_Sender_exec.cpp - } - - Header_Files { - CoherentWrite_Test_Sender_exec.h - Sender_exec_export.h - } - - Inline_Files { - } -} - - -project(CoherentWrite_Test_Sender_svnt) : ciao_servant, dds4ccm_base { - after += CoherentWrite_Test_Base_stub CoherentWrite_Test_Sender_lem_stub \ - DDS4CCM_lem_stub DDS4CCM_skel CoherentWrite_Test_Connector_stub \ - CoherentWrite_Test_Connector_svnt CoherentWrite_Test_Connector_lem_stub \ - DDS_Coherent_Reader_Starter_stub DDS_Coherent_Reader_Starter_svnt \ - DDS_Coherent_Reader_Starter_lem_stub - sharedname = Sender_svnt - libs += Sender_stub Sender_lem_stub CoherentWrite_Test_Base_stub DDS4CCM_lem_stub \ - DDS4CCM_skel CoherentWrite_Test_Connector_stub CoherentWrite_Test_Connector_svnt \ - CoherentWrite_Test_Connector_lem_stub Reader_Starter_stub \ - Reader_Starter_svnt Reader_Starter_lem_stub - libpaths += ../lib - libout = ../lib - includes += .. - dynamicflags = SENDER_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - CoherentWrite_Test_SenderS.cpp - CoherentWrite_Test_Sender_svnt.cpp - } - - Header_Files { - CoherentWrite_Test_SenderS.h - CoherentWrite_Test_Sender_svnt.h - Sender_svnt_export.h - } - - Inline_Files { - CoherentWrite_Test_SenderS.inl - } -} - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp deleted file mode 100644 index 5d24afeea3d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp +++ /dev/null @@ -1,179 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#include "CoherentWrite_Test_Sender_exec.h" -#include "tao/ORB_Core.h" -#include "ace/Reactor.h" -#include "ciao/Logger/Log_Macros.h" - -namespace CIAO_CoherentWrite_Test_Sender_Impl -{ - //============================================================ - // WriteHandler - //============================================================ - WriteHandler::WriteHandler (Sender_exec_i &callback) - : callback_ (callback) - { - } - - int - WriteHandler::handle_exception (ACE_HANDLE) - { - this->callback_.start (); - return 0; - } - - //============================================================ - // Restarter_exec_i - //============================================================ - Restarter_exec_i::Restarter_exec_i (Sender_exec_i & callback) - : callback_ (callback) - { - } - - Restarter_exec_i::~Restarter_exec_i (void) - { - } - - void - Restarter_exec_i::restart_write () - { - this->callback_.restart (); - } - - //============================================================ - // Component Executor Implementation Class: Sender_exec_i - //============================================================ - Sender_exec_i::Sender_exec_i (void) - : iterations_ (3), - run_ (1), - total_iter (0) - { - } - - Sender_exec_i::~Sender_exec_i (void) - { - } - - void - Sender_exec_i::restart (void) - { - ++this->run_; - WriteHandler *wh = new WriteHandler (*this); - this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (wh); - } - - void - Sender_exec_i::start (void) - { - if (!CORBA::is_nil (this->starter_)) - { - this->starter_->set_reader_properties (this->iterations_); - } - else - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n"))); - } - - ACE_DEBUG ((LM_DEBUG, "Start run <%d> with <%u> iterations\n", - this->run_, - this->iterations ())); - - CoherentWriteTest_Seq write_many_seq; - write_many_seq.length (this->iterations_); - for (int i = 1; i < this->iterations_ + 1; ++i) - { - CoherentWriteTest new_key; - new_key.symbol = CORBA::string_dup("KEY_1"); - new_key.iteration = ++total_iter; - write_many_seq[i-1] = new_key; - } - this->writer_->write_many (write_many_seq); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Written <%u> keys uptil now\n"), - total_iter)); - ACE_OS::sleep (2); - this->starter_->start_read (this->run_); - } - - ::CORBA::UShort - Sender_exec_i::iterations (void) - { - return this->iterations_; - } - - void - Sender_exec_i::iterations (::CORBA::UShort iterations) - { - this->iterations_ = iterations; - } - - ::CCM_CoherentWriteRestarter_ptr - Sender_exec_i::get_restart_writer (void) - { - return new Restarter_exec_i (*this); - } - - void - Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) - { - this->context_ = - ::CoherentWrite_Test::CCM_Sender_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Sender_exec_i::configuration_complete (void) - { - } - - void - Sender_exec_i::ccm_activate (void) - { - try - { - this->writer_ = this->context_->get_connection_info_write_data (); - this->writer_->is_coherent_write (true); - this->starter_ = this->context_->get_connection_start_reader (); - WriteHandler *wh = new WriteHandler (*this); - this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (wh); - } - catch (const CORBA::Exception& ex) - { - ex._tao_print_exception ("Exception caught:"); - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Exception caught\n"))); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: GET_CONNECTION_START_READER : Unknown exception caught\n"))); - } - } - - void - Sender_exec_i::ccm_passivate (void) - { - } - - void - Sender_exec_i::ccm_remove (void) - { - } - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentWrite_Test_Sender_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Sender_exec_i); - - return retval; - } -} diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h deleted file mode 100644 index d86c551b456..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h +++ /dev/null @@ -1,96 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#ifndef CIAO_SENDER_EXEC_H_ -#define CIAO_SENDER_EXEC_H_ - - -#include "CoherentWrite_Test_SenderEC.h" - -#include /**/ "Sender_exec_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/LocalObject.h" - -namespace CIAO_CoherentWrite_Test_Sender_Impl -{ - class Sender_exec_i; - - //============================================================ - // WriteHandler - //============================================================ - class WriteHandler : - public ACE_Event_Handler - { - public: - WriteHandler (Sender_exec_i &callback); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - Sender_exec_i &callback_; - }; - - //============================================================ - // Restarter_exec_i - //============================================================ - class Restarter_exec_i - : public virtual ::CCM_CoherentWriteRestarter, - public virtual ::CORBA::LocalObject - { - public: - Restarter_exec_i (Sender_exec_i & callback); - virtual ~Restarter_exec_i (void); - - virtual void restart_write (); - - private: - Sender_exec_i &callback_; - }; - - //============================================================ - // Sender_exec_i - //============================================================ - class Sender_exec_i - : public virtual Sender_Exec, - public virtual ::CORBA::LocalObject - { - public: - Sender_exec_i (void); - virtual ~Sender_exec_i (void); - - virtual ::CORBA::UShort iterations (void); - - virtual void iterations (::CORBA::UShort iterations); - - virtual ::CCM_CoherentWriteRestarter_ptr - get_restart_writer (void); - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - - void start (void); - void restart (void); - - private: - ::CoherentWrite_Test::CCM_Sender_Context_var context_; - CCM_DDS::CoherentWriteTest::Writer_var writer_; - CoherentWriteStarter_var starter_; - - CORBA::UShort iterations_; - CORBA::UShort run_; - CORBA::ULong total_iter; - }; - - extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_CoherentWrite_Test_Sender_Impl (void); -} - -#endif /* ifndef */ - diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp deleted file mode 100644 index 0a814540765..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp +++ /dev/null @@ -1,404 +0,0 @@ -<Deployment:DeploymentPlan - xmlns:Deployment="http://www.omg.org/Deployment" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - <label>CoherentWrite_Test_Depl_1</label> - <UUID>CoherentWrite_Test_Depl_1</UUID> - - <implementation xmi:id="ReceiverComponentImplementation"> - <name>ReceiverComponentImplementation</name> - <source/> - <artifact xmi:idref="Receiver_ExecArtifact" /> - <artifact xmi:idref="Receiver_SvntArtifact" /> - <execParameter> - <!-- entrypoint as exec parameter (see 10.6.1) --> - <name>component factory</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_CoherentWrite_Test_Receiver_Impl</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_CoherentWrite_Test_Receiver_Servant</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver_svnt</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Receiver_exec</string> - </value> - </value> - </execParameter> - </implementation> - - <implementation xmi:id="CoherentWrite_Test_ConnectorComponentImplementation"> - <name>CoherentWrite_Test_ConnectorComponentImplementation</name> - <source/> - <artifact xmi:idref="CoherentWrite_Test_Connector_ExecArtifact" /> - <artifact xmi:idref="CoherentWrite_Test_Connector_SvntArtifact" /> - <execParameter> - <!-- entrypoint as exec parameter (see 10.6.1) --> - <name>component factory</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_CoherentWrite_Test_CoherentWrite_Test_Connector_Impl</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_CoherentWrite_Test_CoherentWrite_Test_Connector_Servant</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>CoherentWrite_Test_Connector_svnt</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>CoherentWrite_Test_Connector_exec</string> - </value> - </value> - </execParameter> - </implementation> - <implementation xmi:id="SenderComponentImplementation"> - <name>SenderComponentImplementation</name> - <source/> - <artifact xmi:idref="Sender_ExecArtifact" /> - <artifact xmi:idref="Sender_SvntArtifact" /> - <execParameter> - <!-- entrypoint as exec parameter (see 10.6.1) --> - <name>component factory</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_CoherentWrite_Test_Sender_Impl</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_CoherentWrite_Test_Sender_Servant</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender_svnt</string> - </value> - </value> - </execParameter> - <execParameter> - <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Sender_exec</string> - </value> - </value> - </execParameter> - </implementation> - <instance xmi:id="ReceiverComponentInstance"> - <name>ReceiverComponent</name> - <node>ReceiverNode</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="ReceiverComponentImplementation" /> - <configProperty> - <name>nr_runs</name> - <value> - <type> - <kind>tk_ushort</kind> - </type> - <value> - <ushort>5</ushort> - </value> - </value> - </configProperty> - </instance> - <instance xmi:id="CoherentWrite_Test_ConnectorComponentInstance"> - <name>CoherentWrite_Test_ConnectorComponent</name> - <node>SenderNode</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="CoherentWrite_Test_ConnectorComponentImplementation" /> - <configProperty> - <name>qos_profile</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>QueryFilter_Library#QueryFilter_Profile</string> - </value> - </value> - </configProperty> - <configProperty> - <name>topic_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>CoherentWrite_Test</string> - </value> - </value> - </configProperty> - </instance> - <instance xmi:id="CoherentWrite_Test_ConnectorComponentInstance2"> - <name>CoherentWrite_Test_ConnectorComponent2</name> - <node>ReceiverNode</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="CoherentWrite_Test_ConnectorComponentImplementation" /> - <configProperty> - <name>qos_profile</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>QueryFilter_Library#QueryFilter_Profile</string> - </value> - </value> - </configProperty> - <configProperty> - <name>topic_name</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>CoherentWrite_Test</string> - </value> - </value> - </configProperty> - </instance> - <instance xmi:id="SenderComponentInstance"> - <name>SenderComponent</name> - <node>SenderNode</node> - <!-- hostname --> - <source/> - <implementation xmi:idref="SenderComponentImplementation" /> - <configProperty> - <name>iterations</name> - <value> - <type> - <kind>tk_ushort</kind> - </type> - <value> - <ushort>4</ushort> - </value> - </value> - </configProperty> - </instance> - - <connection> - <name>info_out_data</name> - <deployRequirement> - <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> - <resourceType>Local_Interface</resourceType> - </deployRequirement> - <internalEndpoint> - <portName>info_out_data</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="ReceiverComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>push_consumer_data</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="CoherentWrite_Test_ConnectorComponentInstance2" /> - </internalEndpoint> - </connection> - - <connection> - <name>info_out_connector_status_sender</name> - <deployRequirement> - <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> - <resourceType>Local_Interface</resourceType> - </deployRequirement> - <internalEndpoint> - <portName>info_out_connector_status</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="SenderComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>error_listener</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="CoherentWrite_Test_ConnectorComponentInstance" /> - </internalEndpoint> - </connection> - - <connection> - <name>writer_connection</name> - <deployRequirement> - <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> - <resourceType>Local_Interface</resourceType> - </deployRequirement> - <internalEndpoint> - <portName>info_write_data</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="SenderComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>supplier_data</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="CoherentWrite_Test_ConnectorComponentInstance" /> - </internalEndpoint> - </connection> - - <connection> - <name>reader_starter</name> - <internalEndpoint> - <portName>start_reader</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="SenderComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>reader_start</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="ReceiverComponentInstance" /> - </internalEndpoint> - </connection> - - <connection> - <name>restart_writer</name> - <internalEndpoint> - <portName>writer_restart</portName> - <provider>false</provider> - <kind>SimplexReceptacle</kind> - <instance xmi:idref="ReceiverComponentInstance" /> - </internalEndpoint> - <internalEndpoint> - <portName>restart_writer</portName> - <provider>true</provider> - <kind>Facet</kind> - <instance xmi:idref="SenderComponentInstance" /> - </internalEndpoint> - </connection> - - <artifact xmi:id="Sender_ExecArtifact"> - <name>Sender_exec</name> - <source/> - <node/> - <location>Sender_exec</location> - </artifact> - <artifact xmi:id="Sender_SvntArtifact"> - <name>Sender_svnt</name> - <source/> - <node/> - <location>Sender_svnt</location> - </artifact> - <artifact xmi:id="Sender_StubArtifact"> - <name>Sender_stub</name> - <source/> - <node/> - <location>Sender_stub</location> - </artifact> - <artifact xmi:id="CoherentWrite_Test_Connector_ExecArtifact"> - <name>CoherentWrite_Test_Connector_exec</name> - <source/> - <node/> - <location>CoherentWrite_Test_Connector_exec</location> - </artifact> - <artifact xmi:id="CoherentWrite_Test_Connector_SvntArtifact"> - <name>CoherentWrite_Test_Connector_svnt</name> - <source/> - <node/> - <location>CoherentWrite_Test_Connector_svnt</location> - </artifact> - <artifact xmi:id="CoherentWrite_Test_Connector_StubArtifact"> - <name>CoherentWrite_Test_Connector_stub</name> - <source/> - <node/> - <location>CoherentWrite_Test_Connector_stub</location> - </artifact> - <artifact xmi:id="Receiver_ExecArtifact"> - <name>Receiver_exec</name> - <source/> - <node/> - <location>Receiver_exec</location> - </artifact> - <artifact xmi:id="Receiver_SvntArtifact"> - <name>Receiver_svnt</name> - <source/> - <node/> - <location>Receiver_svnt</location> - </artifact> - <artifact xmi:id="Receiver_StubArtifact"> - <name>Receiver_stub</name> - <source/> - <node/> - <location>Receiver_stub</location> - </artifact> -</Deployment:DeploymentPlan> diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml deleted file mode 100644 index 571930e854d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - -Description -XML QoS Profile - -The QoS configuration of the DDS entities in the generated example is -loaded from this file. - -This file is used only when it is in the current working directory -or when the enviroment variable -NDDS_QOS_PROFILES is defined and points to this file. - -For more information about XML QoS Profiles see Chapter 15 in the -RTI Data Distribution Service user manual. ---> -<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> - <!-- QoS Library containing the QoS profile used in the generated example. - - A QoS library is a named set of QoS profiles. - --> - <qos_library name="QueryFilter_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 used to configure the data writer created in the example code --> - <datawriter_qos> - <reliability> - <kind>RELIABLE_RELIABILITY_QOS</kind> - <max_blocking_time> - <sec>10</sec> - <nanosec>0</nanosec> - </max_blocking_time> - </reliability> - <durability> - <kind>TRANSIENT_DURABILITY_QOS</kind> - </durability> - <history> - <kind>KEEP_ALL_HISTORY_QOS</kind> - </history> - <protocol> - <rtps_reliable_writer> - <max_heartbeat_retries>10</max_heartbeat_retries> - </rtps_reliable_writer> - </protocol> - </datawriter_qos> - <!-- QoS used to configure the data reader created in the example code --> - <datareader_qos> - <reliability> - <kind>RELIABLE_RELIABILITY_QOS</kind> - </reliability> - <history> - <kind>KEEP_ALL_HISTORY_QOS</kind> - </history> - <durability> - <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind> - </durability> - </datareader_qos> - </qos_profile> - </qos_library> -</dds>
\ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl deleted file mode 100755 index 4d9ba95b5f7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl +++ /dev/null @@ -1,244 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{'ACE_ROOT'}/bin"; -use PerlACE::TestTarget; - -$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; -$TAO_ROOT = "$ENV{'TAO_ROOT'}"; -$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; - -$daemons_running = 0; -$em_running = 0; -$ns_running = 0; - -$nr_daemon = 2; -@ports = ( 60001, 60002 ); -@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" ); -@iorfiles = 0; -@nodenames = ( "SenderNode", "ReceiverNode" ); - -# ior files other than daemon -# ior files other than daemon -$ior_nsbase = "ns.ior"; -$ior_nsfile = 0; -$ior_embase = "EM.ior"; -$ior_emfile = 0; - -# Processes -$E = 0; -$EM = 0; -$NS = 0; -@DEAMONS = 0; - -# targets -@tg_daemons = 0; -$tg_naming = 0; -$tg_exe_man = 0; -$tg_executor = 0; - -$status = 0; -$cdp_file = "Plan.cdp"; - -sub create_targets { - # naming service - $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; - $tg_naming->AddLibPath ('../lib'); - # daemon - for ($i = 0; $i < $nr_daemon; ++$i) { - $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n"; - $tg_daemons[$i]->AddLibPath ('../lib'); - } - # execution manager - $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; - $tg_exe_man->AddLibPath ('../lib'); - # executor (plan_launcher) - $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; - $tg_executor->AddLibPath ('../lib'); -} - -sub init_ior_files { - $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); - $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); - for ($i = 0; $i < $nr_daemon; ++$i) { - $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); - } - delete_ior_files (); -} - -# Delete if there are any .ior files. -sub delete_ior_files { - for ($i = 0; $i < $nr_daemon; ++$i) { - $tg_daemons[$i]->DeleteFile ($iorbases[$i]); - } - $tg_naming->DeleteFile ($ior_nsbase); - $tg_exe_man->DeleteFile ($ior_embase); - for ($i = 0; $i < $nr_daemon; ++$i) { - $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); - } -} - -sub kill_node_daemon { - for ($i = 0; $i < $nr_daemon; ++$i) { - $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); - } -} - -sub kill_open_processes { - if ($daemons_running == 1) { - kill_node_daemon (); - } - - if ($em_running == 1) { - $EM->Kill (); $EM->TimedWait (1); - } - - if ($ns_running == 1) { - $NS->Kill (); $NS->TimedWait (1); - } - # in case shutdown did not perform as expected - $tg_executor->KillAll ('ciao_componentserver'); -} - -sub run_node_daemons { - for ($i = 0; $i < $nr_daemon; ++$i) { - $iorbase = $iorbases[$i]; - $iorfile = $iorfiles[$i]; - $port = $ports[$i]; - $nodename = $nodenames[$i]; - $iiop = "iiop://localhost:$port"; - $node_app = "$CIAO_ROOT/bin/ciao_componentserver"; - - $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; - $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; - - print "Run dance_node_manager with $d_param\n"; - - $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); - $DEAMONS[$i]->Spawn (); - - if ($tg_daemons[$i]->WaitForFileTimed($iorbase, - $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { - print STDERR - "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; - for (; $i >= 0; --$i) { - $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); - } - return -1; - } - } - return 0; -} - -create_targets (); -init_ior_files (); - -# Invoke naming service - -$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - -$ns_status = $NS->Spawn (); - -if ($ns_status != 0) { - print STDERR "ERROR: Unable to execute the naming service\n"; - kill_open_processes (); - exit 1; -} - -print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; - -if ($tg_naming->WaitForFileTimed ($ior_nsbase, - $tg_naming->ProcessStartWaitInterval ()) == -1) { - print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); $NS->TimedWait (1); - exit 1; -} - -$ns_running = 1; -# Set up NamingService environment -$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; - -# Invoke node daemon. -print "Invoking node daemon\n"; -$status = run_node_daemons (); - -if ($status != 0) { - print STDERR "ERROR: Unable to execute the node daemon\n"; - kill_open_processes (); - exit 1; -} - -$daemons_running = 1; - -# Invoke execution manager. -print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; -$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", - "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); -$em_status = $EM->Spawn (); - -if ($em_status != 0) { - print STDERR "ERROR: dance_execution_manager returned $em_status"; - exit 1; -} - -if ($tg_exe_man->WaitForFileTimed ($ior_embase, - $tg_exe_man->ProcessStartWaitInterval ()) == -1) { - print STDERR - "ERROR: The ior file of execution manager could not be found\n"; - kill_open_processes (); - exit 1; -} - -$em_running = 1; - -# Invoke executor - start the application -. -print "Invoking executor - launch the application -\n"; - -print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $cdp_file -k file://$ior_emfile"); -$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); - -if ($pl_status != 0) { - print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; - kill_open_processes (); - exit 1; -} - -for ($i = 0; $i < $nr_daemon; ++$i) { - if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], - $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { - print STDERR "ERROR: The ior file of daemon $i could not be found\n"; - kill_open_processes (); - exit 1; - } -} - -print "Sleeping 30 seconds to allow task to complete\n"; -sleep (30); - -# Invoke executor - stop the application -. -print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; - -$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -q"); -$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); - -if ($pl_status != 0) { - print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; - kill_open_processes (); - exit 1; -} - -print "Executor returned.\n"; -print "Shutting down rest of the processes.\n"; - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc index 3b14f5ee862..7c554de57f6 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc @@ -5,12 +5,11 @@ project (DDS_DDSWriterEntityBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts dynamicflags += WRITER_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=WRITER_BASE_STUB_Export \ -Wb,stub_export_include=Writer_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Writer_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp index 9bedec67a59..91cee664d62 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp @@ -7,7 +7,7 @@ #include "ace/Reactor.h" #include "Base/Writer_BaseSupport.h" -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" namespace CIAO_Writer_Sender_Impl { @@ -214,9 +214,9 @@ namespace CIAO_Writer_Sender_Impl { DDS::DataWriter_var dds_dw = this->context_->get_connection_info_write_dds_entity (); - CIAO::DDS4CCM::CCM_DDS_DataWriter_i *ccm_dds_rd = + CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd = dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dds_dw.in ()); - DDSDataWriter * p = ccm_dds_rd->get_impl (); + DDSDataWriter * p = rti_rd->get_impl (); this->writer_ = dynamic_cast <WriterTestDataWriter *> (p); } 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..fdfe91cf294 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h @@ -15,7 +15,7 @@ #include "tao/LocalObject.h" -#include "dds4ccm/impl/dds/DataWriter.h" +#include "dds4ccm/impl/ndds/DataWriter.h" #include <map> diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl index 0fdbd60f439..bbe2080c3ad 100755 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl @@ -231,7 +231,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc index 20cf270e105..b13ec18ef4a 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc @@ -5,12 +5,11 @@ project (DDS_ECT_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { dynamicflags += EVENT_CONNECTION_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=EVENT_CONNECTION_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Event_Connection_Test_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Event_Connection_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl index b2a5229d554..a625ecd9216 100755 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc index ce3dc9811aa..504f7e0d832 100755 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc @@ -5,12 +5,11 @@ project (DDS_FSS_Event_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_defa dynamicflags += FIXED_SIZE_STRUCT_EVENT_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_BASE_STUB_Export \ -Wb,stub_export_include=FSS_Event_Base_stub_export.h IDL_Files { - idlflags += -Gxhst FSS_Event_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc index ee553207732..e37f63b3b2f 100755 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc @@ -5,12 +5,11 @@ project (DDS_FSS_State_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_defa dynamicflags += FIXED_SIZE_STRUCT_STATE_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_BASE_STUB_Export \ -Wb,stub_export_include=FSS_State_Base_stub_export.h IDL_Files { - idlflags += -Gxhst FSS_State_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc index fa70eb16af0..10ba8dbca86 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc @@ -5,12 +5,11 @@ project (DDS_Getter_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_de dynamicflags += GETTER_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=GETTER_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Getter_Test_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Getter_Test_Base.idl } @@ -22,5 +21,8 @@ project (DDS_Getter_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_de Source_Files { } + + Source_Files { + } } diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl index d897a3911e9..3b13df93b5d 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl @@ -229,10 +229,10 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc index dc020d1f5a5..b0e2a2692b8 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc @@ -5,12 +5,11 @@ project (DDS_DDSInstanceHandleBase_stub) : taoidldefaults, anytypecode, dds4ccm_ dynamicflags += WRITER_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=WRITER_BASE_STUB_Export \ -Wb,stub_export_include=Writer_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Writer_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp index 985d16e8aa5..13e89da3498 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp @@ -2,14 +2,13 @@ // $Id$ #include "Writer_Sender_exec.h" +#include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/Reactor.h" #include "Base/Writer_BaseSupport.h" -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h" - -#include "ciao/Logger/Log_Macros.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/InstanceHandle_t.h" namespace CIAO_Writer_Sender_Impl { @@ -219,9 +218,9 @@ namespace CIAO_Writer_Sender_Impl { DDS::DataWriter_var dds_dw = this->context_->get_connection_info_write_dds_entity (); - CIAO::DDS4CCM::CCM_DDS_DataWriter_i *ccm_dds_rd = + CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd = dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dds_dw.in ()); - DDSDataWriter * p = ccm_dds_rd->get_impl (); + DDSDataWriter * p = rti_rd->get_impl (); this->dds_writer_ = dynamic_cast <WriterTestDataWriter *> (p); this->ccm_writer_ = this->context_->get_connection_info_write_data (); } diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h index 09a47f104d7..ffb84827501 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h @@ -15,7 +15,7 @@ #include "tao/LocalObject.h" -#include "dds4ccm/impl/dds/DataWriter.h" +#include "dds4ccm/impl/ndds/DataWriter.h" #include <map> diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl index e39d6647174..fdbccf937c8 100755 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl @@ -223,10 +223,10 @@ sleep (5); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc index d1c5b16759b..236a8129759 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc @@ -5,12 +5,11 @@ project (DDS_Keyed_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_def dynamicflags += KEYED_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=KEYED_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Keyed_Test_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Keyed_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp index f5cbc8b8ab2..2b96a657ed9 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp @@ -6,7 +6,7 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_time.h" -#include "dds4ccm/impl/dds/TimeUtilities.h" +#include "dds4ccm/impl/ndds/TimeUtilities.h" namespace CIAO_Keyed_Test_Receiver_Impl { diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl index 3ca8a0ee149..4c584d6e11a 100755 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc index 9c3fcac7283..e0af46d8e73 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc @@ -5,12 +5,11 @@ project (DDS_KeyedWriterBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_def dynamicflags += WRITER_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=WRITER_BASE_STUB_Export \ -Wb,stub_export_include=Writer_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Writer_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl index 3ca8a0ee149..4c584d6e11a 100755 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc index ffb29178624..6936e2d5fb7 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc @@ -5,12 +5,11 @@ project (DDS_LMBM_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_defa dynamicflags += LISTEN_MANY_BY_MANY_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_BASE_STUB_Export \ -Wb,stub_export_include=LMBM_Test_Base_stub_export.h IDL_Files { - idlflags += -Gxhst LMBM_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl index ddeee753cf7..017ddc50ed1 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc index 12bbf8ff16d..56630da7f98 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc @@ -5,12 +5,11 @@ project (DDS_LNE_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_defau dynamicflags += LISTEN_NOT_ENABLED_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_BASE_STUB_Export \ -Wb,stub_export_include=LNE_Test_Base_stub_export.h IDL_Files { - idlflags += -Gxhst LNE_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl index b2a5229d554..a625ecd9216 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc index 63a63895730..2308b46eef0 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc @@ -5,12 +5,11 @@ project (DDS_LOBO_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_defa dynamicflags += LISTEN_ONE_BY_ONE_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export \ -Wb,stub_export_include=LOBO_Test_Base_stub_export.h IDL_Files { - idlflags += -Gxhst LOBO_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl index ddeee753cf7..017ddc50ed1 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc index 209d9203b92..4258f9133d0 100644 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc @@ -5,12 +5,11 @@ project (DDS_NonChangeableBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_d dynamicflags += NONCHANGEABLE_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=NONCHANGEABLE_BASE_STUB_Export \ -Wb,stub_export_include=NonChangeable_Base_stub_export.h IDL_Files { - idlflags += -Gxhst NonChangeable_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl index b51ae16243d..e91dc5b9c10 100755 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc index 1b51264bcb8..5435326d875 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc @@ -5,12 +5,11 @@ project (DDS_OIT_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_defau dynamicflags += CONNECTORSTATUSLISTENER_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=CONNECTORSTATUSLISTENER_TEST_BASE_STUB_Export \ -Wb,stub_export_include=ConnectorStatusListener_Test_Base_stub_export.h IDL_Files { - idlflags += -Gxhst ConnectorStatusListener_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl index 9734de1093a..39300e01ff2 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc index ea3bdebc233..99ffa6c0cd4 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc @@ -5,12 +5,11 @@ project (DDS_PSL_DeadlineTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ dynamicflags += PSL_DEADLINETEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=PSL_DEADLINETEST_BASE_STUB_Export \ -Wb,stub_export_include=PSL_DeadlineTest_Base_stub_export.h IDL_Files { - idlflags += -Gxhst PSL_DeadlineTest_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp index 2a776cbfa23..b3c1c12b13e 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp @@ -10,8 +10,8 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_time.h" -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/TimeUtilities.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/TimeUtilities.h" namespace CIAO_PSL_DeadlineTest_Receiver_Impl { diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl index 4ea0f211542..edfa27e2a1f 100755 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl @@ -223,10 +223,10 @@ sleep (20); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc index 69803e22c42..73ba7640c08 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc @@ -5,12 +5,11 @@ project (DDS_PSL_SampleLost_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts dynamicflags += PSL_SAMPLELOST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=PSL_SAMPLELOST_BASE_STUB_Export \ -Wb,stub_export_include=PSL_SampleLost_Base_stub_export.h IDL_Files { - idlflags += -Gxhst PSL_SampleLost_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp index 9c5ee585c66..8472532f2e8 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp @@ -8,8 +8,8 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_time.h" -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/TimeUtilities.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/TimeUtilities.h" namespace CIAO_PSL_SampleLost_Receiver_Impl { diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl index b2a5229d554..a625ecd9216 100755 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp deleted file mode 100644 index 6ee8d9e1b80..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "deadline_qos_test.h" - -#include "duration.h" - -DeadlinePolicyTest::DeadlinePolicyTest () -{ -} - -bool -DeadlinePolicyTest::check (const ::DDS_DeadlineQosPolicy & dds_qos, - const ::DDS::DeadlineQosPolicy & qos) -{ - return Duration::check (dds_qos.period, qos.period); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h deleted file mode 100644 index 3713165c665..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef DEADLINE_QOS_TEST_H_ -#define DEADLINE_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h" - -class DeadlinePolicyTest -{ -public: - DeadlinePolicyTest (); - - static bool check (const ::DDS_DeadlineQosPolicy & dds_qos, - const ::DDS::DeadlineQosPolicy & qos); -}; - -#endif /* DEADLINE_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp deleted file mode 100644 index 6a35c8dd228..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#include "dest_order_qos_test.h" - -DestinationOrderPolicyTest::DestinationOrderPolicyTest () -{ -} - -bool -DestinationOrderPolicyTest::check (const ::DDS_DestinationOrderQosPolicy & dds_qos, - const ::DDS::DestinationOrderQosPolicy & qos) -{ - return dds_qos.kind == static_cast <DDS_DestinationOrderQosPolicyKind> (qos.kind); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h deleted file mode 100644 index 58887bc0311..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef DEST_ORDER_QOS_TEST_H_ -#define DEST_ORDER_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h" - -class DestinationOrderPolicyTest -{ -public: - DestinationOrderPolicyTest (); - - static bool check (const ::DDS_DestinationOrderQosPolicy & dds_qos, - const ::DDS::DestinationOrderQosPolicy & qos); -}; - -#endif /* DEST_ORDER_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp deleted file mode 100644 index 2152a2a4dfa..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp +++ /dev/null @@ -1,9 +0,0 @@ -// $Id$ - -#include "dp_factory_qos_test.h" - -#include "entity_factory_qos_test.h" - -DomainParticipantFactoryPolicyTest::DomainParticipantFactoryPolicyTest () -{ -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h deleted file mode 100644 index 84a3582c7fa..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h +++ /dev/null @@ -1,17 +0,0 @@ -//$Id$ - -#ifndef DP_FACTORY_QOS_TEST_H_ -#define DP_FACTORY_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h" - -class DomainParticipantFactoryPolicyTest -{ -public: - DomainParticipantFactoryPolicyTest (); - -}; - -#endif /* DP_FACTORY_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp deleted file mode 100644 index 9418d83ceb1..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// $Id$ - -#include "dp_qos_test.h" - -#include "entity_factory_qos_test.h" -#include "user_data_qos_test.h" - -DomainParticipantPolicyTest::DomainParticipantPolicyTest () -{ -} - -int -DomainParticipantPolicyTest::run () -{ - int ret = 0; - try - { - ::DDS::DomainParticipantQos policy; - DDS_DomainParticipantQos dds_policy_org, dds_policy; - - dds_policy_org = DDS_PARTICIPANT_QOS_DEFAULT; - - policy <<= dds_policy_org; - dds_policy <<= policy; - - if (!EntityFactoryPolicyTest::check (dds_policy.entity_factory, policy.entity_factory)) - { - ACE_ERROR ((LM_ERROR, "ERROR DOMAIN PARTICIPANT : " - "Error in EntityFactoryQosPolicy.\n")); - ++ret; - } - - if (!UserDataPolicyTest::check (dds_policy.user_data, policy.user_data)) - { - ACE_ERROR ((LM_ERROR, "ERROR DOMAIN PARTICIPANT : " - "Error in UserDataQosPolicy.\n")); - ++ret; - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR DOMAIN PARTICIPANT: Unexpected exception caught.")); - return -1; - } - return ret; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h deleted file mode 100644 index 9694f56b2b7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h +++ /dev/null @@ -1,18 +0,0 @@ -//$Id$ - -#ifndef DOMAINPARTICIPANT_QOS_TEST_H_ -#define DOMAINPARTICIPANT_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/DomainParticipantQos.h" - -class DomainParticipantPolicyTest -{ -public: - DomainParticipantPolicyTest (); - - int run (); -}; - -#endif /* DOMAINPARTICIPANT_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp deleted file mode 100644 index dab0f245666..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp +++ /dev/null @@ -1,137 +0,0 @@ -// $Id$ - -#include "dr_qos_test.h" - -#include "dur_qos_test.h" -#include "deadline_qos_test.h" -#include "lat_budget_qos_test.h" -#include "liveliness_qos_test.h" -#include "reliability_qos_test.h" -#include "dest_order_qos_test.h" -#include "hist_qos_test.h" -#include "resource_limits_qos_test.h" -#include "user_data_qos_test.h" -#include "ownership_qos_test.h" -#include "tbf_qos_test.h" -#include "rd_lifecycle_qos_test.h" - -DatareaderPolicyTest::DatareaderPolicyTest () -{ -} - -int -DatareaderPolicyTest::run () -{ - int ret = 0; - try - { - ::DDS::DataReaderQos policy; - DDS_DataReaderQos dds_policy_org, dds_policy; - - dds_policy_org = DDS_DATAREADER_QOS_DEFAULT; - - policy <<= dds_policy_org; - dds_policy <<= policy; - - if (!DurabilityPolicyTest::check (dds_policy.durability, - policy.durability)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in DurabilityQosPolicy.\n")); - ++ret; - } - - if (!DeadlinePolicyTest::check (dds_policy.deadline, - policy.deadline)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in DeadlineQosPolicy.\n")); - ++ret; - } - - if (!LatencyBudgetPolicyTest::check (dds_policy.latency_budget, - policy.latency_budget)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in LatencyBudgetQosPolicy.\n")); - ++ret; - } - - if (!LivelinessPolicyTest::check (dds_policy.liveliness, - policy.liveliness)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in LivelinessQosPolicy.\n")); - ++ret; - } - - if (!ReliabilityPolicyTest::check (dds_policy.reliability, - policy.reliability)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in ReliabilityQosPolicy.\n")); - ++ret; - } - - if (!DestinationOrderPolicyTest::check (dds_policy.destination_order, - policy.destination_order)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in DestinationOrderQosPolicy.\n")); - ++ret; - } - - if (!HistoryPolicyTest::check (dds_policy.history, - policy.history)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in HistoryQosPolicy.\n")); - ++ret; - } - - if (!ResourceLimitsPolicyTest::check (dds_policy.resource_limits, - policy.resource_limits)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in ResourceLimitsQosPolicy.\n")); - ++ret; - } - - if (!UserDataPolicyTest::check (dds_policy.user_data, policy.user_data)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in UserDataQosPolicy.\n")); - ++ret; - } - - if (!OwnershipPolicyTest::check (dds_policy.ownership, - policy.ownership)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in OwnershipQosPolicy.\n")); - ++ret; - } - - if (!TimeBasedFilterPolicyTest::check (dds_policy.time_based_filter, - policy.time_based_filter)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in TimeBasedFilterQosPolicy.\n")); - ++ret; - } - - if (!ReaderDataLifecyclePolicyTest::check (dds_policy.reader_data_lifecycle, - policy.reader_data_lifecycle)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER : " - "Error in ReaderDataLifecycleQosPolicy.\n")); - ++ret; - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAREADER: Unexpected exception caught.")); - return -1; - } - return ret; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h deleted file mode 100644 index ab276d80429..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h +++ /dev/null @@ -1,18 +0,0 @@ -// $Id$ - -#ifndef DATAREADER_QOS_TEST_H_ -#define DATAREADER_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/DataReaderQos.h" - -class DatareaderPolicyTest -{ -public: - DatareaderPolicyTest (); - - int run (); -}; - -#endif /* DATAREADER_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp deleted file mode 100644 index 3a85ace802b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// $Id$ - -#include "dur_qos_test.h" - -DurabilityPolicyTest::DurabilityPolicyTest () -{ -} - - -bool -DurabilityPolicyTest::check (const ::DDS_DurabilityQosPolicy & dds_qos, - const ::DDS::DurabilityQosPolicy & qos) -{ - return dds_qos.kind == static_cast <DDS_DurabilityQosPolicyKind> (qos.kind); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h deleted file mode 100644 index e2ec969df10..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef DURABILITY_QOS_TEST_H_ -#define DURABILITY_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h" - -class DurabilityPolicyTest -{ -public: - DurabilityPolicyTest (); - - static bool check (const ::DDS_DurabilityQosPolicy & dds_qos, - const ::DDS::DurabilityQosPolicy & qos); -}; - -#endif /* DURABILITY_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp deleted file mode 100644 index eabe851a291..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#include "dur_service_qos_test.h" - -DurabilityServicePolicyTest::DurabilityServicePolicyTest () -{ -} - -bool -DurabilityServicePolicyTest::check (const ::DDS_DurabilityServiceQosPolicy & dds_qos, - const ::DDS::DurabilityServiceQosPolicy & qos) -{ - return dds_qos.service_cleanup_delay.sec == qos.service_cleanup_delay.sec && - dds_qos.history_kind == static_cast <DDS_HistoryQosPolicyKind> (qos.history_kind) && - dds_qos.history_depth == qos.history_depth && - dds_qos.max_samples == qos.max_samples && - dds_qos.max_instances == qos.max_instances && - dds_qos.max_samples_per_instance == qos.max_samples_per_instance; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h deleted file mode 100644 index 4b212a2745a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef DURABILITY_SERVICE_QOS_TEST_H_ -#define DURABILITY_SERVICE_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h" - -class DurabilityServicePolicyTest -{ -public: - DurabilityServicePolicyTest (); - - static bool check (const ::DDS_DurabilityServiceQosPolicy & dds_qos, - const ::DDS::DurabilityServiceQosPolicy & qos); -}; - -#endif /* DURABILITY_SERVICE_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp b/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp deleted file mode 100644 index 83d0483c909..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/duration.cpp +++ /dev/null @@ -1,16 +0,0 @@ -//$Id$ - -#include "duration.h" - -Duration::Duration () -{ -} - - -bool -Duration::check (const ::DDS_Duration_t & dds_dur, - const ::DDS::Duration_t & dur) -{ - return dds_dur.sec == dur.sec && - dds_dur.nanosec == dur.nanosec; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/duration.h b/CIAO/connectors/dds4ccm/tests/Policies/duration.h deleted file mode 100644 index dae8057bfb4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/duration.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef DURATION_H_ -#define DURATION_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/Duration_t.h" - -class Duration -{ -public: - Duration (); - - static bool check (const ::DDS_Duration_t & dds_dur, - const ::DDS::Duration_t & dur); -}; - -#endif /* DURATION_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp deleted file mode 100644 index 6e4278e1b04..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp +++ /dev/null @@ -1,164 +0,0 @@ -// $Id$ - -#include "dw_qos_test.h" - -#include "dur_qos_test.h" -#include "dur_service_qos_test.h" -#include "deadline_qos_test.h" -#include "lat_budget_qos_test.h" -#include "liveliness_qos_test.h" -#include "reliability_qos_test.h" -#include "dest_order_qos_test.h" -#include "hist_qos_test.h" -#include "resource_limits_qos_test.h" -#include "transport_prio_qos_test.h" -#include "lifespan_qos_test.h" -#include "user_data_qos_test.h" -#include "ownership_qos_test.h" -#include "ownership_strength_qos_test.h" -#include "wr_lifecycle_qos_test.h" - -DatawriterPolicyTest::DatawriterPolicyTest () -{ -} - -int -DatawriterPolicyTest::run () -{ - int ret = 0; - try - { - ::DDS::DataWriterQos policy; - DDS_DataWriterQos dds_policy_org, dds_policy; - - dds_policy_org = DDS_DATAWRITER_QOS_DEFAULT; - - policy <<= dds_policy_org; - dds_policy <<= policy; - - if (!DurabilityPolicyTest::check (dds_policy.durability, - policy.durability)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in DurabilityQosPolicy.\n")); - ++ret; - } - - if (!DurabilityServicePolicyTest::check (dds_policy.durability_service, - policy.durability_service)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in DurabilityServiceQosPolicy.\n")); - ++ret; - } - - if (!DeadlinePolicyTest::check (dds_policy.deadline, - policy.deadline)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in DeadlineQosPolicy.\n")); - ++ret; - } - - if (!LatencyBudgetPolicyTest::check (dds_policy.latency_budget, - policy.latency_budget)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in LatencyBudgetQosPolicy.\n")); - ++ret; - } - - if (!LivelinessPolicyTest::check (dds_policy.liveliness, - policy.liveliness)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in LivelinessQosPolicy.\n")); - ++ret; - } - - if (!ReliabilityPolicyTest::check (dds_policy.reliability, - policy.reliability)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in ReliabilityQosPolicy.\n")); - ++ret; - } - - if (!DestinationOrderPolicyTest::check (dds_policy.destination_order, - policy.destination_order)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in DestinationOrderQosPolicy.\n")); - ++ret; - } - - if (!HistoryPolicyTest::check (dds_policy.history, - policy.history)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in HistoryQosPolicy.\n")); - ++ret; - } - - if (!ResourceLimitsPolicyTest::check (dds_policy.resource_limits, - policy.resource_limits)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in ResourceLimitsQosPolicy.\n")); - ++ret; - } - - if (!TransportPriorityPolicyTest::check (dds_policy.transport_priority, - policy.transport_priority)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in TransportPriorityQosPolicy.\n")); - ++ret; - } - - if (!LifespanPolicyTest::check (dds_policy.lifespan, - policy.lifespan)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in LifespanQosPolicy.\n")); - ++ret; - } - - if (!UserDataPolicyTest::check (dds_policy.user_data, policy.user_data)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in UserDataQosPolicy.\n")); - ++ret; - } - - if (!OwnershipPolicyTest::check (dds_policy.ownership, - policy.ownership)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in OwnershipQosPolicy.\n")); - ++ret; - } - - if (!OwnershipStrengthPolicyTest::check (dds_policy.ownership_strength, - policy.ownership_strength)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in OwnershipStrengthQosPolicy.\n")); - ++ret; - } - - if (!WriterDataLifecyclePolicyTest::check (dds_policy.writer_data_lifecycle, - policy.writer_data_lifecycle)) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER : " - "Error in WriterDataLifecycleQosPolicy.\n")); - ++ret; - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR DATAWRITER: Unexpected exception caught.")); - return -1; - } - return ret; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h deleted file mode 100644 index 23bf760321b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h +++ /dev/null @@ -1,18 +0,0 @@ -// $Id$ - -#ifndef DATAWRITER_QOS_TEST_H_ -#define DATAWRITER_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/DataWriterQos.h" - -class DatawriterPolicyTest -{ -public: - DatawriterPolicyTest (); - - int run (); -}; - -#endif /* DATAWRITER_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp deleted file mode 100644 index 4bc00e2434f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// $Id$ - -#include "entity_factory_qos_test.h" - -EntityFactoryPolicyTest::EntityFactoryPolicyTest () -{ -} - -bool -EntityFactoryPolicyTest::check (const ::DDS_EntityFactoryQosPolicy & dds_qos, - const ::DDS::EntityFactoryQosPolicy & qos) -{ - return dds_qos.autoenable_created_entities == - static_cast <DDS_Boolean> (qos.autoenable_created_entities); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h deleted file mode 100644 index ef53fb43aea..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#ifndef ENTITY_FACTORY_QOS_TEST_H_ -#define ENTITY_FACTORY_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h" - -class EntityFactoryPolicyTest -{ -public: - EntityFactoryPolicyTest (); - - static bool check (const ::DDS_EntityFactoryQosPolicy & dds_qos, - const ::DDS::EntityFactoryQosPolicy & qos); -}; - -#endif /* ENTITY_FACTORY_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp deleted file mode 100644 index e1100e04cc2..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// $Id$ - -#include "group_data_qos_test.h" - -#include "octet_seq.h" - -GroupDataPolicyTest::GroupDataPolicyTest () -{ -} - -bool -GroupDataPolicyTest::check (const ::DDS_GroupDataQosPolicy & dds_qos, - const ::DDS::GroupDataQosPolicy & qos) -{ - return OctetSequence::check (dds_qos.value, - qos.value, - "GroupDataPolicyTest"); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h deleted file mode 100644 index ba5347e505e..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#ifndef GROUP_DATA_QOS_TEST_H_ -#define GROUP_DATA_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h" - -class GroupDataPolicyTest -{ -public: - GroupDataPolicyTest (); - - static bool check (const ::DDS_GroupDataQosPolicy & dds_qos, - const ::DDS::GroupDataQosPolicy & qos); -}; - -#endif /* GROUP_DATA_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp deleted file mode 100644 index e65aa5ff338..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "hist_qos_test.h" - -HistoryPolicyTest::HistoryPolicyTest () -{ -} - -bool -HistoryPolicyTest::check (const ::DDS_HistoryQosPolicy & dds_qos, - const ::DDS::HistoryQosPolicy & qos) -{ - - return dds_qos.kind == static_cast <DDS_HistoryQosPolicyKind> (qos.kind) && - dds_qos.depth == qos.depth; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h deleted file mode 100644 index 0290a8bd519..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef HISTORY_QOS_TEST_H_ -#define HISTORY_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/HistoryQosPolicy.h" - -class HistoryPolicyTest -{ -public: - HistoryPolicyTest (); - - static bool check (const ::DDS_HistoryQosPolicy & dds_qos, - const ::DDS::HistoryQosPolicy & qos); -}; - -#endif /* HISTORY_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp deleted file mode 100644 index 5a530caa2cc..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "lat_budget_qos_test.h" - -#include "duration.h" - -LatencyBudgetPolicyTest::LatencyBudgetPolicyTest () -{ -} - -bool -LatencyBudgetPolicyTest::check (const ::DDS_LatencyBudgetQosPolicy & dds_qos, - const ::DDS::LatencyBudgetQosPolicy & qos) -{ - return Duration::check (dds_qos.duration, qos.duration); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h deleted file mode 100644 index be70a034310..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef LATENCY_BUDGET_QOS_TEST_H_ -#define LATENCY_BUDGET_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h" - -class LatencyBudgetPolicyTest -{ -public: - LatencyBudgetPolicyTest (); - - static bool check (const ::DDS_LatencyBudgetQosPolicy & dds_qos, - const ::DDS::LatencyBudgetQosPolicy & qos); -}; - -#endif /* LATENCY_BUDGET_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp deleted file mode 100644 index ee02d9aa09c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// $Id$ - -#include "lifespan_qos_test.h" - -#include "duration.h" - -LifespanPolicyTest::LifespanPolicyTest () -{ -} - -bool -LifespanPolicyTest::check (const ::DDS_LifespanQosPolicy & dds_qos, - const ::DDS::LifespanQosPolicy & qos) -{ - return Duration::check (dds_qos.duration, qos.duration); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h deleted file mode 100644 index 482a2927450..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef LIFESPAN_QOS_TEST_H_ -#define LIFESPAN_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/LifespanQosPolicy.h" - -class LifespanPolicyTest -{ -public: - LifespanPolicyTest (); - - static bool check (const ::DDS_LifespanQosPolicy & dds_qos, - const ::DDS::LifespanQosPolicy & qos); -}; - -#endif /* LIFESPAN_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp deleted file mode 100644 index b9f364a703f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// $Id$ - -#include "liveliness_qos_test.h" - -#include "duration.h" - -LivelinessPolicyTest::LivelinessPolicyTest () -{ -} - -bool -LivelinessPolicyTest::check (const ::DDS_LivelinessQosPolicy & dds_qos, - const ::DDS::LivelinessQosPolicy & qos) -{ - return dds_qos.kind == static_cast <DDS_LivelinessQosPolicyKind> (qos.kind) && - Duration::check (dds_qos.lease_duration, qos.lease_duration); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h deleted file mode 100644 index a1d9208879c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef LIVELINESS_QOS_TEST_H_ -#define LIVELINESS_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h" - -class LivelinessPolicyTest -{ -public: - LivelinessPolicyTest (); - - static bool check (const ::DDS_LivelinessQosPolicy & dds_qos, - const ::DDS::LivelinessQosPolicy & qos); -}; - -#endif /* LIVELINESS_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/main.cpp b/CIAO/connectors/dds4ccm/tests/Policies/main.cpp deleted file mode 100644 index 985081f29ae..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/main.cpp +++ /dev/null @@ -1,73 +0,0 @@ -// $Id$ - -#include "ace/OS_main.h" -#include "ace/Log_Msg.h" - -#include "pub_qos_test.h" -#include "sub_qos_test.h" -#include "dw_qos_test.h" -#include "dr_qos_test.h" -#include "tp_qos_test.h" -#include "dp_qos_test.h" - -int handle_result (const int & result, - const char * test) -{ - int ret = 0; - if (result == -1) - { - ACE_ERROR ((LM_ERROR, "ERROR POLICIES : " - "Exception caught while testing " - "%C QoS\n", - test)); - } - else if (result > 0) - { - ret = result; - ACE_ERROR ((LM_ERROR, "ERROR POLICIES : " - "<%d> errors found while testing " - "%C QoS\n", - result, test)); - } - else - { - ACE_DEBUG ((LM_DEBUG, "%C QoS test passed!\n", - test)); - } - return ret; -} - -int -ACE_TMAIN (int , ACE_TCHAR **) -{ - PublisherPolicyTest publisher; - SubscriberPolicyTest subscriber; - DatawriterPolicyTest datawriter; - DatareaderPolicyTest datareader; - TopicPolicyTest topic; - DomainParticipantPolicyTest domainparticipant; - - int ret = 0; - int test = 0; - try - { - test = publisher.run (); - ret += handle_result (test, "Publisher"); - test = subscriber.run (); - ret += handle_result (test, "Subscriber"); - test = datawriter.run (); - ret += handle_result (test, "Datawriter"); - test = datareader.run (); - ret += handle_result (test, "DataReader"); - test = topic.run (); - ret += handle_result (test, "Topic"); - test = domainparticipant.run (); - ret += handle_result (test, "DomainParticipant"); - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR: Unexpected exception caught.")); - return -1; - } - return 0; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp deleted file mode 100644 index 9912b6f1eee..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp +++ /dev/null @@ -1,34 +0,0 @@ -//$Id$ - -#include "octet_seq.h" - -OctetSequence::OctetSequence () -{ -} - -bool -OctetSequence::check (const ::DDS_OctetSeq & dds_seq, - const ::DDS::OctetSeq & seq, - const char * test) -{ - if (static_cast < ::CORBA::ULong> (dds_seq.length ()) != - seq.length ()) - { - ACE_ERROR ((LM_ERROR, "ERROR %C : " - "Length group_data is not equal to original length.\n", - test)); - return false; - } - - for (::DDS_Long i = 0; i < dds_seq.length (); ++i) - { - if (seq[i] != dds_seq[i]) - { - ACE_ERROR ((LM_ERROR, "ERROR %C : " - "Item %d of group_data is not equal to original.\n", - test, i)); - return false; - } - } - return true; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h b/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h deleted file mode 100644 index 62401a7630d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h +++ /dev/null @@ -1,20 +0,0 @@ -//$Id$ - -#ifndef OCTET_SEQ_H_ -#define OCTET_SEQ_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/OctetSeq.h" - -class OctetSequence -{ -public: - OctetSequence (); - - static bool check (const ::DDS_OctetSeq & dds_seq, - const ::DDS::OctetSeq & seq, - const char * test); -}; - -#endif /* OCTET_SEQ_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp deleted file mode 100644 index b439bfe1b74..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// $Id$ - -#include "ownership_qos_test.h" - -OwnershipPolicyTest::OwnershipPolicyTest () -{ -} - -bool -OwnershipPolicyTest::check (const ::DDS_OwnershipQosPolicy & dds_qos, - const ::DDS::OwnershipQosPolicy & qos) -{ - return dds_qos.kind == - static_cast <DDS_OwnershipQosPolicyKind> (qos.kind); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h deleted file mode 100644 index 1307c7f6037..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef OWNERSHIP_QOS_TEST_H_ -#define OWNERSHIP_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h" - -class OwnershipPolicyTest -{ -public: - OwnershipPolicyTest (); - - static bool check (const ::DDS_OwnershipQosPolicy & dds_qos, - const ::DDS::OwnershipQosPolicy & qos); -}; - -#endif /* OWNERSHIP_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp deleted file mode 100644 index d65bd7f725a..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#include "ownership_strength_qos_test.h" - -OwnershipStrengthPolicyTest::OwnershipStrengthPolicyTest () -{ -} - -bool -OwnershipStrengthPolicyTest::check (const ::DDS_OwnershipStrengthQosPolicy & dds_qos, - const ::DDS::OwnershipStrengthQosPolicy & qos) -{ - return dds_qos.value == qos.value; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h deleted file mode 100644 index 36e3169b594..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef OWNERSHIP_STRENGTH_QOS_TEST_H_ -#define OWNERSHIP_STRENGTH_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h" - -class OwnershipStrengthPolicyTest -{ -public: - OwnershipStrengthPolicyTest (); - - static bool check (const ::DDS_OwnershipStrengthQosPolicy & dds_qos, - const ::DDS::OwnershipStrengthQosPolicy & qos); -}; - -#endif /* OWNERSHIP_STRENGTH_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp deleted file mode 100644 index f0f56774186..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// $Id$ - -#include "partition_qos_test.h" - -PartitionPolicyTest::PartitionPolicyTest () -{ -} - -bool -PartitionPolicyTest::check (const ::DDS_PartitionQosPolicy & dds_qos, - const ::DDS::PartitionQosPolicy & qos) -{ - if (static_cast <CORBA::ULong> (dds_qos.name.length ()) != - qos.name.length ()) - { - ACE_ERROR ((LM_ERROR, "ERROR PartitionPolicyTest : " - "Length name sequence is not equal " - "to original length.\n")); - return false; - } - for (DDS_Long i = 0; i < dds_qos.name.length (); ++i) - { - if (ACE_OS::strcmp (dds_qos.name[i], qos.name[i]) != 0) - { - ACE_ERROR ((LM_ERROR, "ERROR PartitionPolicyTest : " - "Item %d of name sequence is not equal " - "to original.\n", - i)); - return false; - } - } - return true; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h deleted file mode 100644 index 6fef89f535d..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef PARTITION_QOS_TEST_H_ -#define PARTITION_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/PartitionQosPolicy.h" - -class PartitionPolicyTest -{ -public: - PartitionPolicyTest (); - - static bool check (const ::DDS_PartitionQosPolicy & dds_qos, - const ::DDS::PartitionQosPolicy & qos); -}; - -#endif /* PARTITION_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc b/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc deleted file mode 100644 index f4d90c8ce0b..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/policies.mpc +++ /dev/null @@ -1,44 +0,0 @@ -// $Id$ - -project(DDS_Policies_Test) : taoexe, dds4ccm_base { - includes += $(CIAO_ROOT) - exename = policies_test - Source_Files { - deadline_qos_test.cpp - dest_order_qos_test.cpp - dp_factory_qos_test.cpp - dp_qos_test.cpp - dr_qos_test.cpp - dur_qos_test.cpp - dur_service_qos_test.cpp - dw_qos_test.cpp - entity_factory_qos_test.cpp - group_data_qos_test.cpp - hist_qos_test.cpp - lat_budget_qos_test.cpp - lifespan_qos_test.cpp - liveliness_qos_test.cpp - main.cpp - ownership_qos_test.cpp - partition_qos_test.cpp - presentation_qos_test.cpp - pub_qos_test.cpp - reliability_qos_test.cpp - resource_limits_qos_test.cpp - sub_qos_test.cpp - tp_data_qos_test.cpp - tp_qos_test.cpp - transport_prio_qos_test.cpp - user_data_qos_test.cpp - rd_lifecycle_qos_test.cpp - tbf_qos_test.cpp - ownership_strength_qos_test.cpp - wr_lifecycle_qos_test.cpp - duration.cpp - octet_seq.cpp - } - - Header_Files { - *.h - } -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp deleted file mode 100644 index 540bf6e1315..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#include "presentation_qos_test.h" - -PresentationPolicyTest::PresentationPolicyTest () -{ -} - -bool -PresentationPolicyTest::check (const ::DDS_PresentationQosPolicy & dds_qos, - const ::DDS::PresentationQosPolicy & qos) -{ - return dds_qos.access_scope == - static_cast <DDS_PresentationQosPolicyAccessScopeKind>(qos.access_scope) && - dds_qos.coherent_access == - static_cast <DDS_Boolean> (qos.coherent_access) && - dds_qos.ordered_access == - static_cast <DDS_Boolean> (qos.ordered_access); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h deleted file mode 100644 index 4359e25632c..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef PRESENTATION_QOS_TEST_H_ -#define PRESENTATION_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/PresentationQosPolicy.h" - -class PresentationPolicyTest -{ -public: - PresentationPolicyTest (); - - static bool check (const ::DDS_PresentationQosPolicy & dds_qos, - const ::DDS::PresentationQosPolicy & qos); -}; - -#endif /* PRESENTATION_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp deleted file mode 100644 index 7a3c0cb7737..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// $Id$ - -#include "pub_qos_test.h" -#include "group_data_qos_test.h" -#include "entity_factory_qos_test.h" -#include "presentation_qos_test.h" -#include "partition_qos_test.h" - -PublisherPolicyTest::PublisherPolicyTest () -{ -} - -int -PublisherPolicyTest::run () -{ - int ret = 0; - try - { - ::DDS::PublisherQos policy; - DDS_PublisherQos dds_policy_org, dds_policy; - - dds_policy_org = DDS_PUBLISHER_QOS_DEFAULT; - - policy <<= dds_policy_org; - dds_policy <<= policy; - - if (!PresentationPolicyTest::check (dds_policy.presentation, policy.presentation)) - { - ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : " - "Error in PresentationQosPolicy.\n")); - ++ret; - } - if (!PartitionPolicyTest::check (dds_policy.partition, policy.partition)) - { - ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : " - "Error in PartitionQosPolicy.\n")); - ++ret; - } - if (!GroupDataPolicyTest::check (dds_policy.group_data, policy.group_data)) - { - ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : " - "Error in GroupDataQosPolicy.\n")); - ++ret; - } - if (!EntityFactoryPolicyTest::check (dds_policy.entity_factory, policy.entity_factory)) - { - ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER : " - "Error in EntityFactoryQosPolicy.\n")); - ++ret; - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR PUBLISHER: Unexpected exception caught.")); - return -1; - } - return ret; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h deleted file mode 100644 index c2d022aff88..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h +++ /dev/null @@ -1,18 +0,0 @@ -// $Id$ - -#ifndef PUBLISHER_QOS_TEST_H_ -#define PUBLISHER_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/PublisherQos.h" - -class PublisherPolicyTest -{ -public: - PublisherPolicyTest (); - - int run (); -}; - -#endif /* PUBLISHER_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp deleted file mode 100644 index 11574a4abfe..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#include "rd_lifecycle_qos_test.h" - -#include "duration.h" - -ReaderDataLifecyclePolicyTest::ReaderDataLifecyclePolicyTest () -{ -} - -bool -ReaderDataLifecyclePolicyTest::check (const ::DDS_ReaderDataLifecycleQosPolicy & dds_qos, - const ::DDS::ReaderDataLifecycleQosPolicy & qos) -{ - return Duration::check (dds_qos.autopurge_nowriter_samples_delay, - qos.autopurge_nowriter_samples_delay) && - Duration::check (dds_qos.autopurge_disposed_samples_delay, - qos.autopurge_disposed_samples_delay); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h deleted file mode 100644 index 314704e1e96..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef READER_DATA_LIFECYCLE_QOS_TEST_H_ -#define READER_DATA_LIFECYCLE_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h" - -class ReaderDataLifecyclePolicyTest -{ -public: - ReaderDataLifecyclePolicyTest (); - - static bool check (const ::DDS_ReaderDataLifecycleQosPolicy & dds_qos, - const ::DDS::ReaderDataLifecycleQosPolicy & qos); -}; - -#endif /* READER_DATA_LIFECYCLE_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp deleted file mode 100644 index e4e405fdfc0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// $Id$ - -#include "reliability_qos_test.h" - -#include "duration.h" - -ReliabilityPolicyTest::ReliabilityPolicyTest () -{ -} - -bool -ReliabilityPolicyTest::check (const ::DDS_ReliabilityQosPolicy & dds_qos, - const ::DDS::ReliabilityQosPolicy & qos) -{ - return dds_qos.kind == static_cast <DDS_ReliabilityQosPolicyKind> (qos.kind) && - Duration::check (dds_qos.max_blocking_time, qos.max_blocking_time); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h deleted file mode 100644 index d325f489c90..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef RELIABILITY_QOS_TEST_H_ -#define RELIABILITY_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h" - -class ReliabilityPolicyTest -{ -public: - ReliabilityPolicyTest (); - - static bool check (const ::DDS_ReliabilityQosPolicy & dds_qos, - const ::DDS::ReliabilityQosPolicy & qos); -}; - -#endif /* RELIABILITY_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp deleted file mode 100644 index 46a1adc0327..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// $Id$ - -#include "resource_limits_qos_test.h" - -ResourceLimitsPolicyTest::ResourceLimitsPolicyTest () -{ -} - - -bool -ResourceLimitsPolicyTest::check (const ::DDS_ResourceLimitsQosPolicy & dds_qos, - const ::DDS::ResourceLimitsQosPolicy & qos) -{ - return dds_qos.max_samples == qos.max_samples && - dds_qos.max_instances == qos.max_instances && - dds_qos.max_samples_per_instance == qos.max_samples_per_instance; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h deleted file mode 100644 index a430ee30034..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef RESOURCE_LIMITS_QOS_TEST_H_ -#define RESOURCE_LIMITS_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h" - -class ResourceLimitsPolicyTest -{ -public: - ResourceLimitsPolicyTest (); - - static bool check (const ::DDS_ResourceLimitsQosPolicy & dds_qos, - const ::DDS::ResourceLimitsQosPolicy & qos); -}; - -#endif /* RESOURCE_LIMITS_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl b/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl deleted file mode 100755 index 87048af071f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl +++ /dev/null @@ -1,25 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::TestTarget; - -my $program = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; - -$PROG = $program->CreateProcess ("policies_test", ""); -$program_status = $PROG->Spawn (); - -if ($program_status != 0) { - print STDERR "ERROR: GroupDataPolicy returned $program_status\n"; - exit 1; -} - -sleep ($program->ProcessStartWaitInterval()); - -$program_status = $PROG->Kill (); - -exit 0; diff --git a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp deleted file mode 100644 index 15950dc88b4..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp +++ /dev/null @@ -1,59 +0,0 @@ -// $Id$ - -#include "sub_qos_test.h" - -#include "group_data_qos_test.h" -#include "entity_factory_qos_test.h" -#include "presentation_qos_test.h" -#include "partition_qos_test.h" - -SubscriberPolicyTest::SubscriberPolicyTest () -{ -} - -int -SubscriberPolicyTest::run () -{ - int ret = 0; - try - { - ::DDS::SubscriberQos policy; - DDS_SubscriberQos dds_policy_org, dds_policy; - - dds_policy_org = DDS_SUBSCRIBER_QOS_DEFAULT; - - policy <<= dds_policy_org; - dds_policy <<= policy; - - if (!PresentationPolicyTest::check (dds_policy.presentation, policy.presentation)) - { - ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : " - "Error in PresentationQosPolicy.\n")); - ++ret; - } - if (!PartitionPolicyTest::check (dds_policy.partition, policy.partition)) - { - ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : " - "Error in PartitionQosPolicy.\n")); - ++ret; - } - if (!GroupDataPolicyTest::check (dds_policy.group_data, policy.group_data)) - { - ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : " - "Error in GroupDataQosPolicy.\n")); - ++ret; - } - if (!EntityFactoryPolicyTest::check (dds_policy.entity_factory, policy.entity_factory)) - { - ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER : " - "Error in EntityFactoryQosPolicy.\n")); - ++ret; - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR SUBSCRIBER: Unexpected exception caught.")); - return -1; - } - return ret; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h deleted file mode 100644 index dc85ffdd582..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#ifndef SUBSCRIBER_QOS_TEST_H_ -#define SUBSCRIBER_QOS_TEST_H_ - - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/SubscriberQos.h" - -class SubscriberPolicyTest -{ -public: - SubscriberPolicyTest (); - - int run (); -}; - -#endif /* SUBSCRIBER_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp deleted file mode 100644 index c300174e7f7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// $Id$ - -#include "tbf_qos_test.h" -#include "duration.h" - -TimeBasedFilterPolicyTest::TimeBasedFilterPolicyTest () -{ -} - -bool -TimeBasedFilterPolicyTest::check (const ::DDS_TimeBasedFilterQosPolicy & dds_qos, - const ::DDS::TimeBasedFilterQosPolicy & qos) -{ - return Duration::check (dds_qos.minimum_separation, qos.minimum_separation); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h deleted file mode 100644 index f42d8aaf7e0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef TIME_BASED_FILTER_QOS_TEST_H_ -#define TIME_BASED_FILTER_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h" - -class TimeBasedFilterPolicyTest -{ -public: - TimeBasedFilterPolicyTest (); - - static bool check (const ::DDS_TimeBasedFilterQosPolicy & dds_qos, - const ::DDS::TimeBasedFilterQosPolicy & qos); -}; - -#endif /* TIME_BASED_FILTER_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp deleted file mode 100644 index c9377c996b7..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// $Id$ - -#include "tp_data_qos_test.h" - -#include "octet_seq.h" - -TopicDataPolicyTest::TopicDataPolicyTest () -{ -} - -bool -TopicDataPolicyTest::check (const ::DDS_TopicDataQosPolicy & dds_qos, - const ::DDS::TopicDataQosPolicy & qos) -{ - return OctetSequence::check (dds_qos.value, - qos.value, - "TopicDataPolicyTest"); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h deleted file mode 100644 index 2ccb36be118..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef TOPIC_DATA_QOS_TEST_H_ -#define TOPIC_DATA_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h" - -class TopicDataPolicyTest -{ -public: - TopicDataPolicyTest (); - - static bool check (const ::DDS_TopicDataQosPolicy & dds_qos, - const ::DDS::TopicDataQosPolicy & qos); -}; - -#endif /* TOPIC_DATA_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp deleted file mode 100644 index 65a338ae499..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp +++ /dev/null @@ -1,148 +0,0 @@ -// $Id$ - -#include "tp_qos_test.h" - -#include "tp_data_qos_test.h" -#include "dur_qos_test.h" -#include "dur_service_qos_test.h" -#include "deadline_qos_test.h" -#include "lat_budget_qos_test.h" -#include "liveliness_qos_test.h" -#include "reliability_qos_test.h" -#include "dest_order_qos_test.h" -#include "hist_qos_test.h" -#include "resource_limits_qos_test.h" -#include "transport_prio_qos_test.h" -#include "lifespan_qos_test.h" -#include "ownership_qos_test.h" - -TopicPolicyTest::TopicPolicyTest () -{ -} - -int -TopicPolicyTest::run () -{ - int ret = 0; - try - { - ::DDS::TopicQos policy; - DDS_TopicQos dds_policy_org, dds_policy; - - dds_policy_org = DDS_TOPIC_QOS_DEFAULT; - - policy <<= dds_policy_org; - dds_policy <<= policy; - - - if (!TopicDataPolicyTest::check (dds_policy.topic_data, - policy.topic_data)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in TopicDataQosPolicy.\n")); - ++ret; - } - - if (!DurabilityPolicyTest::check (dds_policy.durability, - policy.durability)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in DurabilityQosPolicy.\n")); - ++ret; - } - - if (!DurabilityServicePolicyTest::check (dds_policy.durability_service, - policy.durability_service)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in DurabilityServiceQosPolicy.\n")); - ++ret; - } - - if (!DeadlinePolicyTest::check (dds_policy.deadline, - policy.deadline)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in DeadlineQosPolicy.\n")); - ++ret; - } - - if (!LatencyBudgetPolicyTest::check (dds_policy.latency_budget, - policy.latency_budget)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in LatencyBudgetQosPolicy.\n")); - ++ret; - } - - if (!LivelinessPolicyTest::check (dds_policy.liveliness, - policy.liveliness)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in LivelinessQosPolicy.\n")); - ++ret; - } - - if (!ReliabilityPolicyTest::check (dds_policy.reliability, - policy.reliability)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in ReliabilityQosPolicy.\n")); - ++ret; - } - - if (!DestinationOrderPolicyTest::check (dds_policy.destination_order, - policy.destination_order)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in DestinationOrderQosPolicy.\n")); - ++ret; - } - - if (!HistoryPolicyTest::check (dds_policy.history, - policy.history)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in HistoryQosPolicy.\n")); - ++ret; - } - - if (!ResourceLimitsPolicyTest::check (dds_policy.resource_limits, - policy.resource_limits)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in ResourceLimitsQosPolicy.\n")); - ++ret; - } - - if (!TransportPriorityPolicyTest::check (dds_policy.transport_priority, - policy.transport_priority)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in TransportPriorityQosPolicy.\n")); - ++ret; - } - - if (!LifespanPolicyTest::check (dds_policy.lifespan, - policy.lifespan)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in LifespanQosPolicy.\n")); - ++ret; - } - - if (!OwnershipPolicyTest::check (dds_policy.ownership, - policy.ownership)) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC : " - "Error in OwnershipQosPolicy.\n")); - ++ret; - } - } - catch (...) - { - ACE_ERROR ((LM_ERROR, "ERROR TOPIC: Unexpected exception caught.")); - return -1; - } - return ret; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h deleted file mode 100644 index 0508102b8e3..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h +++ /dev/null @@ -1,18 +0,0 @@ -// $Id$ - -#ifndef TOPIC_QOS_TEST_H_ -#define TOPIC_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/TopicQos.h" - -class TopicPolicyTest -{ -public: - TopicPolicyTest (); - - int run (); -}; - -#endif /* TOPIC_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp deleted file mode 100644 index d4aaa7d74ad..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#include "transport_prio_qos_test.h" - -TransportPriorityPolicyTest::TransportPriorityPolicyTest () -{ -} - -bool -TransportPriorityPolicyTest::check (const ::DDS_TransportPriorityQosPolicy & dds_qos, - const ::DDS::TransportPriorityQosPolicy & qos) -{ - return dds_qos.value == qos.value; -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h deleted file mode 100644 index 358dd62388f..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef TRANSPORT_PRIORITY_QOS_TEST_H_ -#define TRANSPORT_PRIORITY_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h" - -class TransportPriorityPolicyTest -{ -public: - TransportPriorityPolicyTest (); - - static bool check (const ::DDS_TransportPriorityQosPolicy & dds_qos, - const ::DDS::TransportPriorityQosPolicy & qos); -}; - -#endif /* TRANSPORT_PRIORITY_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp deleted file mode 100644 index 48ee76b0e20..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// $Id$ - -#include "user_data_qos_test.h" - -#include "octet_seq.h" - -UserDataPolicyTest::UserDataPolicyTest () -{ -} - -bool -UserDataPolicyTest::check (const ::DDS_UserDataQosPolicy & dds_qos, - const ::DDS::UserDataQosPolicy & qos) -{ - return OctetSequence::check (dds_qos.value, - qos.value, - "UserDataPolicyTest"); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h deleted file mode 100644 index c56c94f48f9..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef USER_DATA_QOS_TEST_H_ -#define USER_DATA_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/UserDataQosPolicy.h" - -class UserDataPolicyTest -{ -public: - UserDataPolicyTest (); - - static bool check (const ::DDS_UserDataQosPolicy & dds_qos, - const ::DDS::UserDataQosPolicy & qos); -}; - -#endif /* USER_DATA_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp deleted file mode 100644 index 6a8da1b9103..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// $Id$ - -#include "wr_lifecycle_qos_test.h" - -WriterDataLifecyclePolicyTest::WriterDataLifecyclePolicyTest () -{ -} - -bool -WriterDataLifecyclePolicyTest::check (const ::DDS_WriterDataLifecycleQosPolicy & dds_qos, - const ::DDS::WriterDataLifecycleQosPolicy & qos) -{ - return dds_qos.autodispose_unregistered_instances == - static_cast <DDS_Boolean> (qos.autodispose_unregistered_instances); -} diff --git a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h b/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h deleted file mode 100644 index ac8674525f0..00000000000 --- a/CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h +++ /dev/null @@ -1,19 +0,0 @@ -//$Id$ - -#ifndef WRITER_DATA_LIFECYCLE_QOS_TEST_H_ -#define WRITER_DATA_LIFECYCLE_QOS_TEST_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ndds/ndds_cpp.h" -#include "dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h" - -class WriterDataLifecyclePolicyTest -{ -public: - WriterDataLifecyclePolicyTest (); - - static bool check (const ::DDS_WriterDataLifecycleQosPolicy & dds_qos, - const ::DDS::WriterDataLifecycleQosPolicy & qos); -}; - -#endif /* WRITER_DATA_LIFECYCLE_QOS_TEST_H_ */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc index 080d970cb08..b0fe76f8e8f 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc @@ -5,12 +5,11 @@ project (QueryFilter_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_d dynamicflags += QUERY_FILTER_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=QUERY_FILTER_TEST_BASE_STUB_Export \ -Wb,stub_export_include=QueryFilter_Test_Base_stub_export.h IDL_Files { - idlflags += -Gxhst QueryFilter_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl index 708c17b2051..4d9ba95b5f7 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl @@ -223,10 +223,10 @@ sleep (30); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc index e8606e033d9..db8b2f2e8c5 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc @@ -5,12 +5,11 @@ project (DDS_Reader_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_de dynamicflags += READER_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=READER_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Reader_Test_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Reader_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl index 997852c0618..4d9ba95b5f7 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc index 87a021362d6..f05c18bdc40 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc @@ -5,12 +5,11 @@ project (DDS_SL_Disabled_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_de dynamicflags += SL_DISABLED_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=SL_DISABLED_BASE_STUB_Export \ -Wb,stub_export_include=SL_Disabled_Base_stub_export.h IDL_Files { - idlflags += -Gxhst SL_Disabled_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp index d8ae75b9b36..4c49156a772 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp @@ -8,8 +8,8 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_time.h" -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/TimeUtilities.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/TimeUtilities.h" namespace CIAO_SL_Disabled_Receiver_Impl { diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl index 66cc403a1fb..edfa27e2a1f 100755 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc index 0730e183bb9..d100439ea63 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc @@ -5,12 +5,11 @@ project (DDS_SL_ManyByMany_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_ dynamicflags += SL_MANYBYMANY_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=SL_MANYBYMANY_BASE_STUB_Export \ -Wb,stub_export_include=SL_ManyByMany_Base_stub_export.h IDL_Files { - idlflags += -Gxhst SL_ManyByMany_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp index 31921bf38ef..5c88a833d24 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp @@ -8,8 +8,8 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_time.h" -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/TimeUtilities.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/TimeUtilities.h" namespace CIAO_SL_ManyByMany_Receiver_Impl { diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl index 66cc403a1fb..edfa27e2a1f 100755 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc index 96f81db664a..a20b85c42e8 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc @@ -5,12 +5,11 @@ project (DDS_SL_OneByOne_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_de dynamicflags += SL_ONEBYONE_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=SL_ONEBYONE_BASE_STUB_Export \ -Wb,stub_export_include=SL_OneByOne_Base_stub_export.h IDL_Files { - idlflags += -Gxhst SL_OneByOne_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp index 5a0d47279f3..2d49c410d4c 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp @@ -8,8 +8,8 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_time.h" -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/TimeUtilities.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/TimeUtilities.h" namespace CIAO_SL_OneByOne_Receiver_Impl { diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl index 66cc403a1fb..edfa27e2a1f 100755 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc index 5d5a42ccba8..de8eca7dbb7 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc @@ -5,12 +5,11 @@ project (DDS_SCABase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { dynamicflags += SETCONNECTORATTRIBUTE_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_BASE_STUB_Export \ -Wb,stub_export_include=SetConnectorAttribute_Base_stub_export.h IDL_Files { - idlflags += -Gxhst SetConnectorAttribute_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl index b51ae16243d..e91dc5b9c10 100755 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp index 54bfd5c53cf..2ce802f3c73 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp @@ -6,7 +6,7 @@ #include "Base/BaseSupport.h" -#include "dds4ccm/impl/dds/DataWriter.h" +#include "dds4ccm/impl/ndds/DataWriter.h" namespace CIAO_SharedDP_SharedDPComponent_Impl { @@ -46,9 +46,9 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { DDS::DataWriter_var dw1 = this->context_->get_connection_write1_dds_entity (); - CIAO::DDS4CCM::CCM_DDS_DataWriter_i *ccm_dds_rd1 = + CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd1 = dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw1.in ()); - DDSDataWriter * dds_dw1 = ccm_dds_rd1->get_impl (); + DDSDataWriter * dds_dw1 = rti_rd1->get_impl (); DDSPublisher * dds_p1 = dds_dw1->get_publisher (); this->dds_dp1_ = dds_p1->get_participant (); } @@ -61,9 +61,9 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { DDS::DataWriter_var dw2 = this->context_->get_connection_write2_dds_entity (); - CIAO::DDS4CCM::CCM_DDS_DataWriter_i *ccm_dds_rd2 = + CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd2 = dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw2.in ()); - DDSDataWriter * dds_dw2 = ccm_dds_rd2->get_impl (); + DDSDataWriter * dds_dw2 = rti_rd2->get_impl (); DDSPublisher * dds_p2 = dds_dw2->get_publisher (); this->dds_dp2_ = dds_p2->get_participant (); } @@ -76,9 +76,9 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { DDS::DataWriter_var dw3 = this->context_->get_connection_write3_dds_entity (); - CIAO::DDS4CCM::CCM_DDS_DataWriter_i *ccm_dds_rd3 = + CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd3 = dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw3.in ()); - DDSDataWriter * dds_dw3 = ccm_dds_rd3->get_impl (); + DDSDataWriter * dds_dw3 = rti_rd3->get_impl (); DDSPublisher * dds_p3 = dds_dw3->get_publisher (); this->dds_dp3_ = dds_p3->get_participant (); } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl index 5a57844e894..34e80ff8c33 100755 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl @@ -223,10 +223,10 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp index 2882814085d..7431f179ebc 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp @@ -10,7 +10,7 @@ #include "Base/BaseSupport.h" -#include "dds4ccm/impl/dds/DataWriter.h" +#include "dds4ccm/impl/ndds/DataWriter.h" const char * tp_name_conn_1_ = "SharedDP"; const char * tp_name_conn_2_ = "SharedDP"; @@ -56,9 +56,9 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { DDS::DataWriter_var dw1 = this->context_->get_connection_write1_dds_entity (); - CIAO::DDS4CCM::CCM_DDS_DataWriter_i *ccm_dds_rd1 = + CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd1 = dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw1.in ()); - DDSDataWriter * dds_dw1 = ccm_dds_rd1->get_impl (); + DDSDataWriter * dds_dw1 = rti_rd1->get_impl (); DDSPublisher * dds_p1 = dds_dw1->get_publisher (); this->dds_dp1_ = dds_p1->get_participant (); this->dds_tp1_ = this->dds_dp1_->find_topic ( @@ -74,9 +74,9 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { DDS::DataWriter_var dw2 = this->context_->get_connection_write2_dds_entity (); - CIAO::DDS4CCM::CCM_DDS_DataWriter_i *ccm_dds_rd2 = + CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd2 = dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw2.in ()); - DDSDataWriter * dds_dw2 = ccm_dds_rd2->get_impl (); + DDSDataWriter * dds_dw2 = rti_rd2->get_impl (); DDSPublisher * dds_p2 = dds_dw2->get_publisher (); this->dds_dp2_ = dds_p2->get_participant (); this->dds_tp2_ = this->dds_dp2_->find_topic ( @@ -92,9 +92,9 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { DDS::DataWriter_var dw3 = this->context_->get_connection_write3_dds_entity (); - CIAO::DDS4CCM::CCM_DDS_DataWriter_i *ccm_dds_rd3 = + CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd3 = dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw3.in ()); - DDSDataWriter * dds_dw3 = ccm_dds_rd3->get_impl (); + DDSDataWriter * dds_dw3 = rti_rd3->get_impl (); DDSPublisher * dds_p3 = dds_dw3->get_publisher (); this->dds_dp3_ = dds_p3->get_participant (); this->dds_tp3_ = this->dds_dp3_->find_topic ( @@ -110,9 +110,9 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { DDS::DataWriter_var dw4 = this->context_->get_connection_write4_dds_entity (); - CIAO::DDS4CCM::CCM_DDS_DataWriter_i *ccm_dds_rd4 = + CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd4 = dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw4.in ()); - DDSDataWriter * dds_dw4 = ccm_dds_rd4->get_impl (); + DDSDataWriter * dds_dw4 = rti_rd4->get_impl (); DDSPublisher * dds_p4 = dds_dw4->get_publisher (); this->dds_dp4_ = dds_p4->get_participant (); this->dds_tp4_ = this->dds_dp4_->find_topic ( diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl index c1a88c75f90..34e80ff8c33 100755 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc index a0c2462af7b..934f01f2a27 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc @@ -5,12 +5,11 @@ project (DDS_SCT_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { dynamicflags += STATE_CONNECTION_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=STATE_CONNECTION_TEST_BASE_STUB_Export \ -Wb,stub_export_include=State_Connection_Test_Base_stub_export.h IDL_Files { - idlflags += -Gxhst State_Connection_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl index 5d0ab35419d..a625ecd9216 100755 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl @@ -223,10 +223,10 @@ sleep (10); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp index 338ad6e0d52..4273125bbe3 100644 --- a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp +++ b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "dds4ccm/impl/dds/TimeUtilities.h" +#include "dds4ccm/impl/ndds/TimeUtilities.h" #include "ace/OS_NS_sys_time.h" int diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc index 2046f252b05..fbd6e94ac3d 100755 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc @@ -5,12 +5,11 @@ project (DDS_TwoTopics_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_defa dynamicflags += TWOTOPICS_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=TWOTOPICS_TEST_BASE_STUB_Export \ -Wb,stub_export_include=TwoTopics_Base_stub_export.h IDL_Files { - idlflags += -Gxhst TwoTopics_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc index 51a38f0973b..4430bee10b0 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc @@ -5,12 +5,11 @@ project (DDS_Unkeyed_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_d dynamicflags += UNKEYED_TEST_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=UNKEYED_TEST_BASE_STUB_Export \ -Wb,stub_export_include=Unkeyed_Test_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Unkeyed_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl index 3ca8a0ee149..4c584d6e11a 100755 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc index 014070bbbab..4379b403d1b 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc @@ -5,12 +5,11 @@ project (DDS_UnkeyedWriterBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_d dynamicflags += WRITER_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=WRITER_BASE_STUB_Export \ -Wb,stub_export_include=Writer_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Writer_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl index 58d28e2d477..5aa7222b7e4 100755 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc index 97490cd2c74..51b2decdfeb 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc @@ -5,12 +5,11 @@ project (DDS_Updater_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_defaul dynamicflags += UPDATER_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=UPDATER_BASE_STUB_Export \ -Wb,stub_export_include=Updater_Base_stub_export.h IDL_Files { - idlflags += -Gxhst Updater_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp index 88977e8c4ca..2ecc96a3d84 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp @@ -7,8 +7,8 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_time.h" -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/TimeUtilities.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/TimeUtilities.h" namespace CIAO_Updater_Receiver_Impl { diff --git a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl index 7a20e61732d..91f09e912e2 100755 --- a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl @@ -223,10 +223,10 @@ sleep (60); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; -print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -s\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl index 2963487e229..886f6a47324 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl @@ -10,7 +10,6 @@ #pragma ndds typesupport "Base/VTopic_BaseSupport.h" -// Plain topic struct TestTopic { string key; //@key long x; @@ -28,49 +27,38 @@ struct TopicArray { octet x_array[5]; }; -// Unions -union X_Union switch (short) { +//unions +/* union X_Union switch (short) { case 0: string x_test; case 1: long x_long; -}; + }; -struct TopicUnion { - string key; //@key - X_Union x_uni; + struct TopicUnion { + string key; //@key + X_Union x_uni; -}; + }; + + */ -// Sequence struct test { short x_test; string x_teststr; }; typedef sequence<test> test_seq; +// Sequence struct TopicSeq { string key; //@key test_seq x_seq; }; -// ValueType -valuetype X_Valuetype { - public string type; - public long x_long; -}; - -struct TopicValuetype { - string key; //@key - X_Valuetype x_vt; -}; - -// Sequences -typedef sequence<TestTopic> TestTopic_Seq; -typedef sequence<TopicString> TopicString_Seq; -typedef sequence<TopicArray> TopicArray_Seq; -typedef sequence<TopicUnion> TopicUnion_Seq; -typedef sequence<TopicSeq> TopicSeq_Seq; -typedef sequence<TopicValuetype> TopicValuetype_Seq; + typedef sequence<TestTopic> TestTopic_Seq; + typedef sequence<TopicString> TopicString_Seq; + typedef sequence<TopicArray> TopicArray_Seq; + // typedef sequence<TopicUnion> TopicUnion_Seq; + typedef sequence<TopicSeq> TopicSeq_Seq; #endif diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc index fada4388221..c6fc6f2306c 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc @@ -5,12 +5,11 @@ project (DDS_VTopic_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default dynamicflags += VTOPIC_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=VTOPIC_BASE_STUB_Export \ -Wb,stub_export_include=VTopic_Base_stub_export.h IDL_Files { - idlflags += -Gxhst VTopic_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp index 74a313b2b27..646bf68d6f7 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp @@ -8,7 +8,7 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_time.h" -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" namespace CIAO_VTopic_Receiver_Impl diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp index a77c14661df..ef62c87043c 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp @@ -7,7 +7,7 @@ #include "ace/Guard_T.h" #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" namespace CIAO_VTopic_Sender_Impl { diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl index d7266527ff7..6065a5cc28b 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl index fdb2c60d64b..89a8f92a67e 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl @@ -10,66 +10,56 @@ #pragma ndds typesupport "Base/VTopics_BaseSupport.h" -// Plain Topic -struct TestTopic { - string key; //@key - long x; -}; + struct TestTopic { + string key; //@key + long x; + }; + //string + struct TopicString { + string key; //@key + string x_str; + }; -// String -struct TopicString { - string key; //@key - string x_str; -}; + //arrays + struct TopicArray { + string key; //@key + octet x_array[5]; + }; -// Arrays -struct TopicArray { - string key; //@key - octet x_array[5]; -}; + //unions +/* union X_Union switch (short) { + case 0: + string x_test; + case 1: + long x_long; + }; -// Unions -union X_Union switch (short) { - case 0: - string x_test; - case 1: - long x_long; -}; + struct TopicUnion { + string key; //@key + X_Union x_uni; -struct TopicUnion { - string key; //@key - X_Union x_uni; -}; + }; -// Sequence -struct test { - short x_test; - string x_teststr; -}; -typedef sequence<test> test_seq; + */ -struct TopicSeq { - string key; //@key - test_seq x_seq; + struct test { + short x_test; + string x_teststr; }; + typedef sequence<test> test_seq; + + //sequence + struct TopicSeq { + string key; //@key + test_seq x_seq; + }; - // ValueType -valuetype X_Valuetype { - public string type; - public long x_long; -}; -struct TopicValuetype { - string key; //@key - X_Valuetype x_vt; -}; + typedef sequence<TestTopic> TestTopic_Seq; + typedef sequence<TopicString> TopicString_Seq; + typedef sequence<TopicArray> TopicArray_Seq; + // typedef sequence<TopicUnion> TopicUnion_Seq; + typedef sequence<TopicSeq> TopicSeq_Seq; -// Sequences -typedef sequence<TestTopic> TestTopic_Seq; -typedef sequence<TopicString> TopicString_Seq; -typedef sequence<TopicArray> TopicArray_Seq; -typedef sequence<TopicUnion> TopicUnion_Seq; -typedef sequence<TopicSeq> TopicSeq_Seq; -typedef sequence<TopicValuetype> TopicValuetype_Seq; #endif diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc index e1115f446e0..a3845bb2b50 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc @@ -5,12 +5,11 @@ project (DDS_VTopics_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_defaul dynamicflags += VTOPICS_BASE_STUB_BUILD_DLL libout = ../lib - idlflags += -SS -Sci \ + idlflags += -SS -Gxhst -Sci \ -Wb,stub_export_macro=VTOPICS_BASE_STUB_Export \ -Wb,stub_export_include=VTopics_Base_stub_export.h IDL_Files { - idlflags += -Gxhst VTopics_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp index 9c9211c701a..c5b143dc340 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp @@ -8,7 +8,7 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_time.h" -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" namespace CIAO_VTopics_Receiver_Impl diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp index 81feebce2d4..33663b76c74 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp @@ -7,7 +7,7 @@ #include "ace/Guard_T.h" #include "ciao/Logger/Log_Macros.h" #include "tao/ORB_Core.h" -#include "dds4ccm/impl/dds/Utils.h" +#include "dds4ccm/impl/ndds/Utils.h" namespace CIAO_VTopics_Sender_Impl { diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl index d7266527ff7..6065a5cc28b 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl @@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n"; print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $cdp_file -s"); + "-k file://$ior_emfile -x $cdp_file -q"); $pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { |