From 90efbfa7944bef0d3c3acf97ba64b2b41214c794 Mon Sep 17 00:00:00 2001 From: "William R. Otte" Date: Thu, 4 Mar 2010 15:37:23 +0000 Subject: Create bugfix branch for NGC reported bugs --- ACE/ChangeLog | 2596 +++++- ACE/ChangeLogs/ChangeLog-2010a | 2589 ------ ACE/NEWS | 3 - ACE/ace/Dev_Poll_Reactor.cpp | 5 +- ACE/ace/Time_Value.cpp | 44 +- ACE/ace/config-win32-borland.h | 41 +- ACE/bin/diff-builds-and-group-fixed-tests-only.sh | 2 +- ACE/bin/make_release.py | 46 +- ACE/debianbuild/rules | 26 + ACE/docs/Download.html | 84 +- ACE/docs/bczar/bczar.html | 83 +- ACE/etc/index.html | 1 - ACE/rpmbuild/ace-tao.spec | 2 +- ACE/tests/Atomic_Op_Test.cpp | 346 +- CIAO/ChangeLog | 9413 +++++++++++++++++++- CIAO/ChangeLogs/ChangeLog-2010a | 9061 ------------------- CIAO/DAnCE/MPC/config/dance_split_plan.mpb | 1 - CIAO/DAnCE/Plan_Launcher/Deployment_Failure.h | 25 - CIAO/DAnCE/Plan_Launcher/EM_Launcher.cpp | 67 - CIAO/DAnCE/Plan_Launcher/EM_Launcher.h | 44 - CIAO/DAnCE/Plan_Launcher/NM_Launcher.cpp | 19 - CIAO/DAnCE/Plan_Launcher/NM_Launcher.h | 40 - CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp | 551 +- CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc | 17 +- CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base.h | 48 - .../Plan_Launcher/Plan_Launcher_Base_Impl.cpp | 774 ++ CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h | 106 + .../Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp | 529 -- .../Plan_Launcher/Plan_Launcher_Base_Impl_T.h | 92 - CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp | 114 + CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h | 35 + .../tests/CIAO/CommandlinePassage/run_test.pl | 2 +- .../tests/CIAO/Components/SimpleConsumer_exec.cpp | 10 +- .../tests/CIAO/Components/SimpleConsumer_exec.h | 1 - .../tests/CIAO/Components/SimpleProvider_exec.cpp | 10 +- .../tests/CIAO/Components/SimpleProvider_exec.h | 6 +- .../tests/CIAO/Components/SimplePublisher_exec.cpp | 1 + .../CIAO/ExecutionManager-Deployments/run_test.pl | 4 +- .../ExecutionManager-Deployments/run_test_cdr.pl | 238 - .../CIAO/NodeManager-Deployments/nm_launcher.mpc | 6 + .../tests/CIAO/NodeManager-Deployments/run_test.pl | 43 +- .../CIAO/NodeManager-Deployments/run_test_cdr.pl | 230 - .../NodeManager-Deployments/simple_nm_launcher.cpp | 125 + CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp | 16 +- CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.mpc | 5 +- .../DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp | 206 +- CIAO/NEWS | 3 - CIAO/bin/ciao_tests.lst | 4 - .../ami4ccm/examples/Hello/descriptors/run_test.pl | 4 +- .../dds4ccm/examples/Hello/Base/Hello_Base.mpc | 3 +- .../examples/Hello/descriptors/run_1_to_5.pl | 2 +- .../examples/Hello/descriptors/run_5_to_1.pl | 2 +- .../examples/Hello/descriptors/run_5_to_5.pl | 2 +- .../examples/Hello/descriptors/run_receiver.pl | 2 +- .../examples/Hello/descriptors/run_sender.pl | 2 +- .../dds4ccm/examples/Hello/descriptors/run_test.pl | 2 +- .../dds4ccm/examples/Quoter/Base/Quoter_Base.mpc | 3 +- .../examples/Quoter/descriptors/run_test.pl | 2 +- .../dds4ccm/examples/Shapes/Base/Shapes_Base.mpc | 3 +- .../examples/Shapes/descriptors/run_test.pl | 2 +- CIAO/connectors/dds4ccm/idl/ccm_dds.idl | 4 +- .../dds4ccm/impl/dds/Coherent_Changes_Guard.cpp | 19 - .../dds4ccm/impl/dds/Coherent_Changes_Guard.h | 43 - .../dds4ccm/impl/dds/ContentFilteredTopic.cpp | 143 - .../dds4ccm/impl/dds/ContentFilteredTopic.h | 71 - CIAO/connectors/dds4ccm/impl/dds/DDS4CCM_Traits.h | 69 - .../dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp | 263 - .../dds4ccm/impl/dds/DDSCallbackStatusHandler.h | 155 - .../dds4ccm/impl/dds/DDS_Base_Connector_T.cpp | 228 - .../dds4ccm/impl/dds/DDS_Base_Connector_T.h | 59 - .../dds4ccm/impl/dds/DDS_Event_Connector_T.cpp | 169 - .../dds4ccm/impl/dds/DDS_Event_Connector_T.h | 89 - CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.cpp | 165 - CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.h | 66 - CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp | 175 - CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.h | 66 - CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.cpp | 156 - CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.h | 60 - .../dds4ccm/impl/dds/DDS_StateListen_T.cpp | 170 - .../dds4ccm/impl/dds/DDS_StateListen_T.h | 63 - .../dds4ccm/impl/dds/DDS_State_Connector_T.cpp | 208 - .../dds4ccm/impl/dds/DDS_State_Connector_T.h | 110 - .../dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp | 464 - .../dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h | 73 - CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.cpp | 144 - CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.h | 52 - CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.cpp | 149 - CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.h | 60 - .../dds4ccm/impl/dds/DataListenerControl_T.cpp | 50 - .../dds4ccm/impl/dds/DataListenerControl_T.h | 48 - CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp | 439 - CIAO/connectors/dds4ccm/impl/dds/DataReader.h | 143 - .../dds4ccm/impl/dds/DataReaderHandler_T.cpp | 67 - .../dds4ccm/impl/dds/DataReaderHandler_T.h | 63 - .../dds4ccm/impl/dds/DataReaderListener.cpp | 159 - .../dds4ccm/impl/dds/DataReaderListener.h | 73 - .../dds4ccm/impl/dds/DataReaderListener_T.cpp | 175 - .../dds4ccm/impl/dds/DataReaderListener_T.h | 58 - .../dds4ccm/impl/dds/DataReaderStateListener_T.cpp | 244 - .../dds4ccm/impl/dds/DataReaderStateListener_T.h | 53 - CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp | 307 - CIAO/connectors/dds4ccm/impl/dds/DataWriter.h | 112 - .../dds4ccm/impl/dds/DataWriterListener.cpp | 106 - .../dds4ccm/impl/dds/DataWriterListener.h | 70 - .../dds4ccm/impl/dds/DataWriterListener_T.cpp | 68 - .../dds4ccm/impl/dds/DataWriterListener_T.h | 65 - .../dds4ccm/impl/dds/DomainParticipant.cpp | 1014 --- .../dds4ccm/impl/dds/DomainParticipant.h | 208 - .../dds4ccm/impl/dds/DomainParticipantFactory.cpp | 338 - .../dds4ccm/impl/dds/DomainParticipantFactory.h | 111 - .../dds4ccm/impl/dds/DomainParticipantListener.cpp | 127 - .../dds4ccm/impl/dds/DomainParticipantListener.h | 111 - .../impl/dds/DomainParticipantListener_T.cpp | 142 - .../dds4ccm/impl/dds/DomainParticipantListener_T.h | 109 - CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp | 433 - CIAO/connectors/dds4ccm/impl/dds/Getter_T.h | 141 - .../dds4ccm/impl/dds/InstanceHandleManager_T.cpp | 91 - .../dds4ccm/impl/dds/InstanceHandleManager_T.h | 51 - .../dds4ccm/impl/dds/PortStatusListener_T.cpp | 182 - .../dds4ccm/impl/dds/PortStatusListener_T.h | 84 - CIAO/connectors/dds4ccm/impl/dds/Publisher.cpp | 450 - CIAO/connectors/dds4ccm/impl/dds/Publisher.h | 132 - .../dds4ccm/impl/dds/PublisherListener.cpp | 114 - .../dds4ccm/impl/dds/PublisherListener.h | 76 - .../dds4ccm/impl/dds/PublisherListener_T.cpp | 260 - .../dds4ccm/impl/dds/PublisherListener_T.h | 78 - .../connectors/dds4ccm/impl/dds/QueryCondition.cpp | 134 - CIAO/connectors/dds4ccm/impl/dds/QueryCondition.h | 75 - CIAO/connectors/dds4ccm/impl/dds/ReadCondition.cpp | 80 - CIAO/connectors/dds4ccm/impl/dds/ReadCondition.h | 72 - CIAO/connectors/dds4ccm/impl/dds/Reader_T.cpp | 573 -- CIAO/connectors/dds4ccm/impl/dds/Reader_T.h | 112 - .../dds4ccm/impl/dds/StateListenerControl_T.cpp | 35 - .../dds4ccm/impl/dds/StateListenerControl_T.h | 38 - .../dds4ccm/impl/dds/StatusCondition.cpp | 72 - CIAO/connectors/dds4ccm/impl/dds/StatusCondition.h | 64 - CIAO/connectors/dds4ccm/impl/dds/Subscriber.cpp | 531 -- CIAO/connectors/dds4ccm/impl/dds/Subscriber.h | 176 - .../dds4ccm/impl/dds/SubscriberListener.cpp | 178 - .../dds4ccm/impl/dds/SubscriberListener.h | 94 - .../dds4ccm/impl/dds/SubscriberListener_T.cpp | 277 - .../dds4ccm/impl/dds/SubscriberListener_T.h | 87 - CIAO/connectors/dds4ccm/impl/dds/TimeUtilities.h | 34 - CIAO/connectors/dds4ccm/impl/dds/Topic.cpp | 216 - CIAO/connectors/dds4ccm/impl/dds/Topic.h | 83 - .../dds4ccm/impl/dds/TopicDescription.cpp | 90 - .../connectors/dds4ccm/impl/dds/TopicDescription.h | 63 - CIAO/connectors/dds4ccm/impl/dds/TopicListener.cpp | 49 - CIAO/connectors/dds4ccm/impl/dds/TopicListener.h | 52 - .../dds4ccm/impl/dds/TopicListener_T.cpp | 78 - CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.h | 47 - CIAO/connectors/dds4ccm/impl/dds/Updater_T.cpp | 304 - CIAO/connectors/dds4ccm/impl/dds/Updater_T.h | 86 - CIAO/connectors/dds4ccm/impl/dds/Utils.cpp | 10 - CIAO/connectors/dds4ccm/impl/dds/Utils.h | 90 - CIAO/connectors/dds4ccm/impl/dds/Writer_T.cpp | 98 - CIAO/connectors/dds4ccm/impl/dds/Writer_T.h | 55 - .../dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h | 58 - .../dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h | 26 - .../dds4ccm/impl/dds/ndds/DataReaderQos.h | 66 - .../dds4ccm/impl/dds/ndds/DataWriterQos.h | 75 - .../dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h | 33 - .../impl/dds/ndds/DestinationOrderQosPolicy.h | 33 - .../impl/dds/ndds/DomainParticipantFactoryQos.h | 33 - .../dds4ccm/impl/dds/ndds/DomainParticipantQos.h | 36 - .../dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h | 31 - .../impl/dds/ndds/DurabilityServiceQosPolicy.h | 43 - CIAO/connectors/dds4ccm/impl/dds/ndds/Duration_t.h | 35 - .../dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h | 31 - .../dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h | 34 - .../dds4ccm/impl/dds/ndds/HistoryQosPolicy.h | 33 - .../impl/dds/ndds/InconsistentTopicStatus.h | 34 - .../dds4ccm/impl/dds/ndds/InstanceHandleSeq.h | 47 - .../dds4ccm/impl/dds/ndds/InstanceHandle_t.h | 90 - .../dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h | 33 - .../dds4ccm/impl/dds/ndds/LifespanQosPolicy.h | 33 - .../impl/dds/ndds/LivelinessChangedStatus.h | 42 - .../dds4ccm/impl/dds/ndds/LivelinessLostStatus.h | 34 - .../dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h | 35 - CIAO/connectors/dds4ccm/impl/dds/ndds/OctetSeq.h | 32 - .../impl/dds/ndds/OfferedDeadlineMissedStatus.h | 38 - .../impl/dds/ndds/OfferedIncompatibleQosStatus.h | 40 - .../dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h | 31 - .../impl/dds/ndds/OwnershipStrengthQosPolicy.h | 31 - .../dds4ccm/impl/dds/ndds/PartitionQosPolicy.h | 33 - .../dds4ccm/impl/dds/ndds/PresentationQosPolicy.h | 35 - .../impl/dds/ndds/PublicationBuiltinTopicData.h | 79 - .../impl/dds/ndds/PublicationMatchedStatus.h | 42 - .../dds4ccm/impl/dds/ndds/PublisherQos.h | 42 - .../dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h | 42 - .../impl/dds/ndds/ReaderDataLifecycleQosPolicy.h | 36 - .../dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h | 35 - .../impl/dds/ndds/RequestedDeadlineMissedStatus.h | 38 - .../impl/dds/ndds/RequestedIncompatibleQosStatus.h | 40 - .../impl/dds/ndds/ResourceLimitsQosPolicy.h | 35 - CIAO/connectors/dds4ccm/impl/dds/ndds/SampleInfo.h | 69 - .../dds4ccm/impl/dds/ndds/SampleLostStatus.h | 34 - .../dds4ccm/impl/dds/ndds/SampleRejectedStatus.h | 40 - CIAO/connectors/dds4ccm/impl/dds/ndds/StringSeq.h | 43 - .../dds4ccm/impl/dds/ndds/SubscriberQos.h | 42 - .../impl/dds/ndds/SubscriptionBuiltinTopicData.h | 78 - .../impl/dds/ndds/SubscriptionMatchedStatus.h | 43 - .../impl/dds/ndds/TimeBasedFilterQosPolicy.h | 33 - CIAO/connectors/dds4ccm/impl/dds/ndds/Time_t.h | 35 - .../dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h | 33 - CIAO/connectors/dds4ccm/impl/dds/ndds/TopicQos.h | 69 - .../impl/dds/ndds/TransportPriorityQosPolicy.h | 31 - .../dds4ccm/impl/dds/ndds/UserDataQosPolicy.h | 33 - .../impl/dds/ndds/WriterDataLifecycleQosPolicy.h | 31 - CIAO/connectors/dds4ccm/impl/dds/ndds_impl.mpc | 42 - .../dds4ccm/impl/ndds/BuiltinTopicKey_t.h | 38 + .../dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp | 19 + .../dds4ccm/impl/ndds/Coherent_Changes_Guard.h | 43 + .../dds4ccm/impl/ndds/ContentFilteredTopic.cpp | 142 + .../dds4ccm/impl/ndds/ContentFilteredTopic.h | 71 + CIAO/connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h | 69 + .../dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp | 263 + .../dds4ccm/impl/ndds/DDSCallbackStatusHandler.h | 155 + .../dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp | 228 + .../dds4ccm/impl/ndds/DDS_Base_Connector_T.h | 59 + .../dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp | 169 + .../dds4ccm/impl/ndds/DDS_Event_Connector_T.h | 89 + CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp | 165 + CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h | 66 + CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp | 175 + CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h | 66 + CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp | 156 + CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h | 60 + .../dds4ccm/impl/ndds/DDS_StateListen_T.cpp | 170 + .../dds4ccm/impl/ndds/DDS_StateListen_T.h | 63 + .../dds4ccm/impl/ndds/DDS_State_Connector_T.cpp | 208 + .../dds4ccm/impl/ndds/DDS_State_Connector_T.h | 110 + .../impl/ndds/DDS_TopicBase_Connector_T.cpp | 464 + .../dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h | 73 + CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp | 144 + CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h | 52 + CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp | 149 + CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h | 60 + .../dds4ccm/impl/ndds/DataListenerControl_T.cpp | 50 + .../dds4ccm/impl/ndds/DataListenerControl_T.h | 48 + CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp | 437 + CIAO/connectors/dds4ccm/impl/ndds/DataReader.h | 143 + .../dds4ccm/impl/ndds/DataReaderHandler_T.cpp | 67 + .../dds4ccm/impl/ndds/DataReaderHandler_T.h | 63 + .../dds4ccm/impl/ndds/DataReaderListener.cpp | 158 + .../dds4ccm/impl/ndds/DataReaderListener.h | 73 + .../dds4ccm/impl/ndds/DataReaderListener_T.cpp | 170 + .../dds4ccm/impl/ndds/DataReaderListener_T.h | 58 + CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h | 99 + .../impl/ndds/DataReaderStateListener_T.cpp | 240 + .../dds4ccm/impl/ndds/DataReaderStateListener_T.h | 53 + CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp | 301 + CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h | 112 + .../dds4ccm/impl/ndds/DataWriterListener.cpp | 106 + .../dds4ccm/impl/ndds/DataWriterListener.h | 70 + .../dds4ccm/impl/ndds/DataWriterListener_T.cpp | 68 + .../dds4ccm/impl/ndds/DataWriterListener_T.h | 65 + CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h | 114 + .../dds4ccm/impl/ndds/DeadlineQosPolicy.h | 44 + .../dds4ccm/impl/ndds/DestinationOrderQosPolicy.h | 44 + .../dds4ccm/impl/ndds/DomainParticipant.cpp | 1014 +++ .../dds4ccm/impl/ndds/DomainParticipant.h | 208 + .../dds4ccm/impl/ndds/DomainParticipantFactory.cpp | 337 + .../dds4ccm/impl/ndds/DomainParticipantFactory.h | 111 + .../impl/ndds/DomainParticipantFactoryQos.h | 44 + .../impl/ndds/DomainParticipantListener.cpp | 126 + .../dds4ccm/impl/ndds/DomainParticipantListener.h | 111 + .../impl/ndds/DomainParticipantListener_T.cpp | 142 + .../impl/ndds/DomainParticipantListener_T.h | 109 + .../dds4ccm/impl/ndds/DomainParticipantQos.h | 48 + .../dds4ccm/impl/ndds/DurabilityQosPolicy.h | 42 + .../dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h | 64 + CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h | 41 + .../dds4ccm/impl/ndds/EntityFactoryQosPolicy.h | 42 + CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp | 421 + CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h | 141 + .../dds4ccm/impl/ndds/GroupDataQosPolicy.h | 51 + .../dds4ccm/impl/ndds/HistoryQosPolicy.h | 46 + .../dds4ccm/impl/ndds/InconsistentTopicStatus.h | 47 + .../dds4ccm/impl/ndds/InstanceHandleManager_T.cpp | 89 + .../dds4ccm/impl/ndds/InstanceHandleManager_T.h | 51 + .../dds4ccm/impl/ndds/InstanceHandleSeq.h | 66 + .../dds4ccm/impl/ndds/InstanceHandle_t.h | 106 + .../dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h | 44 + .../dds4ccm/impl/ndds/LifespanQosPolicy.h | 44 + .../dds4ccm/impl/ndds/LivelinessChangedStatus.h | 61 + .../dds4ccm/impl/ndds/LivelinessLostStatus.h | 47 + .../dds4ccm/impl/ndds/LivelinessQosPolicy.h | 48 + .../impl/ndds/OfferedDeadlineMissedStatus.h | 53 + .../impl/ndds/OfferedIncompatibleQosStatus.h | 57 + .../dds4ccm/impl/ndds/OwnershipQosPolicy.h | 42 + .../dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h | 42 + .../dds4ccm/impl/ndds/PartitionQosPolicy.h | 44 + .../dds4ccm/impl/ndds/PortStatusListener_T.cpp | 182 + .../dds4ccm/impl/ndds/PortStatusListener_T.h | 84 + .../dds4ccm/impl/ndds/PresentationQosPolicy.h | 50 + .../impl/ndds/PublicationBuiltinTopicData.h | 127 + .../dds4ccm/impl/ndds/PublicationMatchedStatus.h | 61 + CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp | 449 + CIAO/connectors/dds4ccm/impl/ndds/Publisher.h | 132 + .../dds4ccm/impl/ndds/PublisherListener.cpp | 112 + .../dds4ccm/impl/ndds/PublisherListener.h | 76 + .../dds4ccm/impl/ndds/PublisherListener_T.cpp | 260 + .../dds4ccm/impl/ndds/PublisherListener_T.h | 78 + CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h | 59 + .../dds4ccm/impl/ndds/QosPolicyCountSeq.h | 63 + .../dds4ccm/impl/ndds/QueryCondition.cpp | 133 + CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h | 75 + .../connectors/dds4ccm/impl/ndds/ReadCondition.cpp | 80 + CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h | 72 + .../impl/ndds/ReaderDataLifecycleQosPolicy.h | 46 + CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp | 536 ++ CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h | 112 + .../dds4ccm/impl/ndds/ReliabilityQosPolicy.h | 48 + .../impl/ndds/RequestedDeadlineMissedStatus.h | 53 + .../impl/ndds/RequestedIncompatibleQosStatus.h | 57 + .../dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h | 50 + CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h | 69 + .../dds4ccm/impl/ndds/SampleLostStatus.h | 34 + .../dds4ccm/impl/ndds/SampleRejectedStatus.h | 57 + .../dds4ccm/impl/ndds/StateListenerControl_T.cpp | 35 + .../dds4ccm/impl/ndds/StateListenerControl_T.h | 38 + .../dds4ccm/impl/ndds/StatusCondition.cpp | 72 + .../connectors/dds4ccm/impl/ndds/StatusCondition.h | 64 + CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h | 43 + CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp | 531 ++ CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h | 176 + .../dds4ccm/impl/ndds/SubscriberListener.cpp | 176 + .../dds4ccm/impl/ndds/SubscriberListener.h | 94 + .../dds4ccm/impl/ndds/SubscriberListener_T.cpp | 277 + .../dds4ccm/impl/ndds/SubscriberListener_T.h | 87 + CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h | 59 + .../dds4ccm/impl/ndds/SubscriptionMatchedStatus.h | 62 + .../dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h | 44 + CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h | 48 + CIAO/connectors/dds4ccm/impl/ndds/Time_t.h | 41 + CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp | 214 + CIAO/connectors/dds4ccm/impl/ndds/Topic.h | 83 + .../dds4ccm/impl/ndds/TopicDataQosPolicy.h | 51 + .../dds4ccm/impl/ndds/TopicDescription.cpp | 90 + .../dds4ccm/impl/ndds/TopicDescription.h | 63 + .../connectors/dds4ccm/impl/ndds/TopicListener.cpp | 48 + CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h | 52 + .../dds4ccm/impl/ndds/TopicListener_T.cpp | 78 + .../connectors/dds4ccm/impl/ndds/TopicListener_T.h | 47 + CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h | 104 + .../dds4ccm/impl/ndds/TransportPriorityQosPolicy.h | 42 + CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp | 304 + CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h | 86 + .../dds4ccm/impl/ndds/UserDataQosPolicy.h | 50 + CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp | 10 + CIAO/connectors/dds4ccm/impl/ndds/Utils.h | 90 + .../impl/ndds/WriterDataLifecycleQosPolicy.h | 42 + CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp | 96 + CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h | 55 + .../dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h | 58 + CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc | 41 + .../Keyed/Base/Perf_Keyed_Test_Base.mpc | 3 +- .../performance-tests/Keyed/descriptors/run_pub.pl | 2 +- .../Keyed/descriptors/run_pub3.pl | 2 +- .../Keyed/descriptors/run_pub_BE.pl | 2 +- .../performance-tests/Keyed/descriptors/run_sub.pl | 2 +- .../Keyed/descriptors/run_sub2.pl | 2 +- .../Keyed/descriptors/run_sub3.pl | 2 +- .../Keyed/descriptors/run_sub_BE.pl | 2 +- .../Keyed/descriptors/run_test.pl | 2 +- .../Latency/Base/Latency_Test_Base.idl | 4 +- .../Latency/Base/Latency_Test_Base.mpc | 3 +- .../Receiver/Latency_Test_Receiver_exec.cpp | 2 +- .../Latency/Sender/Latency_Test_Sender.idl | 1 + .../Latency/Sender/Latency_Test_Sender_exec.cpp | 183 +- .../Latency/Sender/Latency_Test_Sender_exec.h | 23 +- .../performance-tests/Latency/descriptors/Plan.cdp | 15 +- .../Latency/descriptors/Plan_pub.cdp | 13 +- .../Latency/descriptors/Plan_sub.cdp | 2 +- .../performance-tests/Latency/descriptors/README | 17 - .../Latency/descriptors/USER_QOS_PROFILES.xml | 93 +- .../Latency/descriptors/run_pub.pl | 6 +- .../Latency/descriptors/run_sub.pl | 6 +- .../Latency/descriptors/run_test.pl | 2 +- .../CSLDeadline/Base/CSL_DeadlineTest_Base.mpc | 3 +- .../tests/CSLDeadline/descriptors/run_test.pl | 2 +- .../dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc | 3 +- .../dds4ccm/tests/CSLQoS/descriptors/run_test.pl | 2 +- .../CSLSampleRejected/Base/CSL_SRTest_Base.mpc | 3 +- .../Receiver/CSL_SRTest_Receiver_exec.cpp | 4 +- .../Sender/CSL_SRTest_Sender_exec.cpp | 2 +- .../CSLSampleRejected/descriptors/run_test.pl | 4 +- .../tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc | 3 +- .../Receiver/CSL_USTest_Receiver_exec.cpp | 2 +- .../CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp | 2 +- .../tests/CSLUnexpStat/descriptors/run_test.pl | 2 +- .../Base/CoherentWrite_Test_Base.idl | 20 - .../Base/CoherentWrite_Test_Base.mpc | 26 - .../tests/CoherentWriter/Base/Reader_Starter.idl | 24 - .../tests/CoherentWriter/Base/Reader_Starter.mpc | 114 - .../Connector/CoherentWrite_Test_Connector.idl | 29 - .../Connector/CoherentWrite_Test_Connector.mpc | 145 - .../Receiver/CoherentWrite_Test_Receiver.idl | 27 - .../Receiver/CoherentWrite_Test_Receiver.mpc | 157 - .../Receiver/CoherentWrite_Test_Receiver_exec.cpp | 305 - .../Receiver/CoherentWrite_Test_Receiver_exec.h | 124 - .../Sender/CoherentWrite_Test_Sender.idl | 29 - .../Sender/CoherentWrite_Test_Sender.mpc | 155 - .../Sender/CoherentWrite_Test_Sender_exec.cpp | 179 - .../Sender/CoherentWrite_Test_Sender_exec.h | 96 - .../tests/CoherentWriter/descriptors/Plan.cdp | 404 - .../descriptors/USER_QOS_PROFILES.xml | 64 - .../tests/CoherentWriter/descriptors/run_test.pl | 244 - .../tests/DDSWriterEntity/Base/Writer_Base.mpc | 3 +- .../DDSWriterEntity/Sender/Writer_Sender_exec.cpp | 6 +- .../DDSWriterEntity/Sender/Writer_Sender_exec.h | 2 +- .../tests/DDSWriterEntity/descriptors/run_test.pl | 2 +- .../Base/Event_Connection_Test_Base.mpc | 3 +- .../Event_Connection_Test/descriptors/run_test.pl | 2 +- .../EventConnector/Base/FSS_Event_Base.mpc | 3 +- .../StateConnector/Base/FSS_State_Base.mpc | 3 +- .../dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc | 6 +- .../dds4ccm/tests/Getter/descriptors/run_test.pl | 4 +- .../tests/InstanceHandle/Base/Writer_Base.mpc | 3 +- .../InstanceHandle/Sender/Writer_Sender_exec.cpp | 11 +- .../InstanceHandle/Sender/Writer_Sender_exec.h | 2 +- .../tests/InstanceHandle/descriptors/run_test.pl | 4 +- .../tests/KeyedSamples/Base/Keyed_Test_Base.mpc | 3 +- .../Receiver/Keyed_Test_Receiver_exec.cpp | 2 +- .../tests/KeyedSamples/descriptors/run_test.pl | 2 +- .../dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc | 3 +- .../tests/KeyedWriter/descriptors/run_test.pl | 2 +- .../tests/ListenManyByMany/Base/LMBM_Test_Base.mpc | 3 +- .../tests/ListenManyByMany/descriptors/run_test.pl | 2 +- .../tests/ListenNotEnabled/Base/LNE_Test_Base.mpc | 3 +- .../tests/ListenNotEnabled/descriptors/run_test.pl | 2 +- .../tests/ListenOneByOne/Base/LOBO_Test_Base.mpc | 3 +- .../tests/ListenOneByOne/descriptors/run_test.pl | 2 +- .../Base/NonChangeable_Base.mpc | 3 +- .../NonChangeableAttribute/descriptors/run_test.pl | 2 +- .../Base/ConnectorStatusListener_Test_Base.mpc | 3 +- .../On_Inconsistent_Topic/descriptors/run_test.pl | 2 +- .../PSLDeadline/Base/PSL_DeadlineTest_Base.mpc | 3 +- .../Receiver/PSL_DeadlineTest_Receiver_exec.cpp | 4 +- .../tests/PSLDeadline/descriptors/run_test.pl | 4 +- .../PSLSampleLost/Base/PSL_SampleLost_Base.mpc | 3 +- .../Receiver/PSL_SampleLost_Receiver_exec.cpp | 4 +- .../tests/PSLSampleLost/descriptors/run_test.pl | 2 +- .../dds4ccm/tests/Policies/deadline_qos_test.cpp | 16 - .../dds4ccm/tests/Policies/deadline_qos_test.h | 19 - .../dds4ccm/tests/Policies/dest_order_qos_test.cpp | 14 - .../dds4ccm/tests/Policies/dest_order_qos_test.h | 19 - .../dds4ccm/tests/Policies/dp_factory_qos_test.cpp | 9 - .../dds4ccm/tests/Policies/dp_factory_qos_test.h | 17 - .../dds4ccm/tests/Policies/dp_qos_test.cpp | 46 - .../dds4ccm/tests/Policies/dp_qos_test.h | 18 - .../dds4ccm/tests/Policies/dr_qos_test.cpp | 137 - .../dds4ccm/tests/Policies/dr_qos_test.h | 18 - .../dds4ccm/tests/Policies/dur_qos_test.cpp | 15 - .../dds4ccm/tests/Policies/dur_qos_test.h | 19 - .../tests/Policies/dur_service_qos_test.cpp | 19 - .../dds4ccm/tests/Policies/dur_service_qos_test.h | 19 - .../connectors/dds4ccm/tests/Policies/duration.cpp | 16 - CIAO/connectors/dds4ccm/tests/Policies/duration.h | 19 - .../dds4ccm/tests/Policies/dw_qos_test.cpp | 164 - .../dds4ccm/tests/Policies/dw_qos_test.h | 18 - .../tests/Policies/entity_factory_qos_test.cpp | 15 - .../tests/Policies/entity_factory_qos_test.h | 19 - .../dds4ccm/tests/Policies/group_data_qos_test.cpp | 18 - .../dds4ccm/tests/Policies/group_data_qos_test.h | 19 - .../dds4ccm/tests/Policies/hist_qos_test.cpp | 16 - .../dds4ccm/tests/Policies/hist_qos_test.h | 19 - .../dds4ccm/tests/Policies/lat_budget_qos_test.cpp | 16 - .../dds4ccm/tests/Policies/lat_budget_qos_test.h | 19 - .../dds4ccm/tests/Policies/lifespan_qos_test.cpp | 16 - .../dds4ccm/tests/Policies/lifespan_qos_test.h | 19 - .../dds4ccm/tests/Policies/liveliness_qos_test.cpp | 17 - .../dds4ccm/tests/Policies/liveliness_qos_test.h | 19 - CIAO/connectors/dds4ccm/tests/Policies/main.cpp | 73 - .../dds4ccm/tests/Policies/octet_seq.cpp | 34 - CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h | 20 - .../dds4ccm/tests/Policies/ownership_qos_test.cpp | 15 - .../dds4ccm/tests/Policies/ownership_qos_test.h | 19 - .../tests/Policies/ownership_strength_qos_test.cpp | 14 - .../tests/Policies/ownership_strength_qos_test.h | 19 - .../dds4ccm/tests/Policies/partition_qos_test.cpp | 33 - .../dds4ccm/tests/Policies/partition_qos_test.h | 19 - .../connectors/dds4ccm/tests/Policies/policies.mpc | 44 - .../tests/Policies/presentation_qos_test.cpp | 19 - .../dds4ccm/tests/Policies/presentation_qos_test.h | 19 - .../dds4ccm/tests/Policies/pub_qos_test.cpp | 58 - .../dds4ccm/tests/Policies/pub_qos_test.h | 18 - .../tests/Policies/rd_lifecycle_qos_test.cpp | 19 - .../dds4ccm/tests/Policies/rd_lifecycle_qos_test.h | 19 - .../tests/Policies/reliability_qos_test.cpp | 17 - .../dds4ccm/tests/Policies/reliability_qos_test.h | 19 - .../tests/Policies/resource_limits_qos_test.cpp | 17 - .../tests/Policies/resource_limits_qos_test.h | 19 - CIAO/connectors/dds4ccm/tests/Policies/run_test.pl | 25 - .../dds4ccm/tests/Policies/sub_qos_test.cpp | 59 - .../dds4ccm/tests/Policies/sub_qos_test.h | 19 - .../dds4ccm/tests/Policies/tbf_qos_test.cpp | 15 - .../dds4ccm/tests/Policies/tbf_qos_test.h | 19 - .../dds4ccm/tests/Policies/tp_data_qos_test.cpp | 18 - .../dds4ccm/tests/Policies/tp_data_qos_test.h | 19 - .../dds4ccm/tests/Policies/tp_qos_test.cpp | 148 - .../dds4ccm/tests/Policies/tp_qos_test.h | 18 - .../tests/Policies/transport_prio_qos_test.cpp | 14 - .../tests/Policies/transport_prio_qos_test.h | 19 - .../dds4ccm/tests/Policies/user_data_qos_test.cpp | 18 - .../dds4ccm/tests/Policies/user_data_qos_test.h | 19 - .../tests/Policies/wr_lifecycle_qos_test.cpp | 15 - .../dds4ccm/tests/Policies/wr_lifecycle_qos_test.h | 19 - .../QueryFilter/Base/QueryFilter_Test_Base.mpc | 3 +- .../tests/QueryFilter/descriptors/run_test.pl | 4 +- .../dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc | 3 +- .../dds4ccm/tests/Reader/descriptors/run_test.pl | 2 +- .../tests/SLDisabled/Base/SL_Disabled_Base.mpc | 3 +- .../Receiver/SL_Disabled_Receiver_exec.cpp | 4 +- .../tests/SLDisabled/descriptors/run_test.pl | 2 +- .../tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc | 3 +- .../Receiver/SL_ManyByMany_Receiver_exec.cpp | 4 +- .../tests/SLManyByMany/descriptors/run_test.pl | 2 +- .../tests/SLOneByOne/Base/SL_OneByOne_Base.mpc | 3 +- .../Receiver/SL_OneByOne_Receiver_exec.cpp | 4 +- .../tests/SLOneByOne/descriptors/run_test.pl | 2 +- .../Base/SetConnectorAttribute_Base.mpc | 3 +- .../SetConnectorAttributes/descriptors/run_test.pl | 2 +- .../DifferentDatatype/Component/Component_exec.cpp | 14 +- .../DifferentDatatype/descriptors/run_test.pl | 4 +- .../SameDatatype/Component/Component_exec.cpp | 18 +- .../SameDatatype/descriptors/run_test.pl | 2 +- .../Base/State_Connection_Test_Base.mpc | 3 +- .../State_Connection_Test/descriptors/run_test.pl | 4 +- .../tests/TimeConversion/time_conversion.cpp | 2 +- .../tests/TwoTopics/Base/TwoTopics_Base.mpc | 3 +- .../UnkeyedSamples/Base/Unkeyed_Test_Base.mpc | 3 +- .../tests/UnkeyedSamples/descriptors/run_test.pl | 2 +- .../tests/UnkeyedWriter/Base/Writer_Base.mpc | 3 +- .../tests/UnkeyedWriter/descriptors/run_test.pl | 2 +- .../dds4ccm/tests/Updater/Base/Updater_Base.mpc | 3 +- .../Updater/Receiver/Updater_Receiver_exec.cpp | 4 +- .../dds4ccm/tests/Updater/descriptors/run_test.pl | 4 +- .../tests/VariousTopicsEvent/Base/VTopic_Base.idl | 42 +- .../tests/VariousTopicsEvent/Base/VTopic_Base.mpc | 3 +- .../Receiver/VTopic_Receiver_exec.cpp | 2 +- .../Sender/VTopic_Sender_exec.cpp | 2 +- .../VariousTopicsEvent/descriptors/run_test.pl | 2 +- .../tests/VariousTopicsState/Base/VTopics_Base.idl | 92 +- .../tests/VariousTopicsState/Base/VTopics_Base.mpc | 3 +- .../Receiver/VTopics_Receiver_exec.cpp | 2 +- .../Sender/VTopics_Sender_exec.cpp | 2 +- .../VariousTopicsState/descriptors/run_test.pl | 2 +- CIAO/examples/BasicSP/descriptors/run_test.pl | 4 +- .../Messenger/StaticDAnCE/run_test.pl | 2 +- .../Messenger/descriptors/run_test.pl | 4 +- CIAO/examples/Hello/descriptors/run_test.pl | 8 +- .../run_test_PlanLocality_DifferentProcesses.pl | 2 +- .../run_test_PlanLocality_SameProcess.pl | 2 +- CIAO/examples/Hello/descriptors/run_test_alias.pl | 2 +- .../Hello/descriptors/run_test_without_ns.pl | 4 +- .../Null_Component/descriptors/run_test.pl | 4 +- .../descriptors/run_test_without_ns.pl | 2 +- .../Null_Component_Glfa/descriptors/run_test.pl | 4 +- .../Bug_3769_Regression/descriptors/run_test.pl | 4 +- CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl | 17 +- TAO/ChangeLog | 6555 +++++++++++++- TAO/ChangeLogs/ChangeLog-2010a | 6556 -------------- TAO/NEWS | 3 - TAO/TAO_IDL/be/be_codegen.cpp | 6 +- TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 120 +- TAO/orbsvcs/Notify_Service/Notify_Service.cpp | 12 +- TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h | 1 + TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h | 9 + TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp | 2 + TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp | 4 +- TAO/tao/PI/PI.h | 3 +- TAO/tao/VarOut_T.h | 2 +- TAO/tests/Bug_3766_Regression/server.cpp | 1 + TAO/tests/OBV/Any/client.cpp | 2 +- 576 files changed, 37031 insertions(+), 41712 deletions(-) delete mode 100644 ACE/ChangeLogs/ChangeLog-2010a delete mode 100644 CIAO/ChangeLogs/ChangeLog-2010a delete mode 100644 CIAO/DAnCE/Plan_Launcher/Deployment_Failure.h delete mode 100644 CIAO/DAnCE/Plan_Launcher/EM_Launcher.cpp delete mode 100644 CIAO/DAnCE/Plan_Launcher/EM_Launcher.h delete mode 100644 CIAO/DAnCE/Plan_Launcher/NM_Launcher.cpp delete mode 100644 CIAO/DAnCE/Plan_Launcher/NM_Launcher.h delete mode 100644 CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base.h create mode 100644 CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp create mode 100644 CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h delete mode 100644 CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp delete mode 100644 CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.h create mode 100644 CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp create mode 100644 CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h delete mode 100755 CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl create mode 100644 CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc delete mode 100755 CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl create mode 100644 CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS4CCM_Traits.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataReader.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataWriter.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Getter_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Publisher.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Publisher.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/PublisherListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/PublisherListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/QueryCondition.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ReadCondition.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ReadCondition.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Reader_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Reader_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/StatusCondition.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/StatusCondition.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Subscriber.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Subscriber.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/TimeUtilities.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Topic.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Topic.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/TopicDescription.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/TopicDescription.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/TopicListener.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/TopicListener.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Updater_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Updater_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Utils.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Utils.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Writer_T.cpp delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/Writer_T.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/Duration_t.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/OctetSeq.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/PublisherQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/SampleInfo.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/StringSeq.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/Time_t.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/TopicQos.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h delete mode 100644 CIAO/connectors/dds4ccm/impl/dds/ndds_impl.mpc create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReader.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Publisher.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Time_t.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Topic.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Utils.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h create mode 100644 CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc delete mode 100644 CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/README delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl delete mode 100755 CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.idl delete mode 100755 CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.idl delete mode 100755 CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.idl delete mode 100755 CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.idl delete mode 100755 CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/Plan.cdp delete mode 100644 CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml delete mode 100755 CIAO/connectors/dds4ccm/tests/CoherentWriter/descriptors/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/deadline_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dest_order_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dp_factory_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dp_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dr_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dur_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dur_service_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/duration.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/duration.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/dw_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/entity_factory_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/group_data_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/hist_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/lat_budget_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/lifespan_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/liveliness_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/main.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/octet_seq.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/octet_seq.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/ownership_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/ownership_strength_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/partition_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/policies.mpc delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/presentation_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/pub_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/rd_lifecycle_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/reliability_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/resource_limits_qos_test.h delete mode 100755 CIAO/connectors/dds4ccm/tests/Policies/run_test.pl delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/sub_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/tbf_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/tp_data_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/tp_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/transport_prio_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/user_data_qos_test.h delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp delete mode 100644 CIAO/connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.h delete mode 100644 TAO/ChangeLogs/ChangeLog-2010a diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 1b42a357447..7200682d343 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,56 +1,2586 @@ -Tue Mar 2 21:02:51 UTC 2010 Steve Huston +Wed Mar 03 01:18:08 CST 2010 Johnny Willemsen - * ace/Dev_Poll_Reactor.cpp (mask_ops_i): If the specified handle is - not registered, return -1 instead of crashing. + * ACE version 5.7.7 released. -Thu Mar 4 09:15:54 UTC 2010 Martin Corino +Mon Mar 1 12:27:30 UTC 2010 Martin Corino - * bin/make_release.py: - Fix for problems with creating MPC release tag. + * bin/PerlACE/Process_Unix.pm: -Thu Mar 4 07:50:54 UTC 2010 Johnny Willemsen + Fixed 'ps' determination problems. - * tests/Atomic_Op_Test.cpp: - Rewritten this test to use a template method so that we can - test atomic op easily for various data types +Fri Feb 26 19:32:06 UTC 2010 Adam Mitz + + * ace/config-sunos5.5.h: + + Moved #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL to a + non-compiler-specific section. + + * ace/config-sunos5.10.h: + + Added #undef ACE_LACKS_CEILL & ACE_LACKS_FLOORL because they are + available on Solaris 10. + +Fri Feb 26 18:30:54 UTC 2010 Johnny Willemsen + + * ace/OS_NS_sys_time.inl: + Changed ACE_HAS_CLOCK_REALTIME to ACE_HAS_CLOCK_GETTIME_REALTIME + +Fri Feb 26 16:00:04 UTC 2010 Steve Huston + + * Fixed double-declaration of ACE_LACKS_CEILL and ACE_LACKS_FLOORL in: + Thu Feb 25 21:42:13 UTC 2010 Steve Huston + +Fri Feb 26 15:36:12 UTC 2010 Steve Huston + + * tests/Bug_2609_Regression_Test.cpp: Fix unused arg warning and + adjust for hosts without IPv6. + +Fri Feb 26 14:48:01 UTC 2010 Chris Cleeland + + * tests/Timer_Queue_Test.cpp (handle_timeout): Fix unused argument + warning. + +Fri Feb 26 14:45:30 UTC 2010 Douglas C. Schmidt + + * ace/OS_NS_sys_time.inl (ACE_OS::gettimeofday): Added in support + for clock_gettime() if a user sets ACE_HAS_CLOCK_REALTIME in + their config.h file. Thanks to Patrick Soboljew for this suggestion. + +Thu Feb 25 21:42:13 UTC 2010 Steve Huston + + * configure.ac: Use AC_CHECK_DECL rather than ACE_CHECK_LACKS_FUNCS + for ceill() and floorl(). On Solaris 9 the symbols show up in + some library (possibly as a stub) but aren't available; this + fools ACE_CHECK_LACKS_FUNC. There's probably a better way to + integrate this into ACE_CHECKS_LACKS_FUNCS but I don't know how. + +Thu Feb 25 22:07:25 UTC 2010 Chris Cleeland + + * tests/Timer_Queue_Test.cpp (test_interval_timer): + + Added new function to test interval timing functionality in + preparation for merging in a fix for bug 3104. Note that while + bug 3104 focuses on performance issues, this test doesn't + specifically test performance, but rather tests that the + interval timer feature works properly so that we know that + any performance-related changes made in fixing bug 3104 don't + cause a regression. + + * ace/Timer_Queue_T.h: + * ace/Timer_Queue_T.cpp: + + Integrate code proposed to fix bug 3104, but factored out into + a new method, recompute_next_abs_interval_time, so that the + more efficient computation can be re-used in Timer_Hash and + Timer_Wheel. + + * ace/Timer_Queue_T.cpp (dispatch_info_i): + + Change to use recompute_next_abs_interval_time. + + * ace/Timer_Hash_T.cpp (expire): + * ace/Timer_Wheel_T.cpp (expire): + + Change to use recompute_next_abs_interval_time. + +Thu Feb 25 20:33:27 UTC 2010 Steve Huston + + * tests/Bug_2609_Regression_Test.cpp: Correct to use documented ACE + conventions for event handler reference counting. Should resolve + concerns around Bugzilla 2609. + +Thu Feb 25 19:11:07 UTC 2010 Steven Stallion + + * include/makeinclude/platform_sunos5_sunc++.GNU: + * include/makeinclude/wrapper_macros.GNU: + Refined use of CPPFLAGS; -library will now only be applied to CC + invocations. + +Thu Feb 25 16:52:20 UTC 2010 Vladimir Zykov - * ace/Time_Value.cpp: - Layout changes and fixed compile problem with CB2010. This fixes - bugzilla 3835, thanks to Jan Kalin + * ace/Strategies_T.cpp: + * ace/Connector.cpp: + * ace/Svc_Handler.cpp: + * tests/run_test.lst: + * tests/Bug_2609_Regression_Test.cpp: + * tests/NonBlocking_Conn_Test.h: + * tests/Bug_2610_Regression_Test.cpp: + * tests/Process_Strategy_Test.cpp: + * tests/NonBlocking_Conn_Test.cpp: + Reverted all the changes done in attempt to fix non-blocking + connect test and tests for 2609/2610. + +Thu Feb 25 08:10:54 UTC 2010 Johnny Willemsen + + * ace/config-opensd.h: + #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL + +Thu Feb 25 08:10:54 UTC 2010 Johnny Willemsen + + * ace/config-netbsd.h: + #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL + +Thu Feb 25 07:51:54 UTC 2010 Johnny Willemsen + + * ace/config-WinCE.h: + #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL + +Thu Feb 25 07:38:54 UTC 2010 Johnny Willemsen + + * ace/svcconf.mpb: + * ace/svcconfgen.mpc: + Moved regeneration support to its own file that is disabled by + defeault. Thanks to Joseph Sarbak for reporting this. - * ace/config-win32-borland.h: - CB also has long timevalue mismatch + * bin/MakeProjectCreator/config/global.features: + Set ace_svcconf_gen to 0, when this is set to 1 we enable svcconf + regeneration -Thu Mar 4 07:50:54 UTC 2010 Johnny Willemsen +Wed Feb 24 22:07:30 UTC 2010 Steven Stallion - * NEWS: - Updated for next micro + * include/makeinclude/platform_sunos5_sunc++.GNU: + Added support for alternate CC libraries. + +Wed Feb 24 15:15:00 UTC 2010 Simon Massey + + * ace/config-lynxos.h: + #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL + Correct placement of these defines for the version of Lynxos + +Wed Feb 24 11:41:54 UTC 2010 Johnny Willemsen + + * include/makeinclude/platform_g++_common.GNU: + Added support for no_strict_aliasing, when this is set, we add + -fno-strict-aliasing to the compiler flags + +Wed Feb 24 08:45:54 UTC 2010 Johnny Willemsen + + * tests/run_test.lst: + 2434 should run now + +Wed Feb 24 08:41:54 UTC 2010 Johnny Willemsen + + * ace/config-hpux-11.00.h: + #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL + +Wed Feb 24 08:01:54 UTC 2010 Johnny Willemsen + + * tests/NonBlocking_Conn_Test.cpp: + Unicode fixes + + * tests/Atomic_Op_Test.cpp: + Calculate how long each test takes and print this to the log + +Wed Feb 24 02:48:37 UTC 2010 Douglas C. Schmidt + + * ace/config-sunos5.5.h: + #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL + +Tue Feb 23 19:45:39 UTC 2010 Douglas C. Schmidt + + * tests/OS_Test.cpp: Added tests for floorl() and ceill(). Thanks + to Olivier Langlois for + this fix. + +Tue Feb 23 19:43:36 UTC 2010 Douglas C. Schmidt + + * configure.ac: Added a check for ACE_CHECK_LACKS_FUNCS(floor ceil + floorl ceill). Thanks to Olivier Langlois for this fix. + +Tue Feb 23 15:15:00 UTC 2010 Simon Massey + + * ace/config-lynxos.h: + #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL + +Tue Feb 23 08:59:54 UTC 2010 Johnny Willemsen + + * ace/config-vxworks6.4.h: + VxWorks lacks floorl and ceill + +Mon Feb 22 20:01:54 UTC 2010 Douglas C. Schmidt + + * ace/Time_Value.{h,cpp}: Applied some patches from Olivier Langlois + to fix some warnings. + +Mon Feb 22 19:57:02 UTC 2010 Douglas C. Schmidt + + * ace/Thread_Mutex.inl (ACE_Thread_Mutex::lock): Added a non-const + lock() method. Thanks to Phil for suggesting this. + +Mon Feb 22 18:08:20 UTC 2010 Douglas C. Schmidt + + * ace/Condition_Recursive_Thread_Mutex.cpp (ACE_Condition): Fixed + a stray occurrence of the mutex() accessor that should be + lock(). Thanks to Phil Mesnier for reporting this. + +Mon Feb 22 15:00:11 UTC 2010 Douglas C. Schmidt + + * ace/Time_Value.{h,cpp}: Reformatted/renamed the code to conform + to ACE programming guidelines. + +Mon Feb 22 13:40:14 UTC 2010 Douglas C. Schmidt + + * ace/Condition_T.cpp: Changed the mutex() accessor to lock() to + be consistent. + +Mon Feb 22 13:39:09 UTC 2010 Douglas C. Schmidt + + * ace/Recursive_Thread_Mutex.{h,inl}: Created a new lock() accessor + so it's consistent with the other synchronizer accessors in ACE. + +Sun Feb 21 21:25:21 UTC 2010 Douglas C. Schmidt + + * tests/Time_Value_Test.cpp: Added a test for the new operator<< + implementation for ACE_Time_Value. Thanks to Olivier Langlois + for contributing this. + +Sun Feb 21 21:28:03 UTC 2010 Douglas C. Schmidt + + * ace/OS_NS_math.{h,inl}: Added support for floor() and ceiling() + for long double types. Thanks to Olivier Langlois for contributing this. + + * ace/Time_Value.{h,cpp}: Added support for operator<< and to + handle long double values better. Thanks to Olivier Langlois + for contributing this. + This fixes bugid 3818 and 2434. + +Sun Feb 21 16:28:47 UTC 2010 Douglas C. Schmidt + + * tests/Recursive_Condition_Test.cpp: Revised this test so that it + actually uses the ACE_Condition<> template, like it says in the + comments.. + +Sun Feb 21 16:20:35 UTC 2010 Douglas C. Schmidt + + * ace/Condition_T.cpp (ACE_Condition::wait): Changed the + call to mutex_.lock_ to mutex_.mutex() since lock_ is protected. + Thanks to Nick Meyer for + reporting this. + +Sun Feb 21 09:24:38 UTC 2010 Johnny Willemsen + + * ChangeLogs/*: + Use full year + +Sat Feb 20 20:26:47 UTC 2010 Johnny Willemsen + + * bin/MakeProjectCreator/config/global.features: + Also set dds4ccm_splie to 0 by default + +Fri Feb 19 19:34:47 UTC 2010 Johnny Willemsen + + * bin/MakeProjectCreator/config/global.features: + Set dds4ccm_opendds and dds4ccm_ndds to 0 by default. When + generating project files for dds4ccm we now have to enable + which dds implementation we want to use + +Wed Feb 17 10:02:47 UTC 2010 Johnny Willemsen + + * html/Stats/index.shtml: + Added link for MPC440 Xampler results + +Tue Feb 16 09:51:47 UTC 2010 Johnny Willemsen + + * include/makeinclude/platform_freebsd.GNU: + * include/makeinclude/platform_linux_common.GNU: + Set fox flags + + * include/makeinclude/platform_gnuwin32_common.GNU: + enabled no_hidden_visibility + +Mon Feb 15 19:28:47 UTC 2010 Johnny Willemsen * rpmbuild/ace-tao.spec: - Fixed problem with installation of nslist readme + Package nslist and catior readme files - * etc/index.html: - Added 5.7.7 +Mon Feb 15 12:10:47 UTC 2010 Johnny Willemsen + + * debianbuild/rules: + Removed some not needed steps + +Mon Feb 15 09:56:47 UTC 2010 Johnny Willemsen + + * configure.ac: + Fixed problem with latest autoconf tools + + * patches/97-fix-empty-elseif.dpatch: + Removed, not needed anymore + +Mon Feb 15 09:44:47 UTC 2010 Johnny Willemsen + + * debianbuild/patches/02-fltk-no-gl.dpatch + * debianbuild/patches/12-fix-fox-include.dpatch + * debianbuild/patches/13-fix-fox-errors.dpatch + * debianbuild/patches/14-autoconf-tao.dpatch + * debianbuild/patches/26-autoupdate.diff + * debianbuild/patches/35-autoconf-fix-else-fi.dpatch + * debianbuild/patches/36-autoconf-fix-fidone.dpatch + * debianbuild/patches/93-hack-to-fix-libtoolize.dpatch + * debianbuild/patches/98-ignore-win32-acdefun-error.diff + * debianbuild/patches/98-ignore-win32-acdefun-error.dpatch + Removed, not needed anymore, merged changes to trunk + +Mon Feb 15 09:40:30 UTC 2010 Martin Corino + + * include/makeinclude/platform_linux.GNU: + + Added support for cpumodelflag (-mcpu=) and tunemodelflag (-mtune=) flags. + +Mon Feb 15 09:38:47 UTC 2010 Johnny Willemsen + + * m4/ace.m4: + No need to link ftlk with gl + +Mon Feb 15 09:35:47 UTC 2010 Johnny Willemsen + + * ace/FoxReactor/FoxReactor.h: + User has to specify the full fox path now, some distributions now ship fox-1.6 and + fox-1.4 as directory names + +Mon Feb 15 09:20:30 UTC 2010 Johnny Willemsen + + * m4/ace_defines.m4: + Fixed fixes with latest releases of tools + + * m4/tao.m4: + Added here from TAO to get the distribution to work with the latest + versions of autoconf tools + +Mon Feb 15 06:49:30 UTC 2010 Johnny Willemsen + + * configure.ac: + Fixed fixes with latest releases of tools + +Sun Feb 14 19:46:30 UTC 2010 Johnny Willemsen + + * configure.ac: + * m4/ace.m4: + Integrated patches from below, created by Pau Garcia i Quiles + + + * debianbuild/patches/19-gcc43.dpatch: + Removed, not needed anymore + + * debianbuild/patches/94-build-crosscompile.dpatch: + * debianbuild/patches/96-build-athena3d.dpatch: + Removed, integrated into trunk + +Sun Feb 14 07:22:30 UTC 2010 Johnny Willemsen + + * debianbuild/*: + Imported last version from Pau Garcia i Quiles + +Sat Feb 13 15:59:26 UTC 2010 James H. Hill + + * ace/Unbounded_Set_Ex.h: + + Added STL iterator type traits support to the ACE_Unbounded_Set* + and its corresponding iterators. + +Fri Feb 12 19:19:30 UTC 2010 Johnny Willemsen + + * ace/Atomic_Op.h: + * ace/Containers_T.h: + Doxygen changes +Fri Feb 12 17:39:30 UTC 2010 Johnny Willemsen + + * tests/run_test.lst: + 2610 is working now + +Fri Feb 12 14:05:21 UTC 2010 Steve Huston + + * ace/Dev_Poll_Reactor.cpp: Fix unused variable warning. + +Fri Feb 12 10:36:30 UTC 2010 Johnny Willemsen + + * ace/config-g++-common.h: + Expanded autodetected support for GCC builtin __sync_XXX + atomic op functions to the IA64 platform + +Thu Feb 11 22:23:08 UTC 2010 Abdul Sowayan + + * THANKS: + + Added Trent Nadeau to the + hall of fame. + +Thu Feb 11 20:29:06 UTC 2010 Steven Stallion + + * bin/MakeProjectCreator/config/global.features: + + Disabled wireshark feature by default. + +Thu Feb 11 19:52:30 UTC 2010 Martin Corino + + * ace/config-g++-common.h: + + Expanded autodetected support for GCC builtin __sync_XXX + atomic op functions to all powerpc platforms. + +Thu Feb 11 12:18:24 UTC 2010 Vladimir Zykov + + * ace/Connector.cpp: + Added a call to remove_reference() for a svc handler owned by + non-blocking connection handler during connector's close(). + + * ace/Svc_Handler.cpp: + Removed the code that removes a reference to itself. Svc_Handler + doesn't own that reference and thus shouldn't remove it. + + * tests/Bug_2609_Regression_Test.cpp: + * tests/NonBlocking_Conn_Test.h: + * tests/Bug_2610_Regression_Test.cpp: + * tests/NonBlocking_Conn_Test.cpp: + Fixed the tests that implicitly assumed ownership of a reference + to a svc handler and didn't free it at the end of the test. + + * tests/Process_Strategy_Test.cpp: + Fixed the test that was broken by my change on + 'Mon Feb 8 16:21:06 UTC 2010'. The test incorrectly assumed + that close_handle() will not be called for svc handlers in + a parent process. + +Wed Feb 10 18:39:30 UTC 2010 Martin Corino + + * ace/config-g++-common.h: + + Added logic to detect (usable) support for GCC builtin __sync_XXX + atomic op functions. + + * ace/Atomic_Op.h: + * ace/Atomic_Op.inl: + + Changed autodetection for GCC builtin atomic ops so it will + only be used when really wanted. + Removed include for stdatomic.h because that has nothing to do with + the __sync_XXX builtins but rather with a *proposed* atomic op + implementation for the C++1x standard. The __sync_XXX builtins are + truly intrinsic, i.e. no header files involved. + +Wed Feb 10 15:38:30 UTC 2010 Johnny Willemsen + + * ACE-INSTALL.html: + Updated C++ builder support + +Wed Feb 10 10:53:30 UTC 2010 Johnny Willemsen + + * tests/run_test.lst: + Marked 2610 as not fixed + + * tests/Process_Strategy_Test.cpp: + Use prefix increment + +Wed Feb 10 10:45:00 UTC 2010 Simon Massey + + * tests/NonBlocking_Conn_Test.h: + * tests/NonBlocking_Conn_Test.cpp: + Fixed a VC9 compilation error (IGNORE is a vc9 #define). + +Tue Feb 9 15:03:35 UTC 2010 Douglas C. Schmidt + + * tests/NonBlocking_Conn_Test.cpp (hosts): Updated the list of hosts to + check to include news.bbc.co.uk. + +Tue Feb 9 09:14:48 UTC 2010 Vladimir Zykov + + * tests/NonBlocking_Conn_Test.h: + Fixed a compilation error. + +Mon Feb 8 18:53:30 UTC 2010 Johnny Willemsen + + * tests/run_test.lst: + Enabled 2609 and 2610 again, let us see how they run with the recent + changes from Vladimir + +Mon Feb 8 16:21:06 UTC 2010 Vladimir Zykov + + * ace/Strategies_T.cpp: + Changed the code so that close() is called in case of failure + instead of destroy(). + + * ace/Connector.cpp: + Changed a bit the code added by me on 'Wed Sep 2 14:45:27 UTC 2009' + as a fix for bug#3731. After some more thinking it turned out that + the original code could result in a crash when reference counting is + not enabled and thus svc_handler could be destroyed at the time + when there was an attempt to do remove_reference(). + + * ace/Svc_Handler.cpp: + Moved the code added by me on 'Thu Feb 4 11:15:57 UTC 2010' + from destroy() to handle_close(). + + * tests/NonBlocking_Conn_Test.h: + * tests/NonBlocking_Conn_Test.cpp: + Extended the test for using Svc_Handler with and without + reference counting. + +Mon Feb 8 11:35:30 UTC 2010 Johnny Willemsen + + * bin/ACETAOCIAO.style: + Updated with version 1.17 of Profactor Sylemanager + +Mon Feb 8 10:33:30 UTC 2010 Martin Corino + + * ace/ETCL/ETCL_l.cpp: + Fixed new GCC 4.4.x warning about ignoring return values of + function marked by the new warn_unused_result attribute. + +Sat Feb 6 18:58:30 UTC 2010 Martin Corino + + * include/makeinclude/wrapper_macros.GNU: + Fixed missing definitions for Icecream support. + +Sat Feb 6 15:03:30 UTC 2010 Martin Corino + + * include/makeinclude/wrapper_macros.GNU: + Added support for Icecream distributed compile system. + +Sat Feb 6 12:58:30 UTC 2010 Martin Corino + + * tests/Reactor_Performance_Test.cpp: + * tests/Reactor_Fairness_Test.cpp: + * ASNMP/asnmp/address.cpp: + * examples/Reactor/Misc/pingpong.cpp: + More fixes for strict-aliasing warnings. + +Sat Feb 6 11:28:30 UTC 2010 Martin Corino + + * ace/LSOCK.cpp: + Fixes for strict-aliasing warnings. + +Thu Feb 4 20:29:52 UTC 2010 Steve Huston + + * tests/Reactor_Fairness_Test.cpp: Don't try ACE_Dev_Poll_Reactor on + platforms without that capability; also added ACE_WFMO_Reactor to + the test (which triggered a crash shutting down WFMO_Reactor... I'm + looking into it). + +Thu Feb 4 15:32:24 UTC 2010 Steve Huston + + * tests/Reactor_Fairness_Test.cpp: + * tests/Reactor_Fairness_Test.h: + * tests/Makefile.am: + * tests/tests.mpc: + * tests/run_test.lst: New test to verify reactor fairness across a + set of registered I/O sockets. Tests Select, TP, Dev_Poll now. + TP fails fairness tests per Bugzilla 1031. Since the TP fairness + failure is a known issue, the new test is marked !FIXED_BUGS_ONLY. + + * ace/Dev_Poll_Reactor.cpp: + * ace/Dev_Poll_Reactor.h: Two performance improvements to resolve + Bugzilla #3714: + 1. The notify handler is no longer suspended/resumed around + notify processing. This removes the biggest source of CPU + consumption introduced at ACE 5.7 - simply acquiring/releasing + the token to handle notifies, each of which triggered another + token acquire/notify cycle. + 2. As I/O handlers are suspended before callback, they are not + immediately resumed on callback return. Instead, they are added + to a "to be resumed" list that is examined just prior to the + next epoll_wait() call; any to-be-resumed handles are added + back to the epoll set just before waiting. This removes another + need to acquire the token just to resume a handler. + +Thu Feb 4 11:15:57 UTC 2010 Vladimir Zykov + + * ace/Svc_Handler.cpp: + Fixed an unconditional delete of Svc_Handler in destroy(). If + reference counting is enabled then it has to do remove_reference(). + This completes the fix for bug#3731. + + * tests/NonBlocking_Conn_Test.cpp: + Changed www.pakarmy.gov.pk to www.pakistanarmy.gov.pk. The first + URL seems to be dead. + +Thu Feb 4 10:53:30 UTC 2010 Martin Corino + + * bin/PerlACE/Process_Unix.pm: + + Fixed problems concerning correct retrievel of process list. + +Thu Feb 3 09:57:30 UTC 2010 Johnny Willemsen + + * ace/Atomic_Op.inl: + Added support for the GCC Atomic Builtins, if you want to + use these, add ACE_HAS_GCC_ATOMIC_BUILTINS defined as 1 in + your config file + + * ace/Reactor.cpp: + * ace/Select_Reactor_Base.cpp: + Layout changes + + * ace/Reactor.h: + Doxygen change + +Tue Feb 2 19:57:30 UTC 2010 Martin Corino + + * bin/PerlACE/TestTarget_WinCE.pm: + * bin/PerlACE/Process_Unix.pm: + * bin/PerlACE/ProcessLVRT.pm: + * bin/PerlACE/TestTarget.pm: + * bin/PerlACE/TestTarget_VxWorks.pm: + * bin/PerlACE/ProcessVX.pm: + * bin/PerlACE/TestTarget_LVRT.pm: + * bin/PerlACE/Process_Win32.pm: + * bin/PerlACE/Process_VMS.pm: + + Added killall methods to the Process and Target frameworks. + Currently only full implementation on Win32 and *nix platforms + (empty on others). + +Tue Feb 2 19:52:30 UTC 2010 Johnny Willemsen + + * html/Stats/index.shtml: + Updated link to Cell results + +Mon Feb 1 23:16:24 2010 Steve Huston + + * ace/Acceptor.h: Fixed up doxygen for ACE_Oneshot_Acceptor. + +Tue Jan 26 03:56:45 UTC 2010 Douglas C. Schmidt + + * ace/Init_ACE.h: Updated the documentation of ACE::init() and + ACE::fini() so it reflects what ACE actually does. Thanks to + Steve Huston, Andrew Kaplan , and Alexander Mintz for motivating this update. + +Mon Feb 1 17:35:08 UTC 2010 Chris Cleeland + + * ace/Obstack_T.h: + * ace/Obstack_T.inl: + * ace/Obstack_T.cpp: + * ace/SStringfwd.h: + * ace/String_Base.h: + * ace/String_Base.inl: + * ace/String_Base.cpp: + * ace/Tokenizer_T.h: + * ace/Tokenizer_T.cpp: + + Integrated changes originally done in OCITAO 1.4a by Steve Totten + to fulfill [RT 13868]. + + Wed Feb 1 10:40:35 2006 Steve Totten + + Changed the use of "CHAR" as a template parameter to "ACE_CHAR_T" to + avoid possible clash with "CHAR" used as a preprocessor macro. + Thanks to Jennifer Kahng for + reporting the problem. This change resolves [RT 8287]. + +Mon Feb 1 11:21:30 UTC 2010 Johnny Willemsen + + * ace/Connector.cpp: + Const change + + * bin/diff-builds-and-group-fixed-tests-only.sh: + * etc/index.html: * docs/Download.html: - Updated for 5.7.7 + Updated because of recent release + + * tests/NonBlocking_Conn_Test.cpp: + Improved this test so that it really tests the connections + + * tests/tests.mpc: + Bug_3709_Regression itselfs checks now for vc71 + + * ace/Reactor.h: + Doxygen fixes + +Sun Jan 31 01:04:43 CST 2010 Johnny Willemsen + + * ACE version 5.7.6 released. + +Fri Jan 29 14:24:30 UTC 2010 Johnny Willemsen * docs/bczar/bczar.html: - Several updates because we now package on a FC12 system + Extended release steps - * debianbuild/rules: - Removed commented out part +Thu Jan 28 16:26:28 UTC 2010 Abdul Sowayan - * bin/make_release.py: - Next micro release will not ship msvc71 solutions, it is still - supported but the end user should generate the solutions him self. - Also WinCE solutions are not generated anymore for CIAO and the - autoconf bootstrapping is done much earlier in the release process - so when it fails we know early. The hostname check has been removed + * include/makeinclude/platform_macosx_iphone.GNU: - * bin/diff-builds-and-group-fixed-tests-only.sh: - Updated because of micro release + When building for the Simulator, there is no need to + set things as a cross-build and set HOST_ROOT environment + variable. + +Thu Jan 28 15:11:18 UTC 2010 Abdul Sowayan + + * ACE-INSTALL.html: + + Updated with information on how to build ACE for + iPhone/iPod Touch/iPad Simulator and Hardware. + +Thu Jan 28 12:49:45 UTC 2010 Abdul Sowayan + + * NEWS: + + ACE/TAO now supports the new iPad ;-). + +Thu Jan 28 10:21:30 UTC 2010 Martin Corino + + * include/makeinclude/platform_linux.GNU: + Corrected fix for cross compilation on powerpc64. + Now also allows for non-standard named crosscompilers (like ppu-xx) + and cross compilation of non-powerpc target on powerpc host. + +Thu Jan 28 08:21:30 UTC 2010 Johnny Willemsen + + * include/makeinclude/platform_linux.GNU: + Fix for cross compilation to powerpc64 + +Wed Jan 27 22:36:36 UTC 2010 Adam Mitz + + * include/makeinclude/platform_win32_msvc.GNU: + + Trim trailing slashes from libpath entries. + + * tests/Bug_3709_Regression_Test.cpp: + + This test doesn't compile on MSVC 7.1. + +Wed Jan 27 05:33:56 UTC 2010 Abdul Sowayan + + * ace/config-macosx-iphone-hardware.h: + + undefined ACE_HAS_SYSV_IPC, it doesn't seem that the + iphone-hardware platform supports it. + +Tue Jan 26 22:55:18 UTC 2010 Adam Mitz + + * bin/MakeProjectCreator/config/ace_mc.mpb: + + Assign to LDLIBS along with ACE_SHLIBS. ACE_SHLIBS is only used + when building a shared library, LDLIBS is used for an executable. + +Tue Jan 26 19:53:30 UTC 2010 Johnny Willemsen + + * tests/Process_Test.cpp: + Log some more details to get an insight why this test fails on + some systems + +Tue Jan 26 18:04:30 UTC 2010 Johnny Willemsen + + * bin/generate_rel_manpages: + Doxygen is upgraded to 1.6.2 + +Tue Jan 26 17:02:51 UTC 2010 Steve Huston + + * ace/Dev_Poll_Reactor.cpp (unbind_all): When shutting down, call + handle_close() on all registered handlers. Fixes Bugzilla 2750. + +Tue Jan 26 13:27:30 UTC 2010 Johnny Willemsen + + * include/makeinclude/platform_linux_common.GNU: + tao_idl3_to_idl2 is located in HOST_ROOT/TAO/CIAO/bin with + cross compilation + +Tue Jan 26 12:52:57 UTC 2010 Abdul Sowayan + + * ace/config-macosx-leopard.h: + + Added ACE_HAS_NET_IF_DL_H macro. + + * ace/os_include/net/os_if.h: + + Removed hardcoding of ACE_HAS_IPHONE and ACE_HAS_MAC_OSX + checks. If the platform defines ACE_HAS_NET_IF_DL_H macro, + then will be included. + +Tue Jan 26 04:35:17 UTC 2010 Abdul Sowayan + + * ace/config-macosx-leopard.h: + + Added ACE_HAS_MAC_OSX macro. + + * ace/OS_NS_netdb.cpp: + * ace/os_include/net/os_if.h: + + Enabled ACE_OS::getmacaddress() for Mac OSX as well. + It uses exactly the same code as the iPhone's addition below. + +Tue Jan 26 04:18:54 UTC 2010 Abdul Sowayan + + * ace/OS_NS_netdb.cpp: + + Implement ACE_OS::getmacaddress() for iPhone. The same implementation + will probably work on Mac OS X as well. I will verify this in the + future. + + * ace/os_include/net/os_if.h: + + Added "#include " to this file if ACE_HAS_IPHONE + is defined. The ACE_OS::getmacaddress() depends on this include + include file. + +Mon Jan 25 18:58:30 UTC 2010 Johnny Willemsen + + * ace/MEM_IO.cpp + Added casts to fix CB2010 warnings + +Mon Jan 25 18:49:30 UTC 2010 Johnny Willemsen + + * ace/SPIPE_Stream.inl: + Added casts to fix CB2010 warnings + +Mon Jan 25 14:51:09 UTC 2010 Chad Elliott + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Modified to best handle dependencies with a space or $(...) in + them. A GNU make substitute function call is used to escape + spaces. + +Mon Jan 25 09:24:30 UTC 2010 Johnny Willemsen + + * include/makeinclude/platform_macosx_iphone.GNU: + iPhone lacks rwho + +Sat Jan 23 18:48:30 UTC 2010 Johnny Willemsen + + * tests/Bug_2434_Regression_Test.cpp: + * tests/Time_Value_Test.cpp: + Moved another failing test to the bug_2434 file + +Sat Jan 23 13:53:30 UTC 2010 Martin Corino + + * tests/Thread_Attrs_Test.cpp: + + Changed test to check only if resulting stack size is + *at least* as large as requested. + As the Posix docs say that the size set for the threads stack + will be the *minimum* size allocated (the actual size may f.i. be + bigger because of a) pagesize rounding, b) guardsize addition) + this is the best we can do without konowing the exact algorithm + used by the pthread implementation. + Also see this https://bugzilla.redhat.com/show_bug.cgi?id=435337 + for more information. + +Fri Jan 22 10:38:30 UTC 2010 Martin Corino + + * config-linux-common.h: + + Added fix for mismatch of ACE_SIZEOF_LONG_DOUBLE on Linux ppc + 32bit platforms (sizeof(long double) = 128 bit). + +Fri Jan 22 08:48:30 UTC 2010 Johnny Willemsen + + * tests/Time_Value_Test.cpp: + Removed not used variable + +Thu Jan 21 23:16:27 UTC 2010 Abdul Sowayan + + * ace/CDR_Stream.cpp: + + Fixed the read_8 and write_8 methods for the iPhone Hardware. + The iPhone Hardware (ARM architecture) has the same memory + layout as Intel targets, and no conversion or swapping is + necessary. Double values sent from Windows to iPhone Hardware + were messed up before this fix due to unnecessary conversion. + + * ace/config-macosx-iphone-hardware.h: + * ace/config-macosx-iphone-simulator.h: + + Added ACE_HAS_IPHONE macro. + +Thu Jan 21 16:33:37 UTC 2010 Abdul Sowayan + + * include/makeinclude/platform_macosx_iphone.GNU: + + Removed the hardcoding of -DACE_AS_STATIC_LIBS and + -DTAO_AS_STATIC_LIBS to CFLAGS and CXXFLAGS and instead + added static_libs_only=1. That fixes the problem. Thanks + to Johnny Willemsen for the tip. + +Thu Jan 21 15:25:30 UTC 2010 Martin Corino + + * tests/Multicast_Test.cpp: + Fixed a Linux specific problem where certain Linux flavors use + VERY strict rules concerning multicast communications and where + using the (system defined) defaults for the network interface + used for multicast sending/receiving does not provide a + matching setup (i.e. resulting if used for sending does not + match the if used for receiving -> nothing received). + The fix simply forces a fixed 'lo' interface to be used for + sending and receiving. + +Thu Jan 21 14:57:57 UTC 2010 Abdul Sowayan + + * include/makeinclude/platform_macosx_iphone.GNU: + + Added -DACE_AS_STATIC_LIBS and -DTAO_AS_STATIC_LIBS to the CFLAGS + and CXXFLAGS variables to allow more tests to pass on the iPhone + Simulator. This hardcoding is obviously the wrong thing to do, + and needs to be fixed in the future. For some reason, when building + a static executable those macros are missing. + +Thu Jan 21 08:13:30 UTC 2010 Johnny Willemsen + + * tests/Time_Value_Test.cpp: + * tests/tests.mpc: + * tests/run_test.lst: + * tests/Bug_2434_Regression_Test.cpp: + Moved the 64bit overflow test which fails on 64bit systems to + its own file and marked that as not fixed + + * tests/Multicast_Test.cpp: + Const changes + +Tue Jan 19 13:24:02 UTC 2010 Olli Savia + + * tests/Bug_2980_Regression_Test.cpp: + Added missing #include . + +Mon Jan 18 17:57:47 UTC 2010 James H. Hill + + * ace/UUID.h: + + Included Auto_Ptr.h since it is not included by other included + header files and in breaking builds if UUID.h is included before + including another file that does include Auto_Ptr.h + +Mon Jan 18 13:47:53 UTC 2010 Douglas C. Schmidt + + * ace/ace_for_tao.mpc: Added Message_Queue_NT.cpp in this file since + it seems to be needed for the ACE_FOR_TAO subset. + +Fri Jan 15 10:27:30 UTC 2010 Olli Savia + + * ace/config-lynxos.h: + Define __NO_INCLUDE_WARN__ before including param.h. + Fixes compile warnings. + +Fri Jan 15 10:22:06 UTC 2010 Olli Savia + + * ace/Registry.cpp: + Fixed g++ 4.x compile warning on MinGW. + +Fri Jan 15 10:19:48 UTC 2010 Olli Savia + + * ace/config-win32-common.h: + Simplified setting of ACE_HAS_NONSTATIC_OBJECT_MANAGER. + +Fri Jan 15 04:19:45 UTC 2010 Douglas C. Schmidt + + * ace/Message_Queue_T.cpp: Readded + + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) + #include "ace/Message_Queue_NT.h" + #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ + + to fix a compile error on MinGW. Thanks to Olli Savia + for this fix. + +Fri Jan 15 04:18:17 UTC 2010 Douglas C. Schmidt + + * ace/Message_Queue_NT.cpp: Added + + #include "ace/Message_Queue.h" + + to fix a compile error on MinGW. Thanks to Olli Savia + for this fix. + +Fri Jan 15 04:17:06 UTC 2010 Douglas C. Schmidt + + * ace/Message_Queue.h: Once again removed + + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) + #include "ace/Message_Queue_NT.h" + #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ + + from this file.. + +Fri Jan 15 04:14:49 UTC 2010 Douglas C. Schmidt + + * ace/config-win32-common.h: Changed the definition + + # define ACE_HAS_NONSTATIC_OBJECT_MANAGER + + to + + # define ACE_HAS_NONSTATIC_OBJECT_MANAGER 0 + + to fix a compile error on MinGW. Thanks to Olli Savia + for this fix. + +Fri Jan 15 01:01:02 UTC 2010 Abdul Sowayan + + * tests/Thread_Attrs_Test.cpp: + + Slight modification to allow this test to pass on the iPhone + builds. Changed the spanwed thread's size from 42k to 40k. + + According to Apple's Documentation: "The minimum allowed stack + size for secondary threads is 16 KB and the stack size must be + a multiple of 4 KB." My change make the stack size a multiple + of 4k. Below is a reference to the Apple documentation for the + iPhone where I got the quote. + + http://developer.apple.com/iphone/library/documentation/Cocoa/Conceptual/Multithreading/CreatingThreads/CreatingThreads.html + +Thu Jan 14 20:06:49 UTC 2010 Abdul Sowayan + + * include/makeinclude/platform_macosx_iphone.GNU: + + Added "CROSS-COMPILE=1" to the top of the file. + +Thu Jan 14 20:02:41 UTC 2010 Douglas C. Schmidt + + * ace/OS_NS_Thread.cpp (add_to_argv): Replaced a call to strcpy() + with memmove() to avoid problems due to overlap with the + parameters. Thanks to Guillaume Lahaye for reporting this. + +Thu Jan 14 13:04:19 UTC 2010 Johnny Willemsen + + * tests/OS_Test.cpp: + Unicode fix + +Wed Jan 13 21:20:42 UTC 2010 Olli Savia + + * ace/README: + Removed ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS and + ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS. These are no longer used. + +Wed Jan 13 21:18:42 UTC 2010 Olli Savia + + * tests/Reference_Counted_Event_Handler_Test.cpp: + Fixed typo. + +Wed Jan 13 14:40:35 UTC 2010 Douglas C. Schmidt + + * ace/Message_Queue.h: Moved + + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) + #include "ace/Message_Queue_NT.h" + #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ + + back to this file based on comments from Arto. + +Wed Jan 13 13:51:54 UTC 2010 Douglas C. Schmidt + + * ace/Message_Queue_T.cpp: Moved + + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) + #include "ace/Message_Queue_NT.h" + #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ + + to outside the versioned namespace block. Thanks to Johnny for + reporting this. + +Wed Jan 13 09:03:19 UTC 2010 Johnny Willemsen + + * bin/fuzz.pl: + Only check run*.pl files when the filenames starts with run + +Wed Jan 13 06:45:19 UTC 2010 Johnny Willemsen + + * ace/os_include/sys/os_types.h: + * ace/OS_NS_arpa_inet.cpp: + * ace/OS_NS_unistd.inl: + VxWorks 6.8 fixes + + * ace/UUID.cpp: + Only one exit point for operator=, const change, initialise pointer with 0 + +Wed Jan 13 03:24:06 UTC 2010 Douglas C. Schmidt + + * ace/Message_Queue.h, + * ace/Message_Queue_T.cpp: Moved the code + + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) + #include "ace/Message_Queue_NT.h" + #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ + + from ace/Message_Queue.h to ace/Message_Queue_T.cpp since that + is more localized. + +Wed Jan 13 02:54:10 UTC 2010 Douglas C. Schmidt + + * ace/XtReactor/XtReactor.cpp: Removed stray tabs. Thanks to + Johnny for reporting this. + +Tue Jan 12 20:25:19 UTC 2010 Johnny Willemsen + + * bin/fuzz.pl: + Disable run_test.pl checking for some directories that + aren't converted yet + +Tue Jan 12 19:52:04 UTC 2010 Olli Savia + + * ace/Time_Value.inl: + Fixed typo. + + * ace/config-openbsd.h: + Removed ACE_LACKS_STRFTIME. + +Tue Jan 12 19:41:07 UTC 2010 Olli Savia + + * ace/config-integritySCA.h: + Removed ACE_LACKS_FILE_FCNTL. It is no longer used. + +Tue Jan 12 19:36:32 UTC 2010 Olli Savia + + * ace/config-openbsd.h: + Removed ACE_LACKS_EXECINFO_H. It is no longer used. + +Tue Jan 12 19:33:25 UTC 2010 Olli Savia + + * ace/os_include/netinet/os_tcp.h: + * configure.ac: + Fixed typo. + +Tue Jan 12 19:28:32 UTC 2010 Olli Savia + + * ace/config-integritySCA.h: + Removed ACE_LACKS_USER. It is no longer used. + +Tue Jan 12 19:24:54 UTC 2010 Olli Savia + + * ace/config-netbsd.h: + Removed ACE_LACKS_WSCANF. It is no longer used. + +Tue Jan 12 19:22:23 UTC 2010 Olli Savia + + * ace/config-mvs.h: + Removed ACE_LACKS_SYS_NERR. It is no longer used. + +Tue Jan 12 19:19:26 UTC 2010 Olli Savia + + * ace/config-netbsd.h: + Removed ACE_LACKS_SWSCANF. It is no longer used. + +Tue Jan 12 19:15:19 UTC 2010 Olli Savia + + * ace/OS_NS_stdlib.h: + Fixed typo. + + * ace/README: + Removed ACE_LACKS_SID and ACE_LACKS_STRCHR. + These are no longer used. + + * ace/config-integritySCA.h: + Removed ACE_LACKS_SHARED_MEMORY. It is no longer used. + +Tue Jan 12 19:04:15 UTC 2010 Olli Savia + + * ace/config-mvs.h: + Removed ACE_LACKS_MSGBUF_T. It is no longer used. + +Tue Jan 12 18:52:21 UTC 2010 Olli Savia + + * ace/README: + Removed ACE_LACKS_CMSG_DATA_MACRO and ACE_LACKS_CMSG_DATA_MEMBER. + These are no longer used. + +Tue Jan 12 14:18:58 UTC 2010 Olli Savia + + * ace/CDR_Base.h: + Removed obsolete comment. + + * ace/config-lynxos.h: + Minor cleanup. + +Mon Jan 11 13:53:54 UTC 2010 Douglas C. Schmidt + + * ace/XtReactor/XtReactor.{h,cpp}: Added a fix for BugID 3775. + Thanks to Dirk Bonekaemper + for this fix. + +Mon Jan 11 02:24:01 UTC 2010 Douglas C. Schmidt + + * ace/config-macros.h (ACE_WIN32CALL_RETURN): Changed + + TYPE ace_result_ = (TYPE) X; \ + + to + + TYPE ace_result_; \ + ace_result_ = (TYPE) X; \ + + to fix a compile error on MinGW. Thanks to Arto Jalkanen + for this fix. + +Mon Jan 11 02:20:09 UTC 2010 Douglas C. Schmidt + + * ace/Message_Queue.h: Added + + #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) + #include "ace/Message_Queue_NT.h" + #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ + + to fix a compile error on MinGW. Thanks to Arto Jalkanen + for this fix. + +Tue Jan 12 04:12:41 UTC 2010 Abdul Sowayan + + * ace/config-macosx-iphone-hardware.h: + * ace/config-macosx-iphone-simulator.h: + + Split the below file to the two files listed above. + + * ace/config-macosx-iphone.h: + + Removed this file. + +Tue Jan 12 02:10:48 UTC 2010 Abdul Sowayan + + * include/makeinclude/platform_macosx_iphone.GNU: + + crt1.10.6.o is missing under MacOSX 10.6 for iPhone Simulator. + Fallback to 10.5 until apple provides the missing crt1.10.6.o + +Sat Jan 9 00:42:55 UTC 2010 Abdul Sowayan + + * ace/config-macosx-iphone.h: + + added "#define ACE_SIZEOF_LONG_DOUBLE 8" since this is the size + of long double on my iPhone 3GS. The value of long double in the + simulator is probably different. We need to adjust this once + we verify that the simulator value is different than the + hardware's value. + +Wed Jan 6 05:25:26 UTC 2010 Abdul Sowayan + + * include/makeinclude/platform_macosx_iphone.GNU: + + When building an executable for the iPhone Hardware (not simulator) + go ahead and automatically codesign the executable so it can be + deployed on the hardware. Note that this is a temporary hack until + I can figure the proper way to do this. + +Wed Jan 6 04:28:23 UTC 2010 Abdul Sowayan + + * include/makeinclude/platform_macosx_iphone.GNU: + + Minor enhancement. + +Mon Jan 4 20:09:39 UTC 2009 Johnny Willemsen + + * rpmbuild/ace-tao.spec + Also dump lsb_release info + +Fri Jan 1 03:09:45 UTC 2010 Douglas C. Schmidt + + * Happy New Year everyone!!! + +Thu Dec 31 20:54:51 UTC 2009 Steve Huston + + * ace/High_Res_Timer.cpp (get_cpuinfo): Don't use a CPU MHz value 0. + I got a customer report with a real cpuinfo file showing 0. + +Thu Dec 31 17:46:10 UTC 2009 Steve Huston + + * bin/MakeProjectCreator/config/ace_fl.mpb: Rather than add + PLATFORM_GL_LDFLAGS twice, one should be PLATFORM_X11_LDFLAGS. + Thanks to Aaron Scamehorn for catching this. + +Thu Dec 31 17:24:14 UTC 2009 Steve Huston + + * include/makeinclude/wrapper_macros.GNU: If both static_libs_only + and shared_libs_only are set, report the error and stop. Thanks to + Howard Finer for reporting this. + +Thu Dec 31 12:27:00 UTC 2009 Johnny Willemsen + + * bin/fuzz.pl: + Fixed fuzz check for Spawn with Stop + +Wed Dec 30 08:41:03 UTC 2009 Olli Savia + + * ace/Sig_Handler.cpp: + Do not use SA_SIGINFO on LynxOS. + +Thu Dec 24 10:55:00 UTC 2009 Johnny Willemsen + + * performance-tests/RPC/run_test.pl + * performance-tests/SCTP/run_spectrum.pl + * performance-tests/TCP/run_test.pl + * performance-tests/UDP/run_test.pl + Fuzz fixes + +Thu Dec 24 10:49:00 UTC 2009 Johnny Willemsen + + * protocols/tests/HTBP/ping/run_test.pl + * protocols/tests/HTBP/Reactor_Tests/run_test.pl + * protocols/tests/HTBP/Send_Large_Msg/run_test.pl + * protocols/tests/HTBP/Send_Recv_Tests/run_test.pl + * tests/run_test.pl + Fixed fuzz + +Thu Dec 24 10:20:00 UTC 2009 Johnny Willemsen + + * apps/gperf/src/Bool_Array.h: + * apps/gperf/src/Key_List.h: + Fixes for C++ Builder 2010 Update 4/5 + +Thu Dec 24 09:54:00 UTC 2009 Johnny Willemsen + + * ace/OS_NS_string.cpp: + Const changes, layout changes, call ACE_OS::strncat instead of + strncat directly + + * ace/Log_Msg.cpp: + * ace/Log_Msg.h: + Const changes + + * ace/config-win32-borland.h: + C++ Builder 2010 has a broken wcsncat, reported as QC80630, for + this version we now enable the ACE emulation for wcsncat + + * ace/OS_NS_wchar.cpp: + Initialise some pointers with 0 + +Mon Dec 21 11:29:00 UTC 2009 Johnny Willemsen + + * bin/fuzz.pl: + Fixed error message and added a test for generated file headers + +Mon Dec 21 11:26:00 UTC 2009 Johnny Willemsen + + * bin/bootstrap: + Invoke autoupdate as part of this script + +Sun Dec 20 07:58:00 UTC 2009 Johnny Willemsen + + * ace/checked_iterator.h: + stl port doesn't have a checked iterator. This fixes bugzilla + 3799 and 3420. Thanks to and + Mark Hebbel for + reporting this + +Fri Dec 18 17:40:00 UTC 2009 Johnny Willemsen + + * bin/PerlACE/ProcessVX_Unix.pm: + * bin/PerlACE/ProcessVX_Win32.pm: + Added IgnoreHostRoot + +Fri Dec 18 12:55:00 UTC 2009 Martin Corino + + * NEWS: + Updated fixed bugzilla entries. + +Thu Dec 17 12:29:00 UTC 2009 Martin Corino + + * ace/INET_Addr.inl: + Fixed bug in ::is_multicast() for little-endian platforms. + This fixes Bugzilla #3729. + + * tests/Bug_3729_Regression_Test.cpp: + Fixed typo in logfile name. + + * tests/run_test.lst: + Removed !FIXED_BUGS_ONLY for Bug_3729_Regression_Test. + +Wed Dec 16 11:24:00 UTC 2009 Martin Corino + + * ACE_wrappers/ace/Log_Msg.h: + Updated doxygen docu regarding additions to %D and %T + options. + +Wed Dec 16 09:09:00 UTC 2009 Martin Corino + + * ACE_wrappers/ace/ACE.h: + * ACE_wrappers/ace/ACE.cpp: + * ACE_wrappers/ace/Log_Msg.cpp: + Added option to print a given ACE_Time_Value in the log + message instead of system supplied timestamp as in %T + and %D. + The option is implemented as a variant of the %D/%T + options by using the '#' flag character like '%#D' or + '%#T'. When using this flag an ACE_Time_Value pointer is + expected in the argument list supplied with the log message. + This fixed Bugzilla #3221. + + * ACE_wrappers/tests/Log_Msg_Test.cpp: + Added some testlines for this option. + +Mon Dec 14 14:58:05 UTC 2009 Abdul Sowayan + + * NEWS: + + Updated to note iPhone/iPod Touch support. + +Mon Dec 14 11:21:46 UTC 2009 Johnny Willemsen + + * html/Stats/index.shtml: + Updated link to PS3/IBM Cell performance graphs + +Mon Dec 14 10:58:46 UTC 2009 Johnny Willemsen + + * examples/Export/run_test.pl: + Fixed fuzz error + +Sun Dec 13 22:38:13 UTC 2009 Abdul Sowayan + + * include/makeinclude/platform_macosx_iphone.GNU: + + Changed to allow iPhone Hardware compiler to generate executables. + +Sun Dec 13 18:30:26 UTC 2009 Abdul Sowayan + + * include/makeinclude/platform_macosx_iphone.GNU: + + Enhanced iPhone support. Now we can build for the iPhone + Hardware target in addition to the simulator. + +Sat Dec 12 15:40:13 UTC 2009 Abdul Sowayan + + * ace/config-macosx-iphone.h: + * include/makeinclude/platform_macosx_iphone.GNU: + + First cut at supporting iPhone 3.1.2. These files need + some cleanup. With these files, using the iPhone simulator + I was able to spawn ACE Threads, print ACE Logs messages, + and communicate between the the iPhone simulator and a + Windows machine using CORBA. + +Thu Dec 10 20:03:58 UTC 2009 Johnny Willemsen + + * bin/fuzz.pl: + Improved error message + +Thu Dec 10 15:37:58 UTC 2009 Johnny Willemsen + + * bin/ACETAOCIAO.style: + Small updates + +Thu Dec 10 15:10:58 UTC 2009 Johnny Willemsen + + * bin/fuzz.pl: + Check all run_*.pl files for fuzz + +Thu Dec 10 13:07:58 UTC 2009 Johnny Willemsen + + * ace/config-win32-borland.h: + Removed hard supported version check + +Wed Dec 9 10:52:26 UTC 2009 Denis Budko + + * bin/fuzz.pl: + + Updated conditions for new framework + +Mon Dec 7 16:09:18 UTC 2009 Steve Huston + + * tests/Basic_Types_Test.cpp: Add a verification for the endianness + setting. + +Mon Dec 7 07:40:00 UTC 2009 Johnny Willemsen + + * bin/MakeProjectCreator/config/bmake.features: + Disable mcpp for bmake + +Fri Dec 4 23:24:21 UTC 2009 Yan Dai + + * bin/MakeProjectCreator/config/global.features: + + Added mpc feature to optionally turn on the indirection + support on valuetype outgoing message. It defaults to + be enabled. To be compatible with previous version TAO, + it needs run mwc.pl with + "-features valuetype_out_indirection=0" to disable it. + +Fri Dec 4 17:25:32 UTC 2009 Yan Dai + + * NEWS: + + Removed entry for member validation feature in LoadBalancer as it + should be in TAO NEWS. + +Fri Dec 4 13:19:00 UTC 2009 Johnny Willemsen + + * html/Stats/index.shtml: + Added link for IBM Cell xampler performance stats + +Fri Dec 4 10:20:23 UTC 2009 Marcel Smit + + * bin/fuzz.pl: + Removed -v option. The information which is generated + by -v should always be visible. + +Fri Dec 4 07:30:00 UTC 2009 Johnny Willemsen + + * ace/config-win32-borland.h: + CB2010 fix + +Thu Dec 3 11:59:00 UTC 2009 Johnny Willemsen + + * bin/fuzz.pl: + Check CIAO_TRACE macros and put all run_*.pl files in a separate + list + +Wed Dec 2 18:17:04 UTC 2009 Yan Dai + + * NEWS: + + Added entry for member validation feature in LoadBalancer. + +Wed Dec 2 13:46:00 UTC 2009 Martin Corino + + * debianbuild/{all files containign version numbers}: + Updated to latest micro release. + +Wed Dec 2 13:30:00 UTC 2009 Martin Corino + + * bin/make_release.py: + Added code to update version numbers in ACE_ROOT/debianbuild files + on release. + Changed to retrieve repo root by default from info of working copy. + +Wed Dec 2 07:51:00 UTC 2009 Johnny Willemsen + + * bin/copy-script.sh: + Also copy md5 files + + * bin/MakeProjectCreator/config/bmake.features: + Enable mcpp for bmake + +Thu Nov 26 02:08:59 UTC 2009 Douglas C. Schmidt + + * Gaurav Kulshreshtha is the 2300th contributor to ACE+TAO+CIAO! + +Mon Nov 30 19:11:00 UTC 2009 Johnny Willemsen + + * apps/gperf/src/Bool_Array.h: + * apps/gperf/src/Key_List.h: + C++ Builder 2010 fixes + +Mon Nov 30 14:02:00 UTC 2009 Johnny Willemsen + + * ace/Process.cpp: + * ace/Process.h: + Fixed gcc warnings + +Mon Nov 30 12:38:00 UTC 2009 Johnny Willemsen + + * ace/config-win32-borland.h: + Started port to C++ Builder 2010, older versions of C++ Builder are + now deprecated + + * ace/MMAP_Memory_Pool.cpp: + Layout change + + * ace/OS_NS_sys_time.h: + * ace/OS_NS_sys_time.inl: + Removed workarounds for ancient wince versions + + * ace/Process.cpp: + * ace/Process.h: + Use bool and size_t and removed some ugly casts + + * ace/Trace.cpp: + * ace/Trace.h: + Use bool + +Mon Nov 30 10:53:00 UTC 2009 Johnny Willemsen + + * debianbuild/patches/18-fix-bswap-detection.dpatch: + * debianbuild/patches/22-tao_idl-64bit-fix.dpatch: + Removed, not needed anymore + +Mon Nov 30 10:08:00 UTC 2009 Martin Corino + + * include/makeinclude/platform_linux_common.GNU: + + Added some rules to support cross builds. + Setting the environment variable (or make variable) CROSS_COMPILE + to the platform tool prefix will redefine the CC, CXX and AR + variables and add a '-Wl,-rpath-link' option to the LDFLAGS. + If the HOST_ROOT variable has been set as well TAO_IDLxxx variables + will be redefined as well. + +Mon Nov 30 08:58:00 UTC 2009 Johnny Willemsen + + * bin/diff-builds-and-group-fixed-tests-only.sh: + * bin/Download.html: + updated for x.7.5 + + * bin/make_release.py + * rpmbuild/ace-tao-ciao.spec + * rpmbuild/ace-tao.spec + Updated to match opensuse build service + + * docs/svn/svn-prefs.reg: + Added idl3+ + + * etc/index.html: + Added 5.7.5 + +Sun Nov 29 13:06:02 CST 2009 Johnny Willemsen + + * ACE version 5.7.5 released. + +Thu Nov 26 12:33:00 UTC 2009 Johnny Willemsen + + * tests/Message_Queue_Test.cpp: + Fixed msvc warning + +Thu Nov 26 04:19:02 UTC 2009 William R. Otte + + * tests/Message_Queue_Test.cpp: + + Attempt to resolve warning for MSVC. + +Tue Nov 24 09:39:00 UTC 2009 Johnny Willemsen + + * ace/Tokenizer_T.cpp: + Check if buffer_ is not nil + + * bin/fuzz.pl: + Export files shouldn't be in the ciao repository anymore, all + should be generated by TAO_IDL + +Mon Nov 23 10:56:18 UTC 2009 Marcel Smit + + * THANKS: + Added Wolfgang Pickartz.for solving a TAO_IDL compiler + issue. + +Mon Nov 23 07:53:57 UTC 2009 Johnny Willemsen + + * debianbuild/changelog: + * debianbuild/control: + * debianbuild/dsc: + * debianbuild/rules: + Imported last version from debian + +Thu Nov 19 20:29:57 UTC 2009 Douglas C. Schmidt + + * ace/Log_Msg_NT_Event_Log.cpp (ACE_Log_Msg_NT_Event_Log::log): + Added checks to ensure that log() works properly if the msg_data + size is greater than ACE_Log_Record::MAXLOGMSGLEN. Thanks to + Gaurav Kulshreshtha for contributing this fix. + +Fri Nov 20 08:45:52 UTC 2009 Olli Savia + + * ace/Log_Msg.cpp: + Updated documentation for '%S' modifier. + +Fri Nov 20 07:06:04 UTC 2009 Olli Savia + + * ace/Sig_Handler.cpp: + Reverted: Sun Nov 1 16:47:29 UTC 2009 Olli Savia + +Thu Nov 19 14:08:29 UTC 2009 Olli Savia + + * ace/Sig_Handler.cpp: + Reverted: Mon Nov 2 08:36:24 UTC 2009 Olli Savia + +Wed Nov 19 09:45:00 UTC 2009 Johnny Willemsen + + * ace/config-WinCE.h: + Only define FILE_MAP_COPY when it is not defined yet + +Mon Nov 16 14:40:42 UTC 2009 Olli Savia + + * include/makeinclude/platform_win32_interix.GNU: + * ace/config-win32-interix.h: + * ace/os_include/sys/os_types.h: + Updated Interix support. + +Sun Nov 15 08:09:00 UTC 2009 Johnny Willemsen + + * debianbuild/*: + Renamed all files for x.7.4 + +Fri Nov 13 19:38:00 UTC 2009 Johnny Willemsen + + * bin/fuzz.pl: + Sys::Hostname shouldn't be used in a test script, use HostName on + the test target instead + +Fri Nov 13 01:54:01 UTC 2009 William R. Otte + + * include/makeinclude/platform_macosx_common.GNU: + * include/makeinclude/platform_macosx_snowleopard.GNU: + + Added support for buildbits=universal for building 32/64 bit + universal binaries with GCC. + +Fri Nov 13 01:12:33 UTC 2009 William R. Otte + + * include/makeinclude/platform_macosx_common.GNU: + + Fixed 32 bit support. + +Fri Nov 13 00:33:49 UTC 2009 Yan Dai + + * ace/Logging_Strategy.h: + * ace/Logging_Strategy.cpp: + + Added static service declaration and definition to fix loading + issue in TAO Service (e.g Notify) in static builds. + +Thu Nov 12 15:53:15 UTC 2009 Johnny Willemsen + + * bin/fuzz.pl: + Exteded perl fuzz checks + +Thu Nov 12 08:31:00 UTC 2009 Denis Budko + + * docs/run_test.txt + Added description of TestTarget::HostName() function usage + +Thu Nov 12 06:54:15 UTC 2009 Johnny Willemsen + + * ace/Default_Constants.h: + * ace/OS_NS_fcntl.h: + * ace/RW_Process_Mutex.h: + Moved all constants to Default_Constants.h + +Wed Nov 11 14:57:15 UTC 2009 Olli Savia + + * tests/run_test.lst: + Run Network_Adapters_Test and SOCK_Dgram_Bcast_Test on LynxOS. + +Wed Nov 11 13:49:11 UTC 2009 Olli Savia + + * ace/config-freebsd.h: + Added ACE_HAS_SIGISMEMBER_BUG. + +Wed Nov 11 12:07:36 UTC 2009 Olli Savia + + * bin/fuzz.pl: + Added strsignal to functions that is checked + for the lack of ACE_OS. + +Wed Nov 11 11:45:23 UTC 2009 Olli Savia + + * ace/OS_NS_string.h: + Doxygen updates. + +Wed Nov 11 11:36:26 UTC 2009 Olli Savia + + * ace/OS_NS_signal.inl: + * ace/config-lynxos.h: + * ace/os_include/os_signal.h: + * configure.ac: + * m4/config_h.m4: + * m4/platform.m4: + Renamed ACE_HAS_LYNXOS_SIGNALS to ACE_HAS_LYNXOS4_SIGNALS. + +Wed Nov 11 09:36:32 UTC 2009 Johnny Willemsen + + * bin/fuzz.pl: + Extended Id check to detect Id: + +Wed Nov 11 03:07:32 UTC 2009 William R. Otte + + * include/makeinclude/platform_macosx_snowleopard.GNU: + + Add support for building 32 bits. + +Tue Nov 10 21:03:25 UTC 2009 William R. Otte + + * bin/sets-manager.py: + + bugfix for windows. note that cleaning up the temp directory doesn't + work on windows, that will need to be done by hand. + +Tue Nov 10 12:17:33 2009 Johnny Willemsen + + * bin/fuzz.pl: + Check for hardcoded timeouts, thanks to Chad for assisting with this + +Tue Nov 10 12:10:33 2009 Johnny Willemsen + + * bin/fuzz.pl: + ACE_RUN_VX_TGTHOST shouldn't be used in a test script + +Tue Nov 10 06:31:33 2009 Steve Huston + + * ace/Message_Queue_T.cpp (enqueue_*): When enqueuing blocks, grab the + notifier pointer before releasing the guard; check it and do any + needed notify() outside the lock scope. Avoids dereferencing 'this' + when the message queue is deleted between the time the guard is + released and the notify is checked. User is still responsible for + ensuring the lifetime of a notifier the user supplies. + Also, moved the monitor updates out of notify() and into the + enqueue_* methods, inside the guard scope since they refer to + object state; rely on the Monitor docs that say the updates are + well-behaved. + +Tue Nov 10 00:35:52 UTC 2009 Steve Huston + + * ace/Dev_Poll_Reactor.cpp: Some changes extraneous to those in + Wed Nov 4 00:07:49 UTC 2009 Steve Huston + got checked in by accident; these screwed up the handle resuming + and are now reverted. The changes/fix mentioned in + Wed Nov 4 00:07:49 UTC 2009 Steve Huston + are now the only ones included. + +Mon Nov 9 12:20:05 UTC 2009 William R. Otte + + * tests/Message_Queue_Test.cpp: + + Modified to use rand_r, which is actually thread safe. + +Mon Nov 9 03:41:21 UTC 2009 William R. Otte + + * tests/Message_Queue_Test.cpp: + + Another attempt at fixing this problem on Snow Leopard, hopefully + less disruptive than the last attempt. + +Sat Nov 7 08:32:47 UTC 2009 Johnny Willemsen + + * ace/Basic_Types.h: + Fix long double for ppc64 + +Fri Nov 6 11:41:47 UTC 2009 Johnny Willemsen + + * bin/fuzz.pl: + Reverted the change to check all perl scripts + +Fri Nov 6 10:13:00 UTC 2009 Simon Massey + + * ace/Tokenizer_T.cpp: + + Allow tokens to have embedded quotes so that + tao_idl, which generates parameters such as + -I"directory with spaces", actually works. + + I.E. Only remove surrounding quotes. With + embedded quotes; the original code simply + returned the token when the quote character + was detected, without inserting a token splitting + null at the quote character (which if it had, + would then mess up the next quoted token + processing). This ment that the parameters got + repeated many times over as they are inserted + and interpreted again and again. + +Fri Nov 6 08:30:47 UTC 2009 Johnny Willemsen + + * bin/fuzz.pl: + Also check cdp files for tabs + +Thu Nov 5 20:13:47 UTC 2009 Olli Savia + + * ace/ACE.h: + * ace/ACE.inl: + * ace/ACE.cpp: + Moved nibble2hex from .inl to .cpp file to avoid static + data in inline function. + +Thu Nov 5 13:58:25 UTC 2009 Olli Savia + + * ace/OS_NS_stdlib.h: + Another fix for platforms that define ACE_STRTOLL_EQUIVALENT or + ACE_STRTOULL_EQUIVALENT. + +Thu Nov 5 13:46:34 UTC 2009 Olli Savia + + * ace/OS_NS_stdlib.h: + Fix for platforms that lack strtoll or strtoull. + +Thu Nov 5 11:56:13 UTC 2009 Olli Savia + + * ace/OS_NS_stdlib.h: + * ace/OS_NS_stdlib.inl: + Added ace_strtoll_helper and ace_strtoull_helper to fix compile + errors if strtoll or strtoull is macro. + +Thu Nov 5 11:32:07 UTC 2009 Olli Savia + + * ace/config-lynxos.h: + * ace/os_include/os_signal.h: + Use ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES instead of + ACE_HAS_LYNXOS50_SIGNALS. + +Wed Nov 4 20:57:08 UTC 2009 Yan Dai + + * bin/MakeProjectCreator/config/global.features: + + Set notify_monitor_control default value be 0. + +Wed Nov 4 17:50:05 UTC 2009 Johnny Willemsen + + * tests/Message_Queue_Test.cpp: + Improved portability + +Wed Nov 4 14:51:00 UTC 2009 Olli Savia + + * tests/Bug_3758_Regression_Test.cpp: + * tests/OS_Test.cpp: + * tests/run_test.lst: + * tests/tests.mpc: + Moved regression test for 3758 to its own file. + +Wed Nov 4 11:39:05 UTC 2009 Johnny Willemsen + + * html/index.html: + Updated description for DDS4CCM documentation + +Wed Nov 4 00:07:49 UTC 2009 Steve Huston + + * ace/Dev_Poll_Reactor.cpp (resume_handler_i): If asked to resume a + handler without any bits currently set, just note the handler has + been resumed, don't fail it. Prevents orphaned handle if a + auto-suspended handler's callback clears the lone bit set. + +Mon Nov 2 13:45:05 UTC 2009 Johnny Willemsen + + * ace/RW_Process_Mutex.h: + * ace/Default_Constants.h: + Added ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS with which the end user + can override the default permissions + + * ace/Addr.inl: + * ace/MMAP_Memory_Pool.cpp: + Doxygen changes + +Mon Nov 2 08:52:05 UTC 2009 Olli Savia + + * tests/OS_Test.cpp: + Enhanced strsignal test to test with negative signal numbers. + +Mon Nov 2 08:40:08 UTC 2009 Olli Savia + + * tests/run_test.lst: + Run Signal_Test on FreeBSD. + +Mon Nov 2 08:36:24 UTC 2009 Olli Savia + + * ace/Sig_Handler.cpp: + Removed setting of SA_SIGINFO flag. It should not be used + with POSIX.1 signal handler (sa_handler). + +Sun Nov 1 16:47:29 UTC 2009 Olli Savia + + * ace/Sig_Handler.cpp: + LynxOS 4.x supports SA_SIGINFO. + +Fri Oct 30 18:46:03 UTC 2009 Steven Stallion + + * include/makeinclude/wrapper_macros.GNU: + + Added -DNDEBUG to CPPFLAGS when debug=0 is set. + +Thu Oct 29 21:45:30 UTC 2009 Olli Savia + + * ace/OS_NS_pwd.h: + * ace/OS_NS_time.inl: + * ace/README: + * ace/config-mvs.h: + * ace/config-tru64.h: + * ace/os_include/os_time.h: + * configure.ac: + * m4/config_h.m4: + Removed references to ACE_HAS_BROKEN_CTIME and + ACE_HAS_BROKEN_R_ROUTINES. + +Thu Oct 29 21:25:49 UTC 2009 Chris Cleeland + + * tests/Message_Queue_Test.cpp: + + Reverted change from Tue Oct 27 08:12:25 UTC 2009 + William R. Otte . The change + was causing core dumps on some platforms due to treating + the thread ID as a pointer and dereferencing that pointer. + Better to live with compiler warnings than crashes. + +Thu Oct 29 21:04:27 UTC 2009 Olli Savia + + * ace/README: + * ace/config-aix-5.x.h: + * ace/config-irix6.x-g++.h: + * ace/config-lynxos.h: + * ace/config-netbsd.h: + * ace/config-openbsd.h: + * ace/config-sco-5.0.0-nothread.h: + * ace/config-sunos5.4-g++.h: + * ace/config-sunos5.5.h: + * ace/config-tru64.h: + * ace/config-unixware-7.1.0.h: + * ace/config-win32-borland.h: + * ace/config-win32-dmc.h: + * ace/config-win32-ghs.h: + * configure.ac: + * m4/config_h.m4: + Removed references to ACE_HAS_GNU_CSTRING_H. + +Thu Oct 29 20:30:35 UTC 2009 Olli Savia + + * ace/OS_NS_stdlib.h: + Readded undef atop. Fixes compile error on FreeBSD. + +Thu Oct 29 13:58:25 UTC 2009 Olli Savia + + * ace/OS_NS_stdlib.h: + * ace/OS_NS_stdlib.inl: + * ace/OS_NS_time.h: + Removed some legacy undefs. + +Thu Oct 29 08:08:51 UTC 2009 Olli Savia + + * ace/Log_Msg.cpp: + * ace/Select_Reactor_Base.cpp: + Fixed fuzz errors. + +Wed Oct 28 19:49:39 UTC 2009 Chris Cleeland + + * ace/Select_Reactor_Base.h: + * ace/Select_Reactor_Base.cpp: + + Changed the second recv() that is used in case of a short first + read to be a recv_n(), blocking until the rest of the buffer can + be received on the pipe. The problem was discovered during + routine testing (Notify_Performance_Test) on VxWorks 6.7 on a P3 + platform, but could occur on any platform. [Bugzilla 3754] + +Wed Oct 28 11:58:21 UTC 2009 Olli Savia + + * ace/config-win32-msvc-7.h: + Reverted: Tue Oct 27 19:40:59 UTC 2009 Olli Savia + It seems that VC7 doesn't support _get_osfhandle. + +Wed Oct 28 11:54:03 UTC 2009 Olli Savia + + * ace/Log_Msg.h: + * ace/Log_Msg.cpp: + Use ACE_OS::strsignal() instead of sys_siglist. + + * ace/config-freebsd.h: + * ace/config-linux-common.h: + * ace/config-lynxos.h: + * ace/config-netbsd.h: + * ace/config-openbsd.h: + * ace/config-sunos5.4-g++.h: + * ace/config-sunos5.4-sunc++-4.x.h: + * ace/config-sunos5.5.h: + Removed legacy sys_siglist related settings. + +Wed Oct 28 06:30:33 UTC 2009 Johnny Willemsen + + * include/makeinclude/platform_sunos5_g++.GNU: + Added support for buildbits 64 + +Tue Oct 27 20:14:50 UTC 2009 Olli Savia + + * ace/OS.inl: + Removed some legacy code. + +Tue Oct 27 19:40:59 UTC 2009 Olli Savia + + * ace/config-win32-msvc-7.h: + Added missing ACE_FILENO_EQUIVALENT macro. + +Tue Oct 27 19:35:06 UTC 2009 Olli Savia + + * tests/OS_Test.cpp: + Fixed wrong logic with macros + +Thu Oct 22 21:12:21 UTC 2009 Douglas C. Schmidt + + * ace/Pipe.h (ACE_Pipe): Updated the document to correct a typo. + Thanks to Matthew Carter for reporting this. + +Tue Oct 27 10:01:51 UTC 2009 Olli Savia + + * ace/OS_NS_string.cpp: + * ace/config-aix-5.x.h: + strsignal fix for AIX. + +Tue Oct 27 08:22:25 UTC 2009 William R. Otte + + * include/makeinclude/platform_macosx_tiger.GNU: + + fixed typo. + +Tue Oct 27 08:12:25 UTC 2009 William R. Otte + + * ace/config-macosx-snowleopard.h: + * include/makeinclude/platform_macosx_common.GNU: + * include/makeinclude/platform_macosx_snowleopard.GNU: + * include/makeinclude/platform_macosx_tiger.GNU: + + Re-factored snow leopard support, I now get a clean compile. + Tests will be evaluated when we get our x86 Mac hardware. + + * tests/Message_Queue_Test.cpp: + + Introduced some pointer gymnastics to convert a ACE_thread_t + to a seed for the random number generator. This was done to avoid + compile warnings due to pointers being bigger than a uint_t and losing + precision in the conversion. + +Tue Oct 27 07:55:38 UTC 2009 Olli Savia + + * tests/OS_Test.cpp: + Use ACE_INVALID_HANDLE instead of -1. Changed C-style casts + to C++ casts. + +Mon Oct 26 22:08:38 UTC 2009 Olli Savia + + * ace/config-win32-borland.h: + Added ACE_FILENO_EQUIVALENT. + +Mon Oct 26 15:42:34 UTC 2009 Olli Savia + + * tests/OS_Test.cpp: + Added cast to fix compile error on Windows. + +Mon Oct 26 12:25:33 UTC 2009 Johnny Willemsen + + * ace/OS_NS_stdio.inl: + Fix for msvc10 + +Mon Oct 26 11:54:33 UTC 2009 Johnny Willemsen + + * ace/Basic_Types.h: + Small improvement for PPC64 + +Mon Oct 26 10:41:43 UTC 2009 Vladimir Zykov + + * protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp: + * protocols/ace/HTBP/HTBP_Session.h: + * protocols/ace/HTBP/HTBP_Environment.cpp: + * protocols/ace/HTBP/HTBP_Channel.h: + * protocols/ace/HTBP/HTBP_Filter_Factory.h: + * protocols/ace/HTBP/HTBP_Session.cpp: + * protocols/ace/HTBP/HTBP_Session.inl: + * protocols/ace/HTBP/HTBP_ID_Requestor.cpp: + * protocols/ace/HTBP/HTBP_Channel.inl: + * protocols/ace/HTBP/HTBP_Channel.cpp: + * protocols/ace/HTBP/HTBP_Environment.h: + * protocols/ace/HTBP/HTBP_Filter_Factory.cpp: + Simplified the code and fixed several memory leaks. + +Mon Oct 26 10:23:13 UTC 2009 Olli Savia + + * tests/run_test.lst: + Don't run MEM_Stream_Test and MT_SOCK_Test on LynxOS. + +Mon Oct 26 10:18:28 UTC 2009 Olli Savia + + * tests/Bug_2653_Regression_Test.cpp: + * tests/Cached_Conn_Test.cpp: + * tests/Reactor_Dispatch_Order_Test.cpp: + LynxOS improvements. + +Mon Oct 26 08:32:08 UTC 2009 Olli Savia + + * tests/OS_Test.cpp: + Improved test to detect if std{out,err} is not associated + with an output stream. This may happen with Windows application + without a console window. + +Mon Oct 26 07:48:19 UTC 2009 Olli Savia + + * ace/config-win32-msvc-10.h: + * ace/config-win32-msvc-8.h: + * ace/config-win32-msvc-9.h: + Fix for WinCE build. + +Sat Oct 24 14:33:33 UTC 2009 Johnny Willemsen + + * ace/Basic_Types.h: + Fix for PPC64 + +Sat Oct 24 14:30:33 UTC 2009 Johnny Willemsen + + * include/makeinclude/platform_linux.GNU: + Fix for PPC64 + +Sat Oct 24 12:18:00 UTC 2009 Olli Savia + + * ace/OS_NS_Thread.inl: + LynxOS improvements. + +Sat Oct 24 12:15:40 UTC 2009 Olli Savia + + * ace/OS_NS_string.cpp (strsignal): + Fix for Solaris and AIX. + +Fri Oct 23 21:38:31 UTC 2009 Abdullah Sowayan + + * include/makeinclude/platform_macosx_snowleopard.GNU: + + Enhanced this file to remove -Wno-long-double from CFLAG. + Thanks to Adam Mitz for the suggestion on how to fix this. + +Fri Oct 23 20:25:13 UTC 2009 Olli Savia + + * ace/os_include/os_string.h: + Removed some legacy code. + +Fri Oct 23 13:58:45 UTC 2009 Olli Savia + + * tests/run_test.lst: + Run Signal_Test on LynxOS. + +Fri Oct 23 13:23:49 UTC 2009 Olli Savia + + * m4/config_h.m4: + Reverted: Mon Oct 19 20:58:10 UTC 2009 Olli Savia + +Fri Oct 23 13:10:33 UTC 2009 Johnny Willemsen + + * ace/File_Lock.{h,cpp,inl}: + Use bool instead of int + +Fri Oct 23 12:52:33 UTC 2009 Johnny Willemsen + + * bin/run_test.pl: + Extended run_test check + +Fri Oct 23 09:56:50 UTC 2009 Olli Savia + + * ace/config-aix-5.x.h: + Added ACE_HAS_STRSIGNAL. + +Fri Oct 23 09:51:17 UTC 2009 Olli Savia + + * ace/config-win32-msvc-10.h: + * ace/config-win32-msvc-8.h: + * ace/config-win32-msvc-9.h: + Added missing _get_osfhandle() call to ACE_FILENO_EQUIVALENT macro. + +Thu Oct 22 14:16:10 UTC 2009 Chad Elliott + + * bin/MakeProjectCreator/templates/gnu.mpd: + + If a custom 'dependent' setting contains a double quote, then we + must make a fake rule that corresponds to it. Otherwise, make + doesn't know how to deal with it. + +Tue Oct 20 16:20:33 UTC 2009 Steve Huston + + * ace/Message_Queue_T.cpp (enqueue_*): Move the notify() call outside + the lock scope; holding the lock across a call that may block (or + do anything else we don't know about) is dangerous. It resulted in + deadlock at a customer site. + + See Bugzilla #3250 for any follow-up issues. + + * ace/Process_Mutex.h: Fix doxygen stuff and clarify the behavior + when based on semaphores vs. mutexes where there's a choice. + +Tue Oct 20 10:35:57 UTC 2009 Olli Savia + + * ace/OS_NS_string.cpp: + Reformatted returned string in emulated strsignal. + If signum is invalid, "Unknown signal %d" is used to + format the string. Otherwise, "Signal %d" is used. + + Use ACE_SYS_SIGLIST instead of ACE_HAS_SYS_SIGLIST. + + * ace/config-lynxos.h: + Removed ACE_HAS_SYS_SIGLIST. Macro is no longer used. + +Mon Oct 19 20:58:10 UTC 2009 Olli Savia + + * configure.ac: + * m4/config_h.m4: + Added a check for strsignal. + +Mon Oct 19 20:24:54 UTC 2009 Olli Savia + + * ace/README: + * ace/config-cray.h: + * ace/config-cygwin32.h: + * ace/config-hpux-11.00.h: + * ace/config-lynxos.h: + * ace/config-netbsd.h: + * ace/config-openbsd.h: + * ace/config-rtems.h: + * configure.ac: + * m4/config_h.m4: + ACE_HAS_SYS_ERRLIST is no longer in use. + +Mon Oct 19 19:25:40 UTC 2009 Olli Savia + + * ace/README: + * ace/config-aix-5.x.h: + * ace/config-cray.h: + * ace/config-cygwin32.h: + * ace/config-freebsd.h: + * ace/config-hpux-11.00.h: + * ace/config-integritySCA.h: + * ace/config-irix6.x-common.h: + * ace/config-linux-common.h: + * ace/config-lynxos.h: + * ace/config-macosx-leopard.h: + * ace/config-macosx-panther.h: + * ace/config-macosx-tiger.h: + * ace/config-macosx.h: + * ace/config-mvs.h: + * ace/config-netbsd.h: + * ace/config-openbsd.h: + * ace/config-openvms.h: + * ace/config-qnx-neutrino.h: + * ace/config-qnx-rtp-62x.h: + * ace/config-qnx-rtp-pre62x.h: + * ace/config-rtems.h: + * ace/config-sco-5.0.0.h: + * ace/config-sunos5.4-g++.h: + * ace/config-sunos5.4-sunc++-4.x.h: + * ace/config-sunos5.5.h: + * ace/config-tandem-nsk-mips-v2.h: + * ace/config-tandem-nsk-mips-v3.h: + * ace/config-tandem.h: + * ace/config-tru64.h: + * ace/config-unixware-7.1.0.h: + * ace/config-unixware-7.1.0.udk.h: + * ace/config-vxworks6.4.h: + * ace/config-win32-borland.h: + * ace/config-win32-cegcc.h: + * ace/config-win32-dmc.h: + * ace/config-win32-ghs.h: + * ace/config-win32-interix.h: + * ace/config-win32-mingw.h: + * ace/config-win32-msvc-10.h: + * ace/config-win32-msvc-7.h: + * ace/config-win32-msvc-8.h: + * ace/config-win32-msvc-9.h: + * ace/os_include/os_string.h: + * configure.ac: + + Cleaned up strerror mess. We had both ACE_HAS_STRERROR and + ACE_LACKS_STREROR. ACE_HAS_STRERROR is no longer in use. + +Mon Oct 19 18:18:37 UTC 2009 Olli Savia + + * ace/config-linux-common.h: + Added ACE_HAS_STRSIGNAL. + +Mon Oct 19 14:28:07 UTC 2009 Olli Savia + + * ace/config-linux-common.h: + Added ACE_HAS_SYS_SIGLIST. + +Mon Oct 19 14:24:45 UTC 2009 Olli Savia + + * tests/Log_Msg_Test.cpp: + Added a few debug messages to exercise %S modifier. + +Mon Oct 19 14:00:20 UTC 2009 Olli Savia + + * ace/Sock_Connect.cpp: + LynxOS improvements. + +Mon Oct 19 12:18:26 UTC 2009 Olli Savia + + * ace/OS_NS_string.cpp: + Include OS_NS_stdio.h if ACE_HAS_STRSIGNAL is not defined. + +Mon Oct 19 12:15:04 UTC 2009 Johnny Willemsen + + * rpmbuild/ace-tao-init-fedora/rc.d/init.d/tao-cosconcurrency: + * rpmbuild/ace-tao-init-fedora/rc.d/init.d/tao-cosevent: + * rpmbuild/ace-tao-init-fedora/rc.d/init.d/tao-cosnaming: + * rpmbuild/ace-tao-init-fedora/rc.d/init.d/tao-cosnotification: + * rpmbuild/ace-tao-init-fedora/rc.d/init.d/tao-costrading: + * rpmbuild/ace-tao-init-fedora/rc.d/init.d/tao-rtevent: + * rpmbuild/ace-tao-init-suse/init.d/tao-cosconcurrency: + * rpmbuild/ace-tao-init-suse/init.d/tao-cosevent: + * rpmbuild/ace-tao-init-suse/init.d/tao-cosnaming: + * rpmbuild/ace-tao-init-suse/init.d/tao-cosnotification: + * rpmbuild/ace-tao-init-suse/init.d/tao-costrading: + * rpmbuild/ace-tao-init-suse/init.d/tao-rtevent: + Use -ORBDeamon instead of --deamon + +Mon Oct 19 12:10:04 UTC 2009 Johnny Willemsen + + * tests/Bug_3729_Regression_Test.cpp: + * tests/INET_Addr_Test.cpp: + * tests/run_test.lst: + * tests/tests.mpc: + Moved regression test for 3729 to its own file + +Mon Oct 19 11:58:04 UTC 2009 Johnny Willemsen + + * tests/INET_Addr_Test.cpp: + Unicode fixes + +Mon Oct 19 10:04:04 UTC 2009 Olli Savia + + * ace/OS_NS_string.cpp: + Fixed off by one bug. + + * ace/os_include/os_signal.h: + Due to bug above reverted previous change. + +Mon Oct 19 07:55:21 UTC 2009 Olli Savia + + * ace/OS_NS_string.cpp: + * ace/config-lynxos.h: + LynxOS lacks strsignal. Added emulation using sys_siglist. + + * ace/os_include/os_signal.h: + LynxOS now defines NSIG rigth. No need to add +1. + +Sat Oct 17 19:58:52 UTC 2009 Olli Savia + + * ace/OS_NS_string.h: + * ace/OS_NS_string.cpp: + Added ACE_OS::strsignal(). + + * ace/config-cygwin32.h: + * ace/config-freebsd.h: + * ace/config-lynxos.h: + * ace/config-netbsd.h: + * ace/config-openbsd.h: + * ace/config-sunos5.4-g++.h: + * ace/config-sunos5.4-sunc++-4.x.h: + * ace/config-sunos5.5.h: + Added ACE_HAS_STRSIGNAL + + * tests/OS_Test.cpp: + Added a test for ACE_OS::strsignal(). + + * ace/config-win32-common.h: + * ace/README: + * ace/config-cray.h: + Removed references to ACE_HAS_SYS_SIGLIST. It will be removed + soon. + +Sat Oct 17 10:29:13 UTC 2009 Olli Savia + + * ace/config-lynxos.h: + Removed duplicate define ACE_HAS_GETIFADDRS. + +Sat Oct 17 10:26:15 UTC 2009 Olli Savia + + * ace/OS_NS_stdio.h: + Removed undef fdopen. We may need to add helper wrapper for fdopen. + +Sat Oct 17 07:32:19 UTC 2009 Johnny Willemsen + + * tests/OS_Test.cpp: + Removed getmacaddress test, that moved to its own test + +Fri Oct 16 08:51:19 UTC 2009 Johnny Willemsen + + * bin/generate_doxygen.pl: + * htlm/index.html: + Added dds4ccm + +Fri Oct 16 06:38:19 UTC 2009 Olli Savia + + * tests/run_test.lst: + Run Enum_Interfaces_Test, MT_SOCK_Test, TP_Reactor_Test on LynxOS. + +Fri Oct 16 06:00:42 UTC 2009 Olli Savia + + * ace/OS_NS_stdio.h: + * ace/OS_NS_stdio.inl: + Readded "Tue Oct 13 19:13:13 UTC 2009 Olli Savia " + without os_unistd.h modifications. + +Thu Oct 15 17:33:05 UTC 2009 William R. Otte + + * ace/OS_NS_stdio.h: + * ace/OS_NS_stdio.inl: + * ace/os_include/os_unistd.h: + + Reverted Tue Oct 13 19:13:13 UTC 2009 Olli Savia , + it broke the IDL compiler. + +Thu Oct 15 11:26:15 UTC 2009 Olli Savia + + * ace/Pipe.cpp: + It OK to use socketpair to implement pipe on LynxOS. + +Thu Oct 15 11:11:48 UTC 2009 Johnny Willemsen + + * ace/Basic_Types.h: + Fix for 64bit PPC + +Thu Oct 15 07:43:48 UTC 2009 Johnny Willemsen + + * tests/Bug_3744_Regression_Test.cpp: + * tests/tests.mpc: + * tests/run_test.lst: + Moved the regression for 3744 to its own file, we don't have a fix yet + +Wed Oct 14 23:15:59 UTC 2009 Abdul Sowayan + + * ace/config-macosx-snowleopard.h: + * include/makeinclude/platform_macosx_snowleopard.GNU: + + First cut of adding snowleopard support. + +Wed Oct 14 14:43:01 UTC 2009 Olli Savia + + * ace/config-lynxos.h: + Added/removed some defines. + +Wed Oct 14 14:41:03 UTC 2009 Olli Savia + + * ace/OS_NS_signal.h: + Added include "ace/os_include/os_pthread.h" since LynxOS defines + pthread_sigmask() in pthread.h. + +Tue Oct 13 19:13:13 UTC 2009 Olli Savia + + * ace/OS_NS_stdio.h: + * ace/OS_NS_stdio.inl: + Cleaned up ace_fileno_helper implementation and fixed compile + problem on MinGW. + + * ace/os_include/os_unistd.h: + Redefined ACE_STD{IN,OUT,ERR}. + OS_Test now hopefully passes on all platforms. + +Tue Oct 13 19:00:53 UTC 2009 Olli Savia + + * include/makeinclude/platform_lynxos.GNU: + Removed non-functional cross compiler setup. + +Tue Oct 13 18:56:22 UTC 2009 Olli Savia + + * include/makeinclude/platform_lynxos.GNU: + Reverted: + + Mon Oct 13 11:10:00 UTC 2008 Simon Massey + + * include/makeinclude/platform_lynxos.GNU: + Problems with Lynxos5.0 due to -mshared being passed to compiler + (inaddition to linker) + + -mshared is needed on LynxOS 4.x. Need to find another + solution for LynxOS 5.0 + +Tue Oct 13 10:03:48 UTC 2009 Johnny Willemsen + + * include/makeinclude/rules.local.GNU: + When using cp to install a library, make sure we check date/time + in order to check if we need to copy. Thanks to Abdul Sowayan + for reporting this. This fixes bugzilla + 3728 + +Tue Oct 13 09:44:48 UTC 2009 Johnny Willemsen + + * tests/INET_Addr_Test.cpp: + Extended this test to for is_multicast. This fails on little endian + machines at this moment. Thanks to Patrick Rabau + for extending this test. This is related + to bugzilla 3729 + +Tue Oct 13 09:33:48 UTC 2009 Johnny Willemsen + + * tests/OS_Test.cpp: + Added test for getmacaddress, thanks to Paul Daugherty + for creating this. This is related to + bugzilla 3744 + +Tue Oct 13 06:34:48 UTC 2009 Johnny Willemsen + + * include/makeinclude/platform_linux.GNU: + When doing a 64bit build, also add -m64 to the linker flags + +Mon Oct 12 14:03:48 CDT 2009 Johnny Willemsen + + * ACE version 5.7.4 released. Local Variables: mode: change-log diff --git a/ACE/ChangeLogs/ChangeLog-2010a b/ACE/ChangeLogs/ChangeLog-2010a deleted file mode 100644 index 7200682d343..00000000000 --- a/ACE/ChangeLogs/ChangeLog-2010a +++ /dev/null @@ -1,2589 +0,0 @@ -Wed Mar 03 01:18:08 CST 2010 Johnny Willemsen - - * ACE version 5.7.7 released. - -Mon Mar 1 12:27:30 UTC 2010 Martin Corino - - * bin/PerlACE/Process_Unix.pm: - - Fixed 'ps' determination problems. - -Fri Feb 26 19:32:06 UTC 2010 Adam Mitz - - * ace/config-sunos5.5.h: - - Moved #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL to a - non-compiler-specific section. - - * ace/config-sunos5.10.h: - - Added #undef ACE_LACKS_CEILL & ACE_LACKS_FLOORL because they are - available on Solaris 10. - -Fri Feb 26 18:30:54 UTC 2010 Johnny Willemsen - - * ace/OS_NS_sys_time.inl: - Changed ACE_HAS_CLOCK_REALTIME to ACE_HAS_CLOCK_GETTIME_REALTIME - -Fri Feb 26 16:00:04 UTC 2010 Steve Huston - - * Fixed double-declaration of ACE_LACKS_CEILL and ACE_LACKS_FLOORL in: - Thu Feb 25 21:42:13 UTC 2010 Steve Huston - -Fri Feb 26 15:36:12 UTC 2010 Steve Huston - - * tests/Bug_2609_Regression_Test.cpp: Fix unused arg warning and - adjust for hosts without IPv6. - -Fri Feb 26 14:48:01 UTC 2010 Chris Cleeland - - * tests/Timer_Queue_Test.cpp (handle_timeout): Fix unused argument - warning. - -Fri Feb 26 14:45:30 UTC 2010 Douglas C. Schmidt - - * ace/OS_NS_sys_time.inl (ACE_OS::gettimeofday): Added in support - for clock_gettime() if a user sets ACE_HAS_CLOCK_REALTIME in - their config.h file. Thanks to Patrick Soboljew for this suggestion. - -Thu Feb 25 21:42:13 UTC 2010 Steve Huston - - * configure.ac: Use AC_CHECK_DECL rather than ACE_CHECK_LACKS_FUNCS - for ceill() and floorl(). On Solaris 9 the symbols show up in - some library (possibly as a stub) but aren't available; this - fools ACE_CHECK_LACKS_FUNC. There's probably a better way to - integrate this into ACE_CHECKS_LACKS_FUNCS but I don't know how. - -Thu Feb 25 22:07:25 UTC 2010 Chris Cleeland - - * tests/Timer_Queue_Test.cpp (test_interval_timer): - - Added new function to test interval timing functionality in - preparation for merging in a fix for bug 3104. Note that while - bug 3104 focuses on performance issues, this test doesn't - specifically test performance, but rather tests that the - interval timer feature works properly so that we know that - any performance-related changes made in fixing bug 3104 don't - cause a regression. - - * ace/Timer_Queue_T.h: - * ace/Timer_Queue_T.cpp: - - Integrate code proposed to fix bug 3104, but factored out into - a new method, recompute_next_abs_interval_time, so that the - more efficient computation can be re-used in Timer_Hash and - Timer_Wheel. - - * ace/Timer_Queue_T.cpp (dispatch_info_i): - - Change to use recompute_next_abs_interval_time. - - * ace/Timer_Hash_T.cpp (expire): - * ace/Timer_Wheel_T.cpp (expire): - - Change to use recompute_next_abs_interval_time. - -Thu Feb 25 20:33:27 UTC 2010 Steve Huston - - * tests/Bug_2609_Regression_Test.cpp: Correct to use documented ACE - conventions for event handler reference counting. Should resolve - concerns around Bugzilla 2609. - -Thu Feb 25 19:11:07 UTC 2010 Steven Stallion - - * include/makeinclude/platform_sunos5_sunc++.GNU: - * include/makeinclude/wrapper_macros.GNU: - Refined use of CPPFLAGS; -library will now only be applied to CC - invocations. - -Thu Feb 25 16:52:20 UTC 2010 Vladimir Zykov - - * ace/Strategies_T.cpp: - * ace/Connector.cpp: - * ace/Svc_Handler.cpp: - * tests/run_test.lst: - * tests/Bug_2609_Regression_Test.cpp: - * tests/NonBlocking_Conn_Test.h: - * tests/Bug_2610_Regression_Test.cpp: - * tests/Process_Strategy_Test.cpp: - * tests/NonBlocking_Conn_Test.cpp: - Reverted all the changes done in attempt to fix non-blocking - connect test and tests for 2609/2610. - -Thu Feb 25 08:10:54 UTC 2010 Johnny Willemsen - - * ace/config-opensd.h: - #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL - -Thu Feb 25 08:10:54 UTC 2010 Johnny Willemsen - - * ace/config-netbsd.h: - #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL - -Thu Feb 25 07:51:54 UTC 2010 Johnny Willemsen - - * ace/config-WinCE.h: - #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL - -Thu Feb 25 07:38:54 UTC 2010 Johnny Willemsen - - * ace/svcconf.mpb: - * ace/svcconfgen.mpc: - Moved regeneration support to its own file that is disabled by - defeault. Thanks to Joseph Sarbak - for reporting this. - - * bin/MakeProjectCreator/config/global.features: - Set ace_svcconf_gen to 0, when this is set to 1 we enable svcconf - regeneration - -Wed Feb 24 22:07:30 UTC 2010 Steven Stallion - - * include/makeinclude/platform_sunos5_sunc++.GNU: - Added support for alternate CC libraries. - -Wed Feb 24 15:15:00 UTC 2010 Simon Massey - - * ace/config-lynxos.h: - #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL - Correct placement of these defines for the version of Lynxos - -Wed Feb 24 11:41:54 UTC 2010 Johnny Willemsen - - * include/makeinclude/platform_g++_common.GNU: - Added support for no_strict_aliasing, when this is set, we add - -fno-strict-aliasing to the compiler flags - -Wed Feb 24 08:45:54 UTC 2010 Johnny Willemsen - - * tests/run_test.lst: - 2434 should run now - -Wed Feb 24 08:41:54 UTC 2010 Johnny Willemsen - - * ace/config-hpux-11.00.h: - #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL - -Wed Feb 24 08:01:54 UTC 2010 Johnny Willemsen - - * tests/NonBlocking_Conn_Test.cpp: - Unicode fixes - - * tests/Atomic_Op_Test.cpp: - Calculate how long each test takes and print this to the log - -Wed Feb 24 02:48:37 UTC 2010 Douglas C. Schmidt - - * ace/config-sunos5.5.h: - #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL - -Tue Feb 23 19:45:39 UTC 2010 Douglas C. Schmidt - - * tests/OS_Test.cpp: Added tests for floorl() and ceill(). Thanks - to Olivier Langlois for - this fix. - -Tue Feb 23 19:43:36 UTC 2010 Douglas C. Schmidt - - * configure.ac: Added a check for ACE_CHECK_LACKS_FUNCS(floor ceil - floorl ceill). Thanks to Olivier Langlois for this fix. - -Tue Feb 23 15:15:00 UTC 2010 Simon Massey - - * ace/config-lynxos.h: - #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL - -Tue Feb 23 08:59:54 UTC 2010 Johnny Willemsen - - * ace/config-vxworks6.4.h: - VxWorks lacks floorl and ceill - -Mon Feb 22 20:01:54 UTC 2010 Douglas C. Schmidt - - * ace/Time_Value.{h,cpp}: Applied some patches from Olivier Langlois - to fix some warnings. - -Mon Feb 22 19:57:02 UTC 2010 Douglas C. Schmidt - - * ace/Thread_Mutex.inl (ACE_Thread_Mutex::lock): Added a non-const - lock() method. Thanks to Phil for suggesting this. - -Mon Feb 22 18:08:20 UTC 2010 Douglas C. Schmidt - - * ace/Condition_Recursive_Thread_Mutex.cpp (ACE_Condition): Fixed - a stray occurrence of the mutex() accessor that should be - lock(). Thanks to Phil Mesnier for reporting this. - -Mon Feb 22 15:00:11 UTC 2010 Douglas C. Schmidt - - * ace/Time_Value.{h,cpp}: Reformatted/renamed the code to conform - to ACE programming guidelines. - -Mon Feb 22 13:40:14 UTC 2010 Douglas C. Schmidt - - * ace/Condition_T.cpp: Changed the mutex() accessor to lock() to - be consistent. - -Mon Feb 22 13:39:09 UTC 2010 Douglas C. Schmidt - - * ace/Recursive_Thread_Mutex.{h,inl}: Created a new lock() accessor - so it's consistent with the other synchronizer accessors in ACE. - -Sun Feb 21 21:25:21 UTC 2010 Douglas C. Schmidt - - * tests/Time_Value_Test.cpp: Added a test for the new operator<< - implementation for ACE_Time_Value. Thanks to Olivier Langlois - for contributing this. - -Sun Feb 21 21:28:03 UTC 2010 Douglas C. Schmidt - - * ace/OS_NS_math.{h,inl}: Added support for floor() and ceiling() - for long double types. Thanks to Olivier Langlois for contributing this. - - * ace/Time_Value.{h,cpp}: Added support for operator<< and to - handle long double values better. Thanks to Olivier Langlois - for contributing this. - This fixes bugid 3818 and 2434. - -Sun Feb 21 16:28:47 UTC 2010 Douglas C. Schmidt - - * tests/Recursive_Condition_Test.cpp: Revised this test so that it - actually uses the ACE_Condition<> template, like it says in the - comments.. - -Sun Feb 21 16:20:35 UTC 2010 Douglas C. Schmidt - - * ace/Condition_T.cpp (ACE_Condition::wait): Changed the - call to mutex_.lock_ to mutex_.mutex() since lock_ is protected. - Thanks to Nick Meyer for - reporting this. - -Sun Feb 21 09:24:38 UTC 2010 Johnny Willemsen - - * ChangeLogs/*: - Use full year - -Sat Feb 20 20:26:47 UTC 2010 Johnny Willemsen - - * bin/MakeProjectCreator/config/global.features: - Also set dds4ccm_splie to 0 by default - -Fri Feb 19 19:34:47 UTC 2010 Johnny Willemsen - - * bin/MakeProjectCreator/config/global.features: - Set dds4ccm_opendds and dds4ccm_ndds to 0 by default. When - generating project files for dds4ccm we now have to enable - which dds implementation we want to use - -Wed Feb 17 10:02:47 UTC 2010 Johnny Willemsen - - * html/Stats/index.shtml: - Added link for MPC440 Xampler results - -Tue Feb 16 09:51:47 UTC 2010 Johnny Willemsen - - * include/makeinclude/platform_freebsd.GNU: - * include/makeinclude/platform_linux_common.GNU: - Set fox flags - - * include/makeinclude/platform_gnuwin32_common.GNU: - enabled no_hidden_visibility - -Mon Feb 15 19:28:47 UTC 2010 Johnny Willemsen - - * rpmbuild/ace-tao.spec: - Package nslist and catior readme files - -Mon Feb 15 12:10:47 UTC 2010 Johnny Willemsen - - * debianbuild/rules: - Removed some not needed steps - -Mon Feb 15 09:56:47 UTC 2010 Johnny Willemsen - - * configure.ac: - Fixed problem with latest autoconf tools - - * patches/97-fix-empty-elseif.dpatch: - Removed, not needed anymore - -Mon Feb 15 09:44:47 UTC 2010 Johnny Willemsen - - * debianbuild/patches/02-fltk-no-gl.dpatch - * debianbuild/patches/12-fix-fox-include.dpatch - * debianbuild/patches/13-fix-fox-errors.dpatch - * debianbuild/patches/14-autoconf-tao.dpatch - * debianbuild/patches/26-autoupdate.diff - * debianbuild/patches/35-autoconf-fix-else-fi.dpatch - * debianbuild/patches/36-autoconf-fix-fidone.dpatch - * debianbuild/patches/93-hack-to-fix-libtoolize.dpatch - * debianbuild/patches/98-ignore-win32-acdefun-error.diff - * debianbuild/patches/98-ignore-win32-acdefun-error.dpatch - Removed, not needed anymore, merged changes to trunk - -Mon Feb 15 09:40:30 UTC 2010 Martin Corino - - * include/makeinclude/platform_linux.GNU: - - Added support for cpumodelflag (-mcpu=) and tunemodelflag (-mtune=) flags. - -Mon Feb 15 09:38:47 UTC 2010 Johnny Willemsen - - * m4/ace.m4: - No need to link ftlk with gl - -Mon Feb 15 09:35:47 UTC 2010 Johnny Willemsen - - * ace/FoxReactor/FoxReactor.h: - User has to specify the full fox path now, some distributions now ship fox-1.6 and - fox-1.4 as directory names - -Mon Feb 15 09:20:30 UTC 2010 Johnny Willemsen - - * m4/ace_defines.m4: - Fixed fixes with latest releases of tools - - * m4/tao.m4: - Added here from TAO to get the distribution to work with the latest - versions of autoconf tools - -Mon Feb 15 06:49:30 UTC 2010 Johnny Willemsen - - * configure.ac: - Fixed fixes with latest releases of tools - -Sun Feb 14 19:46:30 UTC 2010 Johnny Willemsen - - * configure.ac: - * m4/ace.m4: - Integrated patches from below, created by Pau Garcia i Quiles - - - * debianbuild/patches/19-gcc43.dpatch: - Removed, not needed anymore - - * debianbuild/patches/94-build-crosscompile.dpatch: - * debianbuild/patches/96-build-athena3d.dpatch: - Removed, integrated into trunk - -Sun Feb 14 07:22:30 UTC 2010 Johnny Willemsen - - * debianbuild/*: - Imported last version from Pau Garcia i Quiles - -Sat Feb 13 15:59:26 UTC 2010 James H. Hill - - * ace/Unbounded_Set_Ex.h: - - Added STL iterator type traits support to the ACE_Unbounded_Set* - and its corresponding iterators. - -Fri Feb 12 19:19:30 UTC 2010 Johnny Willemsen - - * ace/Atomic_Op.h: - * ace/Containers_T.h: - Doxygen changes - -Fri Feb 12 17:39:30 UTC 2010 Johnny Willemsen - - * tests/run_test.lst: - 2610 is working now - -Fri Feb 12 14:05:21 UTC 2010 Steve Huston - - * ace/Dev_Poll_Reactor.cpp: Fix unused variable warning. - -Fri Feb 12 10:36:30 UTC 2010 Johnny Willemsen - - * ace/config-g++-common.h: - Expanded autodetected support for GCC builtin __sync_XXX - atomic op functions to the IA64 platform - -Thu Feb 11 22:23:08 UTC 2010 Abdul Sowayan - - * THANKS: - - Added Trent Nadeau to the - hall of fame. - -Thu Feb 11 20:29:06 UTC 2010 Steven Stallion - - * bin/MakeProjectCreator/config/global.features: - - Disabled wireshark feature by default. - -Thu Feb 11 19:52:30 UTC 2010 Martin Corino - - * ace/config-g++-common.h: - - Expanded autodetected support for GCC builtin __sync_XXX - atomic op functions to all powerpc platforms. - -Thu Feb 11 12:18:24 UTC 2010 Vladimir Zykov - - * ace/Connector.cpp: - Added a call to remove_reference() for a svc handler owned by - non-blocking connection handler during connector's close(). - - * ace/Svc_Handler.cpp: - Removed the code that removes a reference to itself. Svc_Handler - doesn't own that reference and thus shouldn't remove it. - - * tests/Bug_2609_Regression_Test.cpp: - * tests/NonBlocking_Conn_Test.h: - * tests/Bug_2610_Regression_Test.cpp: - * tests/NonBlocking_Conn_Test.cpp: - Fixed the tests that implicitly assumed ownership of a reference - to a svc handler and didn't free it at the end of the test. - - * tests/Process_Strategy_Test.cpp: - Fixed the test that was broken by my change on - 'Mon Feb 8 16:21:06 UTC 2010'. The test incorrectly assumed - that close_handle() will not be called for svc handlers in - a parent process. - -Wed Feb 10 18:39:30 UTC 2010 Martin Corino - - * ace/config-g++-common.h: - - Added logic to detect (usable) support for GCC builtin __sync_XXX - atomic op functions. - - * ace/Atomic_Op.h: - * ace/Atomic_Op.inl: - - Changed autodetection for GCC builtin atomic ops so it will - only be used when really wanted. - Removed include for stdatomic.h because that has nothing to do with - the __sync_XXX builtins but rather with a *proposed* atomic op - implementation for the C++1x standard. The __sync_XXX builtins are - truly intrinsic, i.e. no header files involved. - -Wed Feb 10 15:38:30 UTC 2010 Johnny Willemsen - - * ACE-INSTALL.html: - Updated C++ builder support - -Wed Feb 10 10:53:30 UTC 2010 Johnny Willemsen - - * tests/run_test.lst: - Marked 2610 as not fixed - - * tests/Process_Strategy_Test.cpp: - Use prefix increment - -Wed Feb 10 10:45:00 UTC 2010 Simon Massey - - * tests/NonBlocking_Conn_Test.h: - * tests/NonBlocking_Conn_Test.cpp: - Fixed a VC9 compilation error (IGNORE is a vc9 #define). - -Tue Feb 9 15:03:35 UTC 2010 Douglas C. Schmidt - - * tests/NonBlocking_Conn_Test.cpp (hosts): Updated the list of hosts to - check to include news.bbc.co.uk. - -Tue Feb 9 09:14:48 UTC 2010 Vladimir Zykov - - * tests/NonBlocking_Conn_Test.h: - Fixed a compilation error. - -Mon Feb 8 18:53:30 UTC 2010 Johnny Willemsen - - * tests/run_test.lst: - Enabled 2609 and 2610 again, let us see how they run with the recent - changes from Vladimir - -Mon Feb 8 16:21:06 UTC 2010 Vladimir Zykov - - * ace/Strategies_T.cpp: - Changed the code so that close() is called in case of failure - instead of destroy(). - - * ace/Connector.cpp: - Changed a bit the code added by me on 'Wed Sep 2 14:45:27 UTC 2009' - as a fix for bug#3731. After some more thinking it turned out that - the original code could result in a crash when reference counting is - not enabled and thus svc_handler could be destroyed at the time - when there was an attempt to do remove_reference(). - - * ace/Svc_Handler.cpp: - Moved the code added by me on 'Thu Feb 4 11:15:57 UTC 2010' - from destroy() to handle_close(). - - * tests/NonBlocking_Conn_Test.h: - * tests/NonBlocking_Conn_Test.cpp: - Extended the test for using Svc_Handler with and without - reference counting. - -Mon Feb 8 11:35:30 UTC 2010 Johnny Willemsen - - * bin/ACETAOCIAO.style: - Updated with version 1.17 of Profactor Sylemanager - -Mon Feb 8 10:33:30 UTC 2010 Martin Corino - - * ace/ETCL/ETCL_l.cpp: - Fixed new GCC 4.4.x warning about ignoring return values of - function marked by the new warn_unused_result attribute. - -Sat Feb 6 18:58:30 UTC 2010 Martin Corino - - * include/makeinclude/wrapper_macros.GNU: - Fixed missing definitions for Icecream support. - -Sat Feb 6 15:03:30 UTC 2010 Martin Corino - - * include/makeinclude/wrapper_macros.GNU: - Added support for Icecream distributed compile system. - -Sat Feb 6 12:58:30 UTC 2010 Martin Corino - - * tests/Reactor_Performance_Test.cpp: - * tests/Reactor_Fairness_Test.cpp: - * ASNMP/asnmp/address.cpp: - * examples/Reactor/Misc/pingpong.cpp: - More fixes for strict-aliasing warnings. - -Sat Feb 6 11:28:30 UTC 2010 Martin Corino - - * ace/LSOCK.cpp: - Fixes for strict-aliasing warnings. - -Thu Feb 4 20:29:52 UTC 2010 Steve Huston - - * tests/Reactor_Fairness_Test.cpp: Don't try ACE_Dev_Poll_Reactor on - platforms without that capability; also added ACE_WFMO_Reactor to - the test (which triggered a crash shutting down WFMO_Reactor... I'm - looking into it). - -Thu Feb 4 15:32:24 UTC 2010 Steve Huston - - * tests/Reactor_Fairness_Test.cpp: - * tests/Reactor_Fairness_Test.h: - * tests/Makefile.am: - * tests/tests.mpc: - * tests/run_test.lst: New test to verify reactor fairness across a - set of registered I/O sockets. Tests Select, TP, Dev_Poll now. - TP fails fairness tests per Bugzilla 1031. Since the TP fairness - failure is a known issue, the new test is marked !FIXED_BUGS_ONLY. - - * ace/Dev_Poll_Reactor.cpp: - * ace/Dev_Poll_Reactor.h: Two performance improvements to resolve - Bugzilla #3714: - 1. The notify handler is no longer suspended/resumed around - notify processing. This removes the biggest source of CPU - consumption introduced at ACE 5.7 - simply acquiring/releasing - the token to handle notifies, each of which triggered another - token acquire/notify cycle. - 2. As I/O handlers are suspended before callback, they are not - immediately resumed on callback return. Instead, they are added - to a "to be resumed" list that is examined just prior to the - next epoll_wait() call; any to-be-resumed handles are added - back to the epoll set just before waiting. This removes another - need to acquire the token just to resume a handler. - -Thu Feb 4 11:15:57 UTC 2010 Vladimir Zykov - - * ace/Svc_Handler.cpp: - Fixed an unconditional delete of Svc_Handler in destroy(). If - reference counting is enabled then it has to do remove_reference(). - This completes the fix for bug#3731. - - * tests/NonBlocking_Conn_Test.cpp: - Changed www.pakarmy.gov.pk to www.pakistanarmy.gov.pk. The first - URL seems to be dead. - -Thu Feb 4 10:53:30 UTC 2010 Martin Corino - - * bin/PerlACE/Process_Unix.pm: - - Fixed problems concerning correct retrievel of process list. - -Thu Feb 3 09:57:30 UTC 2010 Johnny Willemsen - - * ace/Atomic_Op.inl: - Added support for the GCC Atomic Builtins, if you want to - use these, add ACE_HAS_GCC_ATOMIC_BUILTINS defined as 1 in - your config file - - * ace/Reactor.cpp: - * ace/Select_Reactor_Base.cpp: - Layout changes - - * ace/Reactor.h: - Doxygen change - -Tue Feb 2 19:57:30 UTC 2010 Martin Corino - - * bin/PerlACE/TestTarget_WinCE.pm: - * bin/PerlACE/Process_Unix.pm: - * bin/PerlACE/ProcessLVRT.pm: - * bin/PerlACE/TestTarget.pm: - * bin/PerlACE/TestTarget_VxWorks.pm: - * bin/PerlACE/ProcessVX.pm: - * bin/PerlACE/TestTarget_LVRT.pm: - * bin/PerlACE/Process_Win32.pm: - * bin/PerlACE/Process_VMS.pm: - - Added killall methods to the Process and Target frameworks. - Currently only full implementation on Win32 and *nix platforms - (empty on others). - -Tue Feb 2 19:52:30 UTC 2010 Johnny Willemsen - - * html/Stats/index.shtml: - Updated link to Cell results - -Mon Feb 1 23:16:24 2010 Steve Huston - - * ace/Acceptor.h: Fixed up doxygen for ACE_Oneshot_Acceptor. - -Tue Jan 26 03:56:45 UTC 2010 Douglas C. Schmidt - - * ace/Init_ACE.h: Updated the documentation of ACE::init() and - ACE::fini() so it reflects what ACE actually does. Thanks to - Steve Huston, Andrew Kaplan , and Alexander Mintz for motivating this update. - -Mon Feb 1 17:35:08 UTC 2010 Chris Cleeland - - * ace/Obstack_T.h: - * ace/Obstack_T.inl: - * ace/Obstack_T.cpp: - * ace/SStringfwd.h: - * ace/String_Base.h: - * ace/String_Base.inl: - * ace/String_Base.cpp: - * ace/Tokenizer_T.h: - * ace/Tokenizer_T.cpp: - - Integrated changes originally done in OCITAO 1.4a by Steve Totten - to fulfill [RT 13868]. - - Wed Feb 1 10:40:35 2006 Steve Totten - - Changed the use of "CHAR" as a template parameter to "ACE_CHAR_T" to - avoid possible clash with "CHAR" used as a preprocessor macro. - Thanks to Jennifer Kahng for - reporting the problem. This change resolves [RT 8287]. - -Mon Feb 1 11:21:30 UTC 2010 Johnny Willemsen - - * ace/Connector.cpp: - Const change - - * bin/diff-builds-and-group-fixed-tests-only.sh: - * etc/index.html: - * docs/Download.html: - Updated because of recent release - - * tests/NonBlocking_Conn_Test.cpp: - Improved this test so that it really tests the connections - - * tests/tests.mpc: - Bug_3709_Regression itselfs checks now for vc71 - - * ace/Reactor.h: - Doxygen fixes - -Sun Jan 31 01:04:43 CST 2010 Johnny Willemsen - - * ACE version 5.7.6 released. - -Fri Jan 29 14:24:30 UTC 2010 Johnny Willemsen - - * docs/bczar/bczar.html: - Extended release steps - -Thu Jan 28 16:26:28 UTC 2010 Abdul Sowayan - - * include/makeinclude/platform_macosx_iphone.GNU: - - When building for the Simulator, there is no need to - set things as a cross-build and set HOST_ROOT environment - variable. - -Thu Jan 28 15:11:18 UTC 2010 Abdul Sowayan - - * ACE-INSTALL.html: - - Updated with information on how to build ACE for - iPhone/iPod Touch/iPad Simulator and Hardware. - -Thu Jan 28 12:49:45 UTC 2010 Abdul Sowayan - - * NEWS: - - ACE/TAO now supports the new iPad ;-). - -Thu Jan 28 10:21:30 UTC 2010 Martin Corino - - * include/makeinclude/platform_linux.GNU: - Corrected fix for cross compilation on powerpc64. - Now also allows for non-standard named crosscompilers (like ppu-xx) - and cross compilation of non-powerpc target on powerpc host. - -Thu Jan 28 08:21:30 UTC 2010 Johnny Willemsen - - * include/makeinclude/platform_linux.GNU: - Fix for cross compilation to powerpc64 - -Wed Jan 27 22:36:36 UTC 2010 Adam Mitz - - * include/makeinclude/platform_win32_msvc.GNU: - - Trim trailing slashes from libpath entries. - - * tests/Bug_3709_Regression_Test.cpp: - - This test doesn't compile on MSVC 7.1. - -Wed Jan 27 05:33:56 UTC 2010 Abdul Sowayan - - * ace/config-macosx-iphone-hardware.h: - - undefined ACE_HAS_SYSV_IPC, it doesn't seem that the - iphone-hardware platform supports it. - -Tue Jan 26 22:55:18 UTC 2010 Adam Mitz - - * bin/MakeProjectCreator/config/ace_mc.mpb: - - Assign to LDLIBS along with ACE_SHLIBS. ACE_SHLIBS is only used - when building a shared library, LDLIBS is used for an executable. - -Tue Jan 26 19:53:30 UTC 2010 Johnny Willemsen - - * tests/Process_Test.cpp: - Log some more details to get an insight why this test fails on - some systems - -Tue Jan 26 18:04:30 UTC 2010 Johnny Willemsen - - * bin/generate_rel_manpages: - Doxygen is upgraded to 1.6.2 - -Tue Jan 26 17:02:51 UTC 2010 Steve Huston - - * ace/Dev_Poll_Reactor.cpp (unbind_all): When shutting down, call - handle_close() on all registered handlers. Fixes Bugzilla 2750. - -Tue Jan 26 13:27:30 UTC 2010 Johnny Willemsen - - * include/makeinclude/platform_linux_common.GNU: - tao_idl3_to_idl2 is located in HOST_ROOT/TAO/CIAO/bin with - cross compilation - -Tue Jan 26 12:52:57 UTC 2010 Abdul Sowayan - - * ace/config-macosx-leopard.h: - - Added ACE_HAS_NET_IF_DL_H macro. - - * ace/os_include/net/os_if.h: - - Removed hardcoding of ACE_HAS_IPHONE and ACE_HAS_MAC_OSX - checks. If the platform defines ACE_HAS_NET_IF_DL_H macro, - then will be included. - -Tue Jan 26 04:35:17 UTC 2010 Abdul Sowayan - - * ace/config-macosx-leopard.h: - - Added ACE_HAS_MAC_OSX macro. - - * ace/OS_NS_netdb.cpp: - * ace/os_include/net/os_if.h: - - Enabled ACE_OS::getmacaddress() for Mac OSX as well. - It uses exactly the same code as the iPhone's addition below. - -Tue Jan 26 04:18:54 UTC 2010 Abdul Sowayan - - * ace/OS_NS_netdb.cpp: - - Implement ACE_OS::getmacaddress() for iPhone. The same implementation - will probably work on Mac OS X as well. I will verify this in the - future. - - * ace/os_include/net/os_if.h: - - Added "#include " to this file if ACE_HAS_IPHONE - is defined. The ACE_OS::getmacaddress() depends on this include - include file. - -Mon Jan 25 18:58:30 UTC 2010 Johnny Willemsen - - * ace/MEM_IO.cpp - Added casts to fix CB2010 warnings - -Mon Jan 25 18:49:30 UTC 2010 Johnny Willemsen - - * ace/SPIPE_Stream.inl: - Added casts to fix CB2010 warnings - -Mon Jan 25 14:51:09 UTC 2010 Chad Elliott - - * bin/MakeProjectCreator/templates/gnu.mpd: - - Modified to best handle dependencies with a space or $(...) in - them. A GNU make substitute function call is used to escape - spaces. - -Mon Jan 25 09:24:30 UTC 2010 Johnny Willemsen - - * include/makeinclude/platform_macosx_iphone.GNU: - iPhone lacks rwho - -Sat Jan 23 18:48:30 UTC 2010 Johnny Willemsen - - * tests/Bug_2434_Regression_Test.cpp: - * tests/Time_Value_Test.cpp: - Moved another failing test to the bug_2434 file - -Sat Jan 23 13:53:30 UTC 2010 Martin Corino - - * tests/Thread_Attrs_Test.cpp: - - Changed test to check only if resulting stack size is - *at least* as large as requested. - As the Posix docs say that the size set for the threads stack - will be the *minimum* size allocated (the actual size may f.i. be - bigger because of a) pagesize rounding, b) guardsize addition) - this is the best we can do without konowing the exact algorithm - used by the pthread implementation. - Also see this https://bugzilla.redhat.com/show_bug.cgi?id=435337 - for more information. - -Fri Jan 22 10:38:30 UTC 2010 Martin Corino - - * config-linux-common.h: - - Added fix for mismatch of ACE_SIZEOF_LONG_DOUBLE on Linux ppc - 32bit platforms (sizeof(long double) = 128 bit). - -Fri Jan 22 08:48:30 UTC 2010 Johnny Willemsen - - * tests/Time_Value_Test.cpp: - Removed not used variable - -Thu Jan 21 23:16:27 UTC 2010 Abdul Sowayan - - * ace/CDR_Stream.cpp: - - Fixed the read_8 and write_8 methods for the iPhone Hardware. - The iPhone Hardware (ARM architecture) has the same memory - layout as Intel targets, and no conversion or swapping is - necessary. Double values sent from Windows to iPhone Hardware - were messed up before this fix due to unnecessary conversion. - - * ace/config-macosx-iphone-hardware.h: - * ace/config-macosx-iphone-simulator.h: - - Added ACE_HAS_IPHONE macro. - -Thu Jan 21 16:33:37 UTC 2010 Abdul Sowayan - - * include/makeinclude/platform_macosx_iphone.GNU: - - Removed the hardcoding of -DACE_AS_STATIC_LIBS and - -DTAO_AS_STATIC_LIBS to CFLAGS and CXXFLAGS and instead - added static_libs_only=1. That fixes the problem. Thanks - to Johnny Willemsen for the tip. - -Thu Jan 21 15:25:30 UTC 2010 Martin Corino - - * tests/Multicast_Test.cpp: - Fixed a Linux specific problem where certain Linux flavors use - VERY strict rules concerning multicast communications and where - using the (system defined) defaults for the network interface - used for multicast sending/receiving does not provide a - matching setup (i.e. resulting if used for sending does not - match the if used for receiving -> nothing received). - The fix simply forces a fixed 'lo' interface to be used for - sending and receiving. - -Thu Jan 21 14:57:57 UTC 2010 Abdul Sowayan - - * include/makeinclude/platform_macosx_iphone.GNU: - - Added -DACE_AS_STATIC_LIBS and -DTAO_AS_STATIC_LIBS to the CFLAGS - and CXXFLAGS variables to allow more tests to pass on the iPhone - Simulator. This hardcoding is obviously the wrong thing to do, - and needs to be fixed in the future. For some reason, when building - a static executable those macros are missing. - -Thu Jan 21 08:13:30 UTC 2010 Johnny Willemsen - - * tests/Time_Value_Test.cpp: - * tests/tests.mpc: - * tests/run_test.lst: - * tests/Bug_2434_Regression_Test.cpp: - Moved the 64bit overflow test which fails on 64bit systems to - its own file and marked that as not fixed - - * tests/Multicast_Test.cpp: - Const changes - -Tue Jan 19 13:24:02 UTC 2010 Olli Savia - - * tests/Bug_2980_Regression_Test.cpp: - Added missing #include . - -Mon Jan 18 17:57:47 UTC 2010 James H. Hill - - * ace/UUID.h: - - Included Auto_Ptr.h since it is not included by other included - header files and in breaking builds if UUID.h is included before - including another file that does include Auto_Ptr.h - -Mon Jan 18 13:47:53 UTC 2010 Douglas C. Schmidt - - * ace/ace_for_tao.mpc: Added Message_Queue_NT.cpp in this file since - it seems to be needed for the ACE_FOR_TAO subset. - -Fri Jan 15 10:27:30 UTC 2010 Olli Savia - - * ace/config-lynxos.h: - Define __NO_INCLUDE_WARN__ before including param.h. - Fixes compile warnings. - -Fri Jan 15 10:22:06 UTC 2010 Olli Savia - - * ace/Registry.cpp: - Fixed g++ 4.x compile warning on MinGW. - -Fri Jan 15 10:19:48 UTC 2010 Olli Savia - - * ace/config-win32-common.h: - Simplified setting of ACE_HAS_NONSTATIC_OBJECT_MANAGER. - -Fri Jan 15 04:19:45 UTC 2010 Douglas C. Schmidt - - * ace/Message_Queue_T.cpp: Readded - - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) - #include "ace/Message_Queue_NT.h" - #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ - - to fix a compile error on MinGW. Thanks to Olli Savia - for this fix. - -Fri Jan 15 04:18:17 UTC 2010 Douglas C. Schmidt - - * ace/Message_Queue_NT.cpp: Added - - #include "ace/Message_Queue.h" - - to fix a compile error on MinGW. Thanks to Olli Savia - for this fix. - -Fri Jan 15 04:17:06 UTC 2010 Douglas C. Schmidt - - * ace/Message_Queue.h: Once again removed - - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) - #include "ace/Message_Queue_NT.h" - #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ - - from this file.. - -Fri Jan 15 04:14:49 UTC 2010 Douglas C. Schmidt - - * ace/config-win32-common.h: Changed the definition - - # define ACE_HAS_NONSTATIC_OBJECT_MANAGER - - to - - # define ACE_HAS_NONSTATIC_OBJECT_MANAGER 0 - - to fix a compile error on MinGW. Thanks to Olli Savia - for this fix. - -Fri Jan 15 01:01:02 UTC 2010 Abdul Sowayan - - * tests/Thread_Attrs_Test.cpp: - - Slight modification to allow this test to pass on the iPhone - builds. Changed the spanwed thread's size from 42k to 40k. - - According to Apple's Documentation: "The minimum allowed stack - size for secondary threads is 16 KB and the stack size must be - a multiple of 4 KB." My change make the stack size a multiple - of 4k. Below is a reference to the Apple documentation for the - iPhone where I got the quote. - - http://developer.apple.com/iphone/library/documentation/Cocoa/Conceptual/Multithreading/CreatingThreads/CreatingThreads.html - -Thu Jan 14 20:06:49 UTC 2010 Abdul Sowayan - - * include/makeinclude/platform_macosx_iphone.GNU: - - Added "CROSS-COMPILE=1" to the top of the file. - -Thu Jan 14 20:02:41 UTC 2010 Douglas C. Schmidt - - * ace/OS_NS_Thread.cpp (add_to_argv): Replaced a call to strcpy() - with memmove() to avoid problems due to overlap with the - parameters. Thanks to Guillaume Lahaye for reporting this. - -Thu Jan 14 13:04:19 UTC 2010 Johnny Willemsen - - * tests/OS_Test.cpp: - Unicode fix - -Wed Jan 13 21:20:42 UTC 2010 Olli Savia - - * ace/README: - Removed ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS and - ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS. These are no longer used. - -Wed Jan 13 21:18:42 UTC 2010 Olli Savia - - * tests/Reference_Counted_Event_Handler_Test.cpp: - Fixed typo. - -Wed Jan 13 14:40:35 UTC 2010 Douglas C. Schmidt - - * ace/Message_Queue.h: Moved - - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) - #include "ace/Message_Queue_NT.h" - #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ - - back to this file based on comments from Arto. - -Wed Jan 13 13:51:54 UTC 2010 Douglas C. Schmidt - - * ace/Message_Queue_T.cpp: Moved - - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) - #include "ace/Message_Queue_NT.h" - #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ - - to outside the versioned namespace block. Thanks to Johnny for - reporting this. - -Wed Jan 13 09:03:19 UTC 2010 Johnny Willemsen - - * bin/fuzz.pl: - Only check run*.pl files when the filenames starts with run - -Wed Jan 13 06:45:19 UTC 2010 Johnny Willemsen - - * ace/os_include/sys/os_types.h: - * ace/OS_NS_arpa_inet.cpp: - * ace/OS_NS_unistd.inl: - VxWorks 6.8 fixes - - * ace/UUID.cpp: - Only one exit point for operator=, const change, initialise pointer with 0 - -Wed Jan 13 03:24:06 UTC 2010 Douglas C. Schmidt - - * ace/Message_Queue.h, - * ace/Message_Queue_T.cpp: Moved the code - - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) - #include "ace/Message_Queue_NT.h" - #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ - - from ace/Message_Queue.h to ace/Message_Queue_T.cpp since that - is more localized. - -Wed Jan 13 02:54:10 UTC 2010 Douglas C. Schmidt - - * ace/XtReactor/XtReactor.cpp: Removed stray tabs. Thanks to - Johnny for reporting this. - -Tue Jan 12 20:25:19 UTC 2010 Johnny Willemsen - - * bin/fuzz.pl: - Disable run_test.pl checking for some directories that - aren't converted yet - -Tue Jan 12 19:52:04 UTC 2010 Olli Savia - - * ace/Time_Value.inl: - Fixed typo. - - * ace/config-openbsd.h: - Removed ACE_LACKS_STRFTIME. - -Tue Jan 12 19:41:07 UTC 2010 Olli Savia - - * ace/config-integritySCA.h: - Removed ACE_LACKS_FILE_FCNTL. It is no longer used. - -Tue Jan 12 19:36:32 UTC 2010 Olli Savia - - * ace/config-openbsd.h: - Removed ACE_LACKS_EXECINFO_H. It is no longer used. - -Tue Jan 12 19:33:25 UTC 2010 Olli Savia - - * ace/os_include/netinet/os_tcp.h: - * configure.ac: - Fixed typo. - -Tue Jan 12 19:28:32 UTC 2010 Olli Savia - - * ace/config-integritySCA.h: - Removed ACE_LACKS_USER. It is no longer used. - -Tue Jan 12 19:24:54 UTC 2010 Olli Savia - - * ace/config-netbsd.h: - Removed ACE_LACKS_WSCANF. It is no longer used. - -Tue Jan 12 19:22:23 UTC 2010 Olli Savia - - * ace/config-mvs.h: - Removed ACE_LACKS_SYS_NERR. It is no longer used. - -Tue Jan 12 19:19:26 UTC 2010 Olli Savia - - * ace/config-netbsd.h: - Removed ACE_LACKS_SWSCANF. It is no longer used. - -Tue Jan 12 19:15:19 UTC 2010 Olli Savia - - * ace/OS_NS_stdlib.h: - Fixed typo. - - * ace/README: - Removed ACE_LACKS_SID and ACE_LACKS_STRCHR. - These are no longer used. - - * ace/config-integritySCA.h: - Removed ACE_LACKS_SHARED_MEMORY. It is no longer used. - -Tue Jan 12 19:04:15 UTC 2010 Olli Savia - - * ace/config-mvs.h: - Removed ACE_LACKS_MSGBUF_T. It is no longer used. - -Tue Jan 12 18:52:21 UTC 2010 Olli Savia - - * ace/README: - Removed ACE_LACKS_CMSG_DATA_MACRO and ACE_LACKS_CMSG_DATA_MEMBER. - These are no longer used. - -Tue Jan 12 14:18:58 UTC 2010 Olli Savia - - * ace/CDR_Base.h: - Removed obsolete comment. - - * ace/config-lynxos.h: - Minor cleanup. - -Mon Jan 11 13:53:54 UTC 2010 Douglas C. Schmidt - - * ace/XtReactor/XtReactor.{h,cpp}: Added a fix for BugID 3775. - Thanks to Dirk Bonekaemper - for this fix. - -Mon Jan 11 02:24:01 UTC 2010 Douglas C. Schmidt - - * ace/config-macros.h (ACE_WIN32CALL_RETURN): Changed - - TYPE ace_result_ = (TYPE) X; \ - - to - - TYPE ace_result_; \ - ace_result_ = (TYPE) X; \ - - to fix a compile error on MinGW. Thanks to Arto Jalkanen - for this fix. - -Mon Jan 11 02:20:09 UTC 2010 Douglas C. Schmidt - - * ace/Message_Queue.h: Added - - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) - #include "ace/Message_Queue_NT.h" - #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ - - to fix a compile error on MinGW. Thanks to Arto Jalkanen - for this fix. - -Tue Jan 12 04:12:41 UTC 2010 Abdul Sowayan - - * ace/config-macosx-iphone-hardware.h: - * ace/config-macosx-iphone-simulator.h: - - Split the below file to the two files listed above. - - * ace/config-macosx-iphone.h: - - Removed this file. - -Tue Jan 12 02:10:48 UTC 2010 Abdul Sowayan - - * include/makeinclude/platform_macosx_iphone.GNU: - - crt1.10.6.o is missing under MacOSX 10.6 for iPhone Simulator. - Fallback to 10.5 until apple provides the missing crt1.10.6.o - -Sat Jan 9 00:42:55 UTC 2010 Abdul Sowayan - - * ace/config-macosx-iphone.h: - - added "#define ACE_SIZEOF_LONG_DOUBLE 8" since this is the size - of long double on my iPhone 3GS. The value of long double in the - simulator is probably different. We need to adjust this once - we verify that the simulator value is different than the - hardware's value. - -Wed Jan 6 05:25:26 UTC 2010 Abdul Sowayan - - * include/makeinclude/platform_macosx_iphone.GNU: - - When building an executable for the iPhone Hardware (not simulator) - go ahead and automatically codesign the executable so it can be - deployed on the hardware. Note that this is a temporary hack until - I can figure the proper way to do this. - -Wed Jan 6 04:28:23 UTC 2010 Abdul Sowayan - - * include/makeinclude/platform_macosx_iphone.GNU: - - Minor enhancement. - -Mon Jan 4 20:09:39 UTC 2009 Johnny Willemsen - - * rpmbuild/ace-tao.spec - Also dump lsb_release info - -Fri Jan 1 03:09:45 UTC 2010 Douglas C. Schmidt - - * Happy New Year everyone!!! - -Thu Dec 31 20:54:51 UTC 2009 Steve Huston - - * ace/High_Res_Timer.cpp (get_cpuinfo): Don't use a CPU MHz value 0. - I got a customer report with a real cpuinfo file showing 0. - -Thu Dec 31 17:46:10 UTC 2009 Steve Huston - - * bin/MakeProjectCreator/config/ace_fl.mpb: Rather than add - PLATFORM_GL_LDFLAGS twice, one should be PLATFORM_X11_LDFLAGS. - Thanks to Aaron Scamehorn for catching this. - -Thu Dec 31 17:24:14 UTC 2009 Steve Huston - - * include/makeinclude/wrapper_macros.GNU: If both static_libs_only - and shared_libs_only are set, report the error and stop. Thanks to - Howard Finer for reporting this. - -Thu Dec 31 12:27:00 UTC 2009 Johnny Willemsen - - * bin/fuzz.pl: - Fixed fuzz check for Spawn with Stop - -Wed Dec 30 08:41:03 UTC 2009 Olli Savia - - * ace/Sig_Handler.cpp: - Do not use SA_SIGINFO on LynxOS. - -Thu Dec 24 10:55:00 UTC 2009 Johnny Willemsen - - * performance-tests/RPC/run_test.pl - * performance-tests/SCTP/run_spectrum.pl - * performance-tests/TCP/run_test.pl - * performance-tests/UDP/run_test.pl - Fuzz fixes - -Thu Dec 24 10:49:00 UTC 2009 Johnny Willemsen - - * protocols/tests/HTBP/ping/run_test.pl - * protocols/tests/HTBP/Reactor_Tests/run_test.pl - * protocols/tests/HTBP/Send_Large_Msg/run_test.pl - * protocols/tests/HTBP/Send_Recv_Tests/run_test.pl - * tests/run_test.pl - Fixed fuzz - -Thu Dec 24 10:20:00 UTC 2009 Johnny Willemsen - - * apps/gperf/src/Bool_Array.h: - * apps/gperf/src/Key_List.h: - Fixes for C++ Builder 2010 Update 4/5 - -Thu Dec 24 09:54:00 UTC 2009 Johnny Willemsen - - * ace/OS_NS_string.cpp: - Const changes, layout changes, call ACE_OS::strncat instead of - strncat directly - - * ace/Log_Msg.cpp: - * ace/Log_Msg.h: - Const changes - - * ace/config-win32-borland.h: - C++ Builder 2010 has a broken wcsncat, reported as QC80630, for - this version we now enable the ACE emulation for wcsncat - - * ace/OS_NS_wchar.cpp: - Initialise some pointers with 0 - -Mon Dec 21 11:29:00 UTC 2009 Johnny Willemsen - - * bin/fuzz.pl: - Fixed error message and added a test for generated file headers - -Mon Dec 21 11:26:00 UTC 2009 Johnny Willemsen - - * bin/bootstrap: - Invoke autoupdate as part of this script - -Sun Dec 20 07:58:00 UTC 2009 Johnny Willemsen - - * ace/checked_iterator.h: - stl port doesn't have a checked iterator. This fixes bugzilla - 3799 and 3420. Thanks to and - Mark Hebbel for - reporting this - -Fri Dec 18 17:40:00 UTC 2009 Johnny Willemsen - - * bin/PerlACE/ProcessVX_Unix.pm: - * bin/PerlACE/ProcessVX_Win32.pm: - Added IgnoreHostRoot - -Fri Dec 18 12:55:00 UTC 2009 Martin Corino - - * NEWS: - Updated fixed bugzilla entries. - -Thu Dec 17 12:29:00 UTC 2009 Martin Corino - - * ace/INET_Addr.inl: - Fixed bug in ::is_multicast() for little-endian platforms. - This fixes Bugzilla #3729. - - * tests/Bug_3729_Regression_Test.cpp: - Fixed typo in logfile name. - - * tests/run_test.lst: - Removed !FIXED_BUGS_ONLY for Bug_3729_Regression_Test. - -Wed Dec 16 11:24:00 UTC 2009 Martin Corino - - * ACE_wrappers/ace/Log_Msg.h: - Updated doxygen docu regarding additions to %D and %T - options. - -Wed Dec 16 09:09:00 UTC 2009 Martin Corino - - * ACE_wrappers/ace/ACE.h: - * ACE_wrappers/ace/ACE.cpp: - * ACE_wrappers/ace/Log_Msg.cpp: - Added option to print a given ACE_Time_Value in the log - message instead of system supplied timestamp as in %T - and %D. - The option is implemented as a variant of the %D/%T - options by using the '#' flag character like '%#D' or - '%#T'. When using this flag an ACE_Time_Value pointer is - expected in the argument list supplied with the log message. - This fixed Bugzilla #3221. - - * ACE_wrappers/tests/Log_Msg_Test.cpp: - Added some testlines for this option. - -Mon Dec 14 14:58:05 UTC 2009 Abdul Sowayan - - * NEWS: - - Updated to note iPhone/iPod Touch support. - -Mon Dec 14 11:21:46 UTC 2009 Johnny Willemsen - - * html/Stats/index.shtml: - Updated link to PS3/IBM Cell performance graphs - -Mon Dec 14 10:58:46 UTC 2009 Johnny Willemsen - - * examples/Export/run_test.pl: - Fixed fuzz error - -Sun Dec 13 22:38:13 UTC 2009 Abdul Sowayan - - * include/makeinclude/platform_macosx_iphone.GNU: - - Changed to allow iPhone Hardware compiler to generate executables. - -Sun Dec 13 18:30:26 UTC 2009 Abdul Sowayan - - * include/makeinclude/platform_macosx_iphone.GNU: - - Enhanced iPhone support. Now we can build for the iPhone - Hardware target in addition to the simulator. - -Sat Dec 12 15:40:13 UTC 2009 Abdul Sowayan - - * ace/config-macosx-iphone.h: - * include/makeinclude/platform_macosx_iphone.GNU: - - First cut at supporting iPhone 3.1.2. These files need - some cleanup. With these files, using the iPhone simulator - I was able to spawn ACE Threads, print ACE Logs messages, - and communicate between the the iPhone simulator and a - Windows machine using CORBA. - -Thu Dec 10 20:03:58 UTC 2009 Johnny Willemsen - - * bin/fuzz.pl: - Improved error message - -Thu Dec 10 15:37:58 UTC 2009 Johnny Willemsen - - * bin/ACETAOCIAO.style: - Small updates - -Thu Dec 10 15:10:58 UTC 2009 Johnny Willemsen - - * bin/fuzz.pl: - Check all run_*.pl files for fuzz - -Thu Dec 10 13:07:58 UTC 2009 Johnny Willemsen - - * ace/config-win32-borland.h: - Removed hard supported version check - -Wed Dec 9 10:52:26 UTC 2009 Denis Budko - - * bin/fuzz.pl: - - Updated conditions for new framework - -Mon Dec 7 16:09:18 UTC 2009 Steve Huston - - * tests/Basic_Types_Test.cpp: Add a verification for the endianness - setting. - -Mon Dec 7 07:40:00 UTC 2009 Johnny Willemsen - - * bin/MakeProjectCreator/config/bmake.features: - Disable mcpp for bmake - -Fri Dec 4 23:24:21 UTC 2009 Yan Dai - - * bin/MakeProjectCreator/config/global.features: - - Added mpc feature to optionally turn on the indirection - support on valuetype outgoing message. It defaults to - be enabled. To be compatible with previous version TAO, - it needs run mwc.pl with - "-features valuetype_out_indirection=0" to disable it. - -Fri Dec 4 17:25:32 UTC 2009 Yan Dai - - * NEWS: - - Removed entry for member validation feature in LoadBalancer as it - should be in TAO NEWS. - -Fri Dec 4 13:19:00 UTC 2009 Johnny Willemsen - - * html/Stats/index.shtml: - Added link for IBM Cell xampler performance stats - -Fri Dec 4 10:20:23 UTC 2009 Marcel Smit - - * bin/fuzz.pl: - Removed -v option. The information which is generated - by -v should always be visible. - -Fri Dec 4 07:30:00 UTC 2009 Johnny Willemsen - - * ace/config-win32-borland.h: - CB2010 fix - -Thu Dec 3 11:59:00 UTC 2009 Johnny Willemsen - - * bin/fuzz.pl: - Check CIAO_TRACE macros and put all run_*.pl files in a separate - list - -Wed Dec 2 18:17:04 UTC 2009 Yan Dai - - * NEWS: - - Added entry for member validation feature in LoadBalancer. - -Wed Dec 2 13:46:00 UTC 2009 Martin Corino - - * debianbuild/{all files containign version numbers}: - Updated to latest micro release. - -Wed Dec 2 13:30:00 UTC 2009 Martin Corino - - * bin/make_release.py: - Added code to update version numbers in ACE_ROOT/debianbuild files - on release. - Changed to retrieve repo root by default from info of working copy. - -Wed Dec 2 07:51:00 UTC 2009 Johnny Willemsen - - * bin/copy-script.sh: - Also copy md5 files - - * bin/MakeProjectCreator/config/bmake.features: - Enable mcpp for bmake - -Thu Nov 26 02:08:59 UTC 2009 Douglas C. Schmidt - - * Gaurav Kulshreshtha is the 2300th contributor to ACE+TAO+CIAO! - -Mon Nov 30 19:11:00 UTC 2009 Johnny Willemsen - - * apps/gperf/src/Bool_Array.h: - * apps/gperf/src/Key_List.h: - C++ Builder 2010 fixes - -Mon Nov 30 14:02:00 UTC 2009 Johnny Willemsen - - * ace/Process.cpp: - * ace/Process.h: - Fixed gcc warnings - -Mon Nov 30 12:38:00 UTC 2009 Johnny Willemsen - - * ace/config-win32-borland.h: - Started port to C++ Builder 2010, older versions of C++ Builder are - now deprecated - - * ace/MMAP_Memory_Pool.cpp: - Layout change - - * ace/OS_NS_sys_time.h: - * ace/OS_NS_sys_time.inl: - Removed workarounds for ancient wince versions - - * ace/Process.cpp: - * ace/Process.h: - Use bool and size_t and removed some ugly casts - - * ace/Trace.cpp: - * ace/Trace.h: - Use bool - -Mon Nov 30 10:53:00 UTC 2009 Johnny Willemsen - - * debianbuild/patches/18-fix-bswap-detection.dpatch: - * debianbuild/patches/22-tao_idl-64bit-fix.dpatch: - Removed, not needed anymore - -Mon Nov 30 10:08:00 UTC 2009 Martin Corino - - * include/makeinclude/platform_linux_common.GNU: - - Added some rules to support cross builds. - Setting the environment variable (or make variable) CROSS_COMPILE - to the platform tool prefix will redefine the CC, CXX and AR - variables and add a '-Wl,-rpath-link' option to the LDFLAGS. - If the HOST_ROOT variable has been set as well TAO_IDLxxx variables - will be redefined as well. - -Mon Nov 30 08:58:00 UTC 2009 Johnny Willemsen - - * bin/diff-builds-and-group-fixed-tests-only.sh: - * bin/Download.html: - updated for x.7.5 - - * bin/make_release.py - * rpmbuild/ace-tao-ciao.spec - * rpmbuild/ace-tao.spec - Updated to match opensuse build service - - * docs/svn/svn-prefs.reg: - Added idl3+ - - * etc/index.html: - Added 5.7.5 - -Sun Nov 29 13:06:02 CST 2009 Johnny Willemsen - - * ACE version 5.7.5 released. - -Thu Nov 26 12:33:00 UTC 2009 Johnny Willemsen - - * tests/Message_Queue_Test.cpp: - Fixed msvc warning - -Thu Nov 26 04:19:02 UTC 2009 William R. Otte - - * tests/Message_Queue_Test.cpp: - - Attempt to resolve warning for MSVC. - -Tue Nov 24 09:39:00 UTC 2009 Johnny Willemsen - - * ace/Tokenizer_T.cpp: - Check if buffer_ is not nil - - * bin/fuzz.pl: - Export files shouldn't be in the ciao repository anymore, all - should be generated by TAO_IDL - -Mon Nov 23 10:56:18 UTC 2009 Marcel Smit - - * THANKS: - Added Wolfgang Pickartz.for solving a TAO_IDL compiler - issue. - -Mon Nov 23 07:53:57 UTC 2009 Johnny Willemsen - - * debianbuild/changelog: - * debianbuild/control: - * debianbuild/dsc: - * debianbuild/rules: - Imported last version from debian - -Thu Nov 19 20:29:57 UTC 2009 Douglas C. Schmidt - - * ace/Log_Msg_NT_Event_Log.cpp (ACE_Log_Msg_NT_Event_Log::log): - Added checks to ensure that log() works properly if the msg_data - size is greater than ACE_Log_Record::MAXLOGMSGLEN. Thanks to - Gaurav Kulshreshtha for contributing this fix. - -Fri Nov 20 08:45:52 UTC 2009 Olli Savia - - * ace/Log_Msg.cpp: - Updated documentation for '%S' modifier. - -Fri Nov 20 07:06:04 UTC 2009 Olli Savia - - * ace/Sig_Handler.cpp: - Reverted: Sun Nov 1 16:47:29 UTC 2009 Olli Savia - -Thu Nov 19 14:08:29 UTC 2009 Olli Savia - - * ace/Sig_Handler.cpp: - Reverted: Mon Nov 2 08:36:24 UTC 2009 Olli Savia - -Wed Nov 19 09:45:00 UTC 2009 Johnny Willemsen - - * ace/config-WinCE.h: - Only define FILE_MAP_COPY when it is not defined yet - -Mon Nov 16 14:40:42 UTC 2009 Olli Savia - - * include/makeinclude/platform_win32_interix.GNU: - * ace/config-win32-interix.h: - * ace/os_include/sys/os_types.h: - Updated Interix support. - -Sun Nov 15 08:09:00 UTC 2009 Johnny Willemsen - - * debianbuild/*: - Renamed all files for x.7.4 - -Fri Nov 13 19:38:00 UTC 2009 Johnny Willemsen - - * bin/fuzz.pl: - Sys::Hostname shouldn't be used in a test script, use HostName on - the test target instead - -Fri Nov 13 01:54:01 UTC 2009 William R. Otte - - * include/makeinclude/platform_macosx_common.GNU: - * include/makeinclude/platform_macosx_snowleopard.GNU: - - Added support for buildbits=universal for building 32/64 bit - universal binaries with GCC. - -Fri Nov 13 01:12:33 UTC 2009 William R. Otte - - * include/makeinclude/platform_macosx_common.GNU: - - Fixed 32 bit support. - -Fri Nov 13 00:33:49 UTC 2009 Yan Dai - - * ace/Logging_Strategy.h: - * ace/Logging_Strategy.cpp: - - Added static service declaration and definition to fix loading - issue in TAO Service (e.g Notify) in static builds. - -Thu Nov 12 15:53:15 UTC 2009 Johnny Willemsen - - * bin/fuzz.pl: - Exteded perl fuzz checks - -Thu Nov 12 08:31:00 UTC 2009 Denis Budko - - * docs/run_test.txt - Added description of TestTarget::HostName() function usage - -Thu Nov 12 06:54:15 UTC 2009 Johnny Willemsen - - * ace/Default_Constants.h: - * ace/OS_NS_fcntl.h: - * ace/RW_Process_Mutex.h: - Moved all constants to Default_Constants.h - -Wed Nov 11 14:57:15 UTC 2009 Olli Savia - - * tests/run_test.lst: - Run Network_Adapters_Test and SOCK_Dgram_Bcast_Test on LynxOS. - -Wed Nov 11 13:49:11 UTC 2009 Olli Savia - - * ace/config-freebsd.h: - Added ACE_HAS_SIGISMEMBER_BUG. - -Wed Nov 11 12:07:36 UTC 2009 Olli Savia - - * bin/fuzz.pl: - Added strsignal to functions that is checked - for the lack of ACE_OS. - -Wed Nov 11 11:45:23 UTC 2009 Olli Savia - - * ace/OS_NS_string.h: - Doxygen updates. - -Wed Nov 11 11:36:26 UTC 2009 Olli Savia - - * ace/OS_NS_signal.inl: - * ace/config-lynxos.h: - * ace/os_include/os_signal.h: - * configure.ac: - * m4/config_h.m4: - * m4/platform.m4: - Renamed ACE_HAS_LYNXOS_SIGNALS to ACE_HAS_LYNXOS4_SIGNALS. - -Wed Nov 11 09:36:32 UTC 2009 Johnny Willemsen - - * bin/fuzz.pl: - Extended Id check to detect Id: - -Wed Nov 11 03:07:32 UTC 2009 William R. Otte - - * include/makeinclude/platform_macosx_snowleopard.GNU: - - Add support for building 32 bits. - -Tue Nov 10 21:03:25 UTC 2009 William R. Otte - - * bin/sets-manager.py: - - bugfix for windows. note that cleaning up the temp directory doesn't - work on windows, that will need to be done by hand. - -Tue Nov 10 12:17:33 2009 Johnny Willemsen - - * bin/fuzz.pl: - Check for hardcoded timeouts, thanks to Chad for assisting with this - -Tue Nov 10 12:10:33 2009 Johnny Willemsen - - * bin/fuzz.pl: - ACE_RUN_VX_TGTHOST shouldn't be used in a test script - -Tue Nov 10 06:31:33 2009 Steve Huston - - * ace/Message_Queue_T.cpp (enqueue_*): When enqueuing blocks, grab the - notifier pointer before releasing the guard; check it and do any - needed notify() outside the lock scope. Avoids dereferencing 'this' - when the message queue is deleted between the time the guard is - released and the notify is checked. User is still responsible for - ensuring the lifetime of a notifier the user supplies. - Also, moved the monitor updates out of notify() and into the - enqueue_* methods, inside the guard scope since they refer to - object state; rely on the Monitor docs that say the updates are - well-behaved. - -Tue Nov 10 00:35:52 UTC 2009 Steve Huston - - * ace/Dev_Poll_Reactor.cpp: Some changes extraneous to those in - Wed Nov 4 00:07:49 UTC 2009 Steve Huston - got checked in by accident; these screwed up the handle resuming - and are now reverted. The changes/fix mentioned in - Wed Nov 4 00:07:49 UTC 2009 Steve Huston - are now the only ones included. - -Mon Nov 9 12:20:05 UTC 2009 William R. Otte - - * tests/Message_Queue_Test.cpp: - - Modified to use rand_r, which is actually thread safe. - -Mon Nov 9 03:41:21 UTC 2009 William R. Otte - - * tests/Message_Queue_Test.cpp: - - Another attempt at fixing this problem on Snow Leopard, hopefully - less disruptive than the last attempt. - -Sat Nov 7 08:32:47 UTC 2009 Johnny Willemsen - - * ace/Basic_Types.h: - Fix long double for ppc64 - -Fri Nov 6 11:41:47 UTC 2009 Johnny Willemsen - - * bin/fuzz.pl: - Reverted the change to check all perl scripts - -Fri Nov 6 10:13:00 UTC 2009 Simon Massey - - * ace/Tokenizer_T.cpp: - - Allow tokens to have embedded quotes so that - tao_idl, which generates parameters such as - -I"directory with spaces", actually works. - - I.E. Only remove surrounding quotes. With - embedded quotes; the original code simply - returned the token when the quote character - was detected, without inserting a token splitting - null at the quote character (which if it had, - would then mess up the next quoted token - processing). This ment that the parameters got - repeated many times over as they are inserted - and interpreted again and again. - -Fri Nov 6 08:30:47 UTC 2009 Johnny Willemsen - - * bin/fuzz.pl: - Also check cdp files for tabs - -Thu Nov 5 20:13:47 UTC 2009 Olli Savia - - * ace/ACE.h: - * ace/ACE.inl: - * ace/ACE.cpp: - Moved nibble2hex from .inl to .cpp file to avoid static - data in inline function. - -Thu Nov 5 13:58:25 UTC 2009 Olli Savia - - * ace/OS_NS_stdlib.h: - Another fix for platforms that define ACE_STRTOLL_EQUIVALENT or - ACE_STRTOULL_EQUIVALENT. - -Thu Nov 5 13:46:34 UTC 2009 Olli Savia - - * ace/OS_NS_stdlib.h: - Fix for platforms that lack strtoll or strtoull. - -Thu Nov 5 11:56:13 UTC 2009 Olli Savia - - * ace/OS_NS_stdlib.h: - * ace/OS_NS_stdlib.inl: - Added ace_strtoll_helper and ace_strtoull_helper to fix compile - errors if strtoll or strtoull is macro. - -Thu Nov 5 11:32:07 UTC 2009 Olli Savia - - * ace/config-lynxos.h: - * ace/os_include/os_signal.h: - Use ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES instead of - ACE_HAS_LYNXOS50_SIGNALS. - -Wed Nov 4 20:57:08 UTC 2009 Yan Dai - - * bin/MakeProjectCreator/config/global.features: - - Set notify_monitor_control default value be 0. - -Wed Nov 4 17:50:05 UTC 2009 Johnny Willemsen - - * tests/Message_Queue_Test.cpp: - Improved portability - -Wed Nov 4 14:51:00 UTC 2009 Olli Savia - - * tests/Bug_3758_Regression_Test.cpp: - * tests/OS_Test.cpp: - * tests/run_test.lst: - * tests/tests.mpc: - Moved regression test for 3758 to its own file. - -Wed Nov 4 11:39:05 UTC 2009 Johnny Willemsen - - * html/index.html: - Updated description for DDS4CCM documentation - -Wed Nov 4 00:07:49 UTC 2009 Steve Huston - - * ace/Dev_Poll_Reactor.cpp (resume_handler_i): If asked to resume a - handler without any bits currently set, just note the handler has - been resumed, don't fail it. Prevents orphaned handle if a - auto-suspended handler's callback clears the lone bit set. - -Mon Nov 2 13:45:05 UTC 2009 Johnny Willemsen - - * ace/RW_Process_Mutex.h: - * ace/Default_Constants.h: - Added ACE_DEFAULT_RW_PROCESS_MUTEX_PERMS with which the end user - can override the default permissions - - * ace/Addr.inl: - * ace/MMAP_Memory_Pool.cpp: - Doxygen changes - -Mon Nov 2 08:52:05 UTC 2009 Olli Savia - - * tests/OS_Test.cpp: - Enhanced strsignal test to test with negative signal numbers. - -Mon Nov 2 08:40:08 UTC 2009 Olli Savia - - * tests/run_test.lst: - Run Signal_Test on FreeBSD. - -Mon Nov 2 08:36:24 UTC 2009 Olli Savia - - * ace/Sig_Handler.cpp: - Removed setting of SA_SIGINFO flag. It should not be used - with POSIX.1 signal handler (sa_handler). - -Sun Nov 1 16:47:29 UTC 2009 Olli Savia - - * ace/Sig_Handler.cpp: - LynxOS 4.x supports SA_SIGINFO. - -Fri Oct 30 18:46:03 UTC 2009 Steven Stallion - - * include/makeinclude/wrapper_macros.GNU: - - Added -DNDEBUG to CPPFLAGS when debug=0 is set. - -Thu Oct 29 21:45:30 UTC 2009 Olli Savia - - * ace/OS_NS_pwd.h: - * ace/OS_NS_time.inl: - * ace/README: - * ace/config-mvs.h: - * ace/config-tru64.h: - * ace/os_include/os_time.h: - * configure.ac: - * m4/config_h.m4: - Removed references to ACE_HAS_BROKEN_CTIME and - ACE_HAS_BROKEN_R_ROUTINES. - -Thu Oct 29 21:25:49 UTC 2009 Chris Cleeland - - * tests/Message_Queue_Test.cpp: - - Reverted change from Tue Oct 27 08:12:25 UTC 2009 - William R. Otte . The change - was causing core dumps on some platforms due to treating - the thread ID as a pointer and dereferencing that pointer. - Better to live with compiler warnings than crashes. - -Thu Oct 29 21:04:27 UTC 2009 Olli Savia - - * ace/README: - * ace/config-aix-5.x.h: - * ace/config-irix6.x-g++.h: - * ace/config-lynxos.h: - * ace/config-netbsd.h: - * ace/config-openbsd.h: - * ace/config-sco-5.0.0-nothread.h: - * ace/config-sunos5.4-g++.h: - * ace/config-sunos5.5.h: - * ace/config-tru64.h: - * ace/config-unixware-7.1.0.h: - * ace/config-win32-borland.h: - * ace/config-win32-dmc.h: - * ace/config-win32-ghs.h: - * configure.ac: - * m4/config_h.m4: - Removed references to ACE_HAS_GNU_CSTRING_H. - -Thu Oct 29 20:30:35 UTC 2009 Olli Savia - - * ace/OS_NS_stdlib.h: - Readded undef atop. Fixes compile error on FreeBSD. - -Thu Oct 29 13:58:25 UTC 2009 Olli Savia - - * ace/OS_NS_stdlib.h: - * ace/OS_NS_stdlib.inl: - * ace/OS_NS_time.h: - Removed some legacy undefs. - -Thu Oct 29 08:08:51 UTC 2009 Olli Savia - - * ace/Log_Msg.cpp: - * ace/Select_Reactor_Base.cpp: - Fixed fuzz errors. - -Wed Oct 28 19:49:39 UTC 2009 Chris Cleeland - - * ace/Select_Reactor_Base.h: - * ace/Select_Reactor_Base.cpp: - - Changed the second recv() that is used in case of a short first - read to be a recv_n(), blocking until the rest of the buffer can - be received on the pipe. The problem was discovered during - routine testing (Notify_Performance_Test) on VxWorks 6.7 on a P3 - platform, but could occur on any platform. [Bugzilla 3754] - -Wed Oct 28 11:58:21 UTC 2009 Olli Savia - - * ace/config-win32-msvc-7.h: - Reverted: Tue Oct 27 19:40:59 UTC 2009 Olli Savia - It seems that VC7 doesn't support _get_osfhandle. - -Wed Oct 28 11:54:03 UTC 2009 Olli Savia - - * ace/Log_Msg.h: - * ace/Log_Msg.cpp: - Use ACE_OS::strsignal() instead of sys_siglist. - - * ace/config-freebsd.h: - * ace/config-linux-common.h: - * ace/config-lynxos.h: - * ace/config-netbsd.h: - * ace/config-openbsd.h: - * ace/config-sunos5.4-g++.h: - * ace/config-sunos5.4-sunc++-4.x.h: - * ace/config-sunos5.5.h: - Removed legacy sys_siglist related settings. - -Wed Oct 28 06:30:33 UTC 2009 Johnny Willemsen - - * include/makeinclude/platform_sunos5_g++.GNU: - Added support for buildbits 64 - -Tue Oct 27 20:14:50 UTC 2009 Olli Savia - - * ace/OS.inl: - Removed some legacy code. - -Tue Oct 27 19:40:59 UTC 2009 Olli Savia - - * ace/config-win32-msvc-7.h: - Added missing ACE_FILENO_EQUIVALENT macro. - -Tue Oct 27 19:35:06 UTC 2009 Olli Savia - - * tests/OS_Test.cpp: - Fixed wrong logic with macros - -Thu Oct 22 21:12:21 UTC 2009 Douglas C. Schmidt - - * ace/Pipe.h (ACE_Pipe): Updated the document to correct a typo. - Thanks to Matthew Carter for reporting this. - -Tue Oct 27 10:01:51 UTC 2009 Olli Savia - - * ace/OS_NS_string.cpp: - * ace/config-aix-5.x.h: - strsignal fix for AIX. - -Tue Oct 27 08:22:25 UTC 2009 William R. Otte - - * include/makeinclude/platform_macosx_tiger.GNU: - - fixed typo. - -Tue Oct 27 08:12:25 UTC 2009 William R. Otte - - * ace/config-macosx-snowleopard.h: - * include/makeinclude/platform_macosx_common.GNU: - * include/makeinclude/platform_macosx_snowleopard.GNU: - * include/makeinclude/platform_macosx_tiger.GNU: - - Re-factored snow leopard support, I now get a clean compile. - Tests will be evaluated when we get our x86 Mac hardware. - - * tests/Message_Queue_Test.cpp: - - Introduced some pointer gymnastics to convert a ACE_thread_t - to a seed for the random number generator. This was done to avoid - compile warnings due to pointers being bigger than a uint_t and losing - precision in the conversion. - -Tue Oct 27 07:55:38 UTC 2009 Olli Savia - - * tests/OS_Test.cpp: - Use ACE_INVALID_HANDLE instead of -1. Changed C-style casts - to C++ casts. - -Mon Oct 26 22:08:38 UTC 2009 Olli Savia - - * ace/config-win32-borland.h: - Added ACE_FILENO_EQUIVALENT. - -Mon Oct 26 15:42:34 UTC 2009 Olli Savia - - * tests/OS_Test.cpp: - Added cast to fix compile error on Windows. - -Mon Oct 26 12:25:33 UTC 2009 Johnny Willemsen - - * ace/OS_NS_stdio.inl: - Fix for msvc10 - -Mon Oct 26 11:54:33 UTC 2009 Johnny Willemsen - - * ace/Basic_Types.h: - Small improvement for PPC64 - -Mon Oct 26 10:41:43 UTC 2009 Vladimir Zykov - - * protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp: - * protocols/ace/HTBP/HTBP_Session.h: - * protocols/ace/HTBP/HTBP_Environment.cpp: - * protocols/ace/HTBP/HTBP_Channel.h: - * protocols/ace/HTBP/HTBP_Filter_Factory.h: - * protocols/ace/HTBP/HTBP_Session.cpp: - * protocols/ace/HTBP/HTBP_Session.inl: - * protocols/ace/HTBP/HTBP_ID_Requestor.cpp: - * protocols/ace/HTBP/HTBP_Channel.inl: - * protocols/ace/HTBP/HTBP_Channel.cpp: - * protocols/ace/HTBP/HTBP_Environment.h: - * protocols/ace/HTBP/HTBP_Filter_Factory.cpp: - Simplified the code and fixed several memory leaks. - -Mon Oct 26 10:23:13 UTC 2009 Olli Savia - - * tests/run_test.lst: - Don't run MEM_Stream_Test and MT_SOCK_Test on LynxOS. - -Mon Oct 26 10:18:28 UTC 2009 Olli Savia - - * tests/Bug_2653_Regression_Test.cpp: - * tests/Cached_Conn_Test.cpp: - * tests/Reactor_Dispatch_Order_Test.cpp: - LynxOS improvements. - -Mon Oct 26 08:32:08 UTC 2009 Olli Savia - - * tests/OS_Test.cpp: - Improved test to detect if std{out,err} is not associated - with an output stream. This may happen with Windows application - without a console window. - -Mon Oct 26 07:48:19 UTC 2009 Olli Savia - - * ace/config-win32-msvc-10.h: - * ace/config-win32-msvc-8.h: - * ace/config-win32-msvc-9.h: - Fix for WinCE build. - -Sat Oct 24 14:33:33 UTC 2009 Johnny Willemsen - - * ace/Basic_Types.h: - Fix for PPC64 - -Sat Oct 24 14:30:33 UTC 2009 Johnny Willemsen - - * include/makeinclude/platform_linux.GNU: - Fix for PPC64 - -Sat Oct 24 12:18:00 UTC 2009 Olli Savia - - * ace/OS_NS_Thread.inl: - LynxOS improvements. - -Sat Oct 24 12:15:40 UTC 2009 Olli Savia - - * ace/OS_NS_string.cpp (strsignal): - Fix for Solaris and AIX. - -Fri Oct 23 21:38:31 UTC 2009 Abdullah Sowayan - - * include/makeinclude/platform_macosx_snowleopard.GNU: - - Enhanced this file to remove -Wno-long-double from CFLAG. - Thanks to Adam Mitz for the suggestion on how to fix this. - -Fri Oct 23 20:25:13 UTC 2009 Olli Savia - - * ace/os_include/os_string.h: - Removed some legacy code. - -Fri Oct 23 13:58:45 UTC 2009 Olli Savia - - * tests/run_test.lst: - Run Signal_Test on LynxOS. - -Fri Oct 23 13:23:49 UTC 2009 Olli Savia - - * m4/config_h.m4: - Reverted: Mon Oct 19 20:58:10 UTC 2009 Olli Savia - -Fri Oct 23 13:10:33 UTC 2009 Johnny Willemsen - - * ace/File_Lock.{h,cpp,inl}: - Use bool instead of int - -Fri Oct 23 12:52:33 UTC 2009 Johnny Willemsen - - * bin/run_test.pl: - Extended run_test check - -Fri Oct 23 09:56:50 UTC 2009 Olli Savia - - * ace/config-aix-5.x.h: - Added ACE_HAS_STRSIGNAL. - -Fri Oct 23 09:51:17 UTC 2009 Olli Savia - - * ace/config-win32-msvc-10.h: - * ace/config-win32-msvc-8.h: - * ace/config-win32-msvc-9.h: - Added missing _get_osfhandle() call to ACE_FILENO_EQUIVALENT macro. - -Thu Oct 22 14:16:10 UTC 2009 Chad Elliott - - * bin/MakeProjectCreator/templates/gnu.mpd: - - If a custom 'dependent' setting contains a double quote, then we - must make a fake rule that corresponds to it. Otherwise, make - doesn't know how to deal with it. - -Tue Oct 20 16:20:33 UTC 2009 Steve Huston - - * ace/Message_Queue_T.cpp (enqueue_*): Move the notify() call outside - the lock scope; holding the lock across a call that may block (or - do anything else we don't know about) is dangerous. It resulted in - deadlock at a customer site. - - See Bugzilla #3250 for any follow-up issues. - - * ace/Process_Mutex.h: Fix doxygen stuff and clarify the behavior - when based on semaphores vs. mutexes where there's a choice. - -Tue Oct 20 10:35:57 UTC 2009 Olli Savia - - * ace/OS_NS_string.cpp: - Reformatted returned string in emulated strsignal. - If signum is invalid, "Unknown signal %d" is used to - format the string. Otherwise, "Signal %d" is used. - - Use ACE_SYS_SIGLIST instead of ACE_HAS_SYS_SIGLIST. - - * ace/config-lynxos.h: - Removed ACE_HAS_SYS_SIGLIST. Macro is no longer used. - -Mon Oct 19 20:58:10 UTC 2009 Olli Savia - - * configure.ac: - * m4/config_h.m4: - Added a check for strsignal. - -Mon Oct 19 20:24:54 UTC 2009 Olli Savia - - * ace/README: - * ace/config-cray.h: - * ace/config-cygwin32.h: - * ace/config-hpux-11.00.h: - * ace/config-lynxos.h: - * ace/config-netbsd.h: - * ace/config-openbsd.h: - * ace/config-rtems.h: - * configure.ac: - * m4/config_h.m4: - ACE_HAS_SYS_ERRLIST is no longer in use. - -Mon Oct 19 19:25:40 UTC 2009 Olli Savia - - * ace/README: - * ace/config-aix-5.x.h: - * ace/config-cray.h: - * ace/config-cygwin32.h: - * ace/config-freebsd.h: - * ace/config-hpux-11.00.h: - * ace/config-integritySCA.h: - * ace/config-irix6.x-common.h: - * ace/config-linux-common.h: - * ace/config-lynxos.h: - * ace/config-macosx-leopard.h: - * ace/config-macosx-panther.h: - * ace/config-macosx-tiger.h: - * ace/config-macosx.h: - * ace/config-mvs.h: - * ace/config-netbsd.h: - * ace/config-openbsd.h: - * ace/config-openvms.h: - * ace/config-qnx-neutrino.h: - * ace/config-qnx-rtp-62x.h: - * ace/config-qnx-rtp-pre62x.h: - * ace/config-rtems.h: - * ace/config-sco-5.0.0.h: - * ace/config-sunos5.4-g++.h: - * ace/config-sunos5.4-sunc++-4.x.h: - * ace/config-sunos5.5.h: - * ace/config-tandem-nsk-mips-v2.h: - * ace/config-tandem-nsk-mips-v3.h: - * ace/config-tandem.h: - * ace/config-tru64.h: - * ace/config-unixware-7.1.0.h: - * ace/config-unixware-7.1.0.udk.h: - * ace/config-vxworks6.4.h: - * ace/config-win32-borland.h: - * ace/config-win32-cegcc.h: - * ace/config-win32-dmc.h: - * ace/config-win32-ghs.h: - * ace/config-win32-interix.h: - * ace/config-win32-mingw.h: - * ace/config-win32-msvc-10.h: - * ace/config-win32-msvc-7.h: - * ace/config-win32-msvc-8.h: - * ace/config-win32-msvc-9.h: - * ace/os_include/os_string.h: - * configure.ac: - - Cleaned up strerror mess. We had both ACE_HAS_STRERROR and - ACE_LACKS_STREROR. ACE_HAS_STRERROR is no longer in use. - -Mon Oct 19 18:18:37 UTC 2009 Olli Savia - - * ace/config-linux-common.h: - Added ACE_HAS_STRSIGNAL. - -Mon Oct 19 14:28:07 UTC 2009 Olli Savia - - * ace/config-linux-common.h: - Added ACE_HAS_SYS_SIGLIST. - -Mon Oct 19 14:24:45 UTC 2009 Olli Savia - - * tests/Log_Msg_Test.cpp: - Added a few debug messages to exercise %S modifier. - -Mon Oct 19 14:00:20 UTC 2009 Olli Savia - - * ace/Sock_Connect.cpp: - LynxOS improvements. - -Mon Oct 19 12:18:26 UTC 2009 Olli Savia - - * ace/OS_NS_string.cpp: - Include OS_NS_stdio.h if ACE_HAS_STRSIGNAL is not defined. - -Mon Oct 19 12:15:04 UTC 2009 Johnny Willemsen - - * rpmbuild/ace-tao-init-fedora/rc.d/init.d/tao-cosconcurrency: - * rpmbuild/ace-tao-init-fedora/rc.d/init.d/tao-cosevent: - * rpmbuild/ace-tao-init-fedora/rc.d/init.d/tao-cosnaming: - * rpmbuild/ace-tao-init-fedora/rc.d/init.d/tao-cosnotification: - * rpmbuild/ace-tao-init-fedora/rc.d/init.d/tao-costrading: - * rpmbuild/ace-tao-init-fedora/rc.d/init.d/tao-rtevent: - * rpmbuild/ace-tao-init-suse/init.d/tao-cosconcurrency: - * rpmbuild/ace-tao-init-suse/init.d/tao-cosevent: - * rpmbuild/ace-tao-init-suse/init.d/tao-cosnaming: - * rpmbuild/ace-tao-init-suse/init.d/tao-cosnotification: - * rpmbuild/ace-tao-init-suse/init.d/tao-costrading: - * rpmbuild/ace-tao-init-suse/init.d/tao-rtevent: - Use -ORBDeamon instead of --deamon - -Mon Oct 19 12:10:04 UTC 2009 Johnny Willemsen - - * tests/Bug_3729_Regression_Test.cpp: - * tests/INET_Addr_Test.cpp: - * tests/run_test.lst: - * tests/tests.mpc: - Moved regression test for 3729 to its own file - -Mon Oct 19 11:58:04 UTC 2009 Johnny Willemsen - - * tests/INET_Addr_Test.cpp: - Unicode fixes - -Mon Oct 19 10:04:04 UTC 2009 Olli Savia - - * ace/OS_NS_string.cpp: - Fixed off by one bug. - - * ace/os_include/os_signal.h: - Due to bug above reverted previous change. - -Mon Oct 19 07:55:21 UTC 2009 Olli Savia - - * ace/OS_NS_string.cpp: - * ace/config-lynxos.h: - LynxOS lacks strsignal. Added emulation using sys_siglist. - - * ace/os_include/os_signal.h: - LynxOS now defines NSIG rigth. No need to add +1. - -Sat Oct 17 19:58:52 UTC 2009 Olli Savia - - * ace/OS_NS_string.h: - * ace/OS_NS_string.cpp: - Added ACE_OS::strsignal(). - - * ace/config-cygwin32.h: - * ace/config-freebsd.h: - * ace/config-lynxos.h: - * ace/config-netbsd.h: - * ace/config-openbsd.h: - * ace/config-sunos5.4-g++.h: - * ace/config-sunos5.4-sunc++-4.x.h: - * ace/config-sunos5.5.h: - Added ACE_HAS_STRSIGNAL - - * tests/OS_Test.cpp: - Added a test for ACE_OS::strsignal(). - - * ace/config-win32-common.h: - * ace/README: - * ace/config-cray.h: - Removed references to ACE_HAS_SYS_SIGLIST. It will be removed - soon. - -Sat Oct 17 10:29:13 UTC 2009 Olli Savia - - * ace/config-lynxos.h: - Removed duplicate define ACE_HAS_GETIFADDRS. - -Sat Oct 17 10:26:15 UTC 2009 Olli Savia - - * ace/OS_NS_stdio.h: - Removed undef fdopen. We may need to add helper wrapper for fdopen. - -Sat Oct 17 07:32:19 UTC 2009 Johnny Willemsen - - * tests/OS_Test.cpp: - Removed getmacaddress test, that moved to its own test - -Fri Oct 16 08:51:19 UTC 2009 Johnny Willemsen - - * bin/generate_doxygen.pl: - * htlm/index.html: - Added dds4ccm - -Fri Oct 16 06:38:19 UTC 2009 Olli Savia - - * tests/run_test.lst: - Run Enum_Interfaces_Test, MT_SOCK_Test, TP_Reactor_Test on LynxOS. - -Fri Oct 16 06:00:42 UTC 2009 Olli Savia - - * ace/OS_NS_stdio.h: - * ace/OS_NS_stdio.inl: - Readded "Tue Oct 13 19:13:13 UTC 2009 Olli Savia " - without os_unistd.h modifications. - -Thu Oct 15 17:33:05 UTC 2009 William R. Otte - - * ace/OS_NS_stdio.h: - * ace/OS_NS_stdio.inl: - * ace/os_include/os_unistd.h: - - Reverted Tue Oct 13 19:13:13 UTC 2009 Olli Savia , - it broke the IDL compiler. - -Thu Oct 15 11:26:15 UTC 2009 Olli Savia - - * ace/Pipe.cpp: - It OK to use socketpair to implement pipe on LynxOS. - -Thu Oct 15 11:11:48 UTC 2009 Johnny Willemsen - - * ace/Basic_Types.h: - Fix for 64bit PPC - -Thu Oct 15 07:43:48 UTC 2009 Johnny Willemsen - - * tests/Bug_3744_Regression_Test.cpp: - * tests/tests.mpc: - * tests/run_test.lst: - Moved the regression for 3744 to its own file, we don't have a fix yet - -Wed Oct 14 23:15:59 UTC 2009 Abdul Sowayan - - * ace/config-macosx-snowleopard.h: - * include/makeinclude/platform_macosx_snowleopard.GNU: - - First cut of adding snowleopard support. - -Wed Oct 14 14:43:01 UTC 2009 Olli Savia - - * ace/config-lynxos.h: - Added/removed some defines. - -Wed Oct 14 14:41:03 UTC 2009 Olli Savia - - * ace/OS_NS_signal.h: - Added include "ace/os_include/os_pthread.h" since LynxOS defines - pthread_sigmask() in pthread.h. - -Tue Oct 13 19:13:13 UTC 2009 Olli Savia - - * ace/OS_NS_stdio.h: - * ace/OS_NS_stdio.inl: - Cleaned up ace_fileno_helper implementation and fixed compile - problem on MinGW. - - * ace/os_include/os_unistd.h: - Redefined ACE_STD{IN,OUT,ERR}. - OS_Test now hopefully passes on all platforms. - -Tue Oct 13 19:00:53 UTC 2009 Olli Savia - - * include/makeinclude/platform_lynxos.GNU: - Removed non-functional cross compiler setup. - -Tue Oct 13 18:56:22 UTC 2009 Olli Savia - - * include/makeinclude/platform_lynxos.GNU: - Reverted: - - Mon Oct 13 11:10:00 UTC 2008 Simon Massey - - * include/makeinclude/platform_lynxos.GNU: - Problems with Lynxos5.0 due to -mshared being passed to compiler - (inaddition to linker) - - -mshared is needed on LynxOS 4.x. Need to find another - solution for LynxOS 5.0 - -Tue Oct 13 10:03:48 UTC 2009 Johnny Willemsen - - * include/makeinclude/rules.local.GNU: - When using cp to install a library, make sure we check date/time - in order to check if we need to copy. Thanks to Abdul Sowayan - for reporting this. This fixes bugzilla - 3728 - -Tue Oct 13 09:44:48 UTC 2009 Johnny Willemsen - - * tests/INET_Addr_Test.cpp: - Extended this test to for is_multicast. This fails on little endian - machines at this moment. Thanks to Patrick Rabau - for extending this test. This is related - to bugzilla 3729 - -Tue Oct 13 09:33:48 UTC 2009 Johnny Willemsen - - * tests/OS_Test.cpp: - Added test for getmacaddress, thanks to Paul Daugherty - for creating this. This is related to - bugzilla 3744 - -Tue Oct 13 06:34:48 UTC 2009 Johnny Willemsen - - * include/makeinclude/platform_linux.GNU: - When doing a 64bit build, also add -m64 to the linker flags - -Mon Oct 12 14:03:48 CDT 2009 Johnny Willemsen - - * ACE version 5.7.4 released. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/ACE/NEWS b/ACE/NEWS index fc06847b70e..d0e08d91ca6 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -1,6 +1,3 @@ -USER VISIBLE CHANGES BETWEEN ACE-5.7.7 and ACE-5.7.8 -==================================================== - USER VISIBLE CHANGES BETWEEN ACE-5.7.6 and ACE-5.7.7 ==================================================== diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp index 035d6b17db0..66a0a1ef19c 100644 --- a/ACE/ace/Dev_Poll_Reactor.cpp +++ b/ACE/ace/Dev_Poll_Reactor.cpp @@ -2311,13 +2311,14 @@ ACE_Dev_Poll_Reactor::mask_ops_i (ACE_HANDLE handle, { ACE_TRACE ("ACE_Dev_Poll_Reactor::mask_ops_i"); - Event_Tuple *info = this->handler_rep_.find (handle); - if (info == 0) + if (!this->handler_rep_.handle_in_range (handle)) return -1; // Block out all signals until method returns. ACE_Sig_Guard sb; + Event_Tuple *info = this->handler_rep_.find (handle); + ACE_Reactor_Mask const old_mask = info->mask; ACE_Reactor_Mask new_mask = old_mask; diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp index ccf13c80d3a..e40f98af10e 100644 --- a/ACE/ace/Time_Value.cpp +++ b/ACE/ace/Time_Value.cpp @@ -265,13 +265,9 @@ ACE_Time_Value::operator *= (double d) ACE_Numeric_Limits::min() - 0.999999; if (sec_total > max_int) - { - this->set(ACE_Numeric_Limits::max(), ACE_ONE_SECOND_IN_USECS-1); - } + this->set(ACE_Numeric_Limits::max(), ACE_ONE_SECOND_IN_USECS-1); else if (sec_total < min_int) - { - this->set(ACE_Numeric_Limits::min(), -ACE_ONE_SECOND_IN_USECS+1); - } + this->set(ACE_Numeric_Limits::min(), -ACE_ONE_SECOND_IN_USECS+1); else { time_t time_sec = static_cast (sec_total); @@ -286,13 +282,9 @@ ACE_Time_Value::operator *= (double d) sec_total = usec_total / ACE_ONE_SECOND_IN_USECS; // keep remaining usec if (sec_total > 0) - { - usec_total = (sec_total - ACE_OS::floor(sec_total)); - } + usec_total = (sec_total - ACE_OS::floor(sec_total)); else - { - usec_total = (sec_total - ACE_OS::ceil(sec_total)); - } + usec_total = (sec_total - ACE_OS::ceil(sec_total)); sec_total -= usec_total; usec_total *= ACE_ONE_SECOND_IN_USECS; @@ -302,13 +294,9 @@ ACE_Time_Value::operator *= (double d) // recheck for saturation if (sec_total > max_int) - { - this->set (ACE_Numeric_Limits::max(), ACE_ONE_SECOND_IN_USECS - 1); - } + this->set (ACE_Numeric_Limits::max(), ACE_ONE_SECOND_IN_USECS - 1); else if (sec_total < min_int) - { - this->set (ACE_Numeric_Limits::min(), -ACE_ONE_SECOND_IN_USECS + 1); - } + this->set (ACE_Numeric_Limits::min(), -ACE_ONE_SECOND_IN_USECS + 1); else { time_sec = static_cast (sec_total); @@ -316,13 +304,9 @@ ACE_Time_Value::operator *= (double d) // round up the result to save the last usec if (time_usec > 0 && (usec_total - time_usec) >= 0.5) - { - ++time_usec; - } + ++time_usec; else if (time_usec < 0 && (usec_total - time_usec) <= -0.5) - { - --time_usec; - } + --time_usec; this->set (time_sec, time_usec); } @@ -340,21 +324,15 @@ ostream &operator<<(ostream &o, const ACE_Time_Value &v) { o << tv->tv_sec; if (tv->tv_usec) - { - o << '.' << std::setw (6) << ACE_STD_NAMESPACE::abs (tv->tv_usec); - } + o << '.' << std::setw (6) << abs (tv->tv_usec); } else if (tv->tv_usec < 0) - { - o << "-0." << std::setw (6) << -tv->tv_usec; - } + o << "-0." << std::setw (6) << -tv->tv_usec; else { o << '0'; if (tv->tv_usec > 0) - { - o << '.'<< std::setw (6) << tv->tv_usec; - } + o << '.'<< std::setw (6) << tv->tv_usec; } o.fill (oldFiller); diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index ff62e5d3874..545d7adb8c5 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -106,28 +106,25 @@ #define ACE_LACKS_STRRECVFD #define ACE_USES_EXPLICIT_STD_NAMESPACE -#define ACE_HAS_TIME_T_LONG_MISMATCH - -#define ACE_EXPORT_NESTED_CLASSES 1 -#define ACE_HAS_CPLUSPLUS_HEADERS 1 -#define ACE_HAS_EXCEPTIONS -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#define ACE_HAS_STDCPP_STL_INCLUDES 1 -#define ACE_HAS_STRING_CLASS 1 -#define ACE_HAS_TEMPLATE_TYPEDEFS 1 -#define ACE_HAS_USER_MODE_MASKS 1 -#define ACE_LACKS_ACE_IOSTREAM 1 -#define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -#define ACE_HAS_NEW_NOTHROW -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 -#define ACE_SIZEOF_LONG_DOUBLE 10 -#define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Lu" -#define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld" -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#define ACE_USES_STD_NAMESPACE_FOR_ABS 1 -#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) +# define ACE_EXPORT_NESTED_CLASSES 1 +# define ACE_HAS_CPLUSPLUS_HEADERS 1 +# define ACE_HAS_EXCEPTIONS +# define ACE_HAS_NONCONST_SELECT_TIMEVAL +# define ACE_HAS_SIG_ATOMIC_T +# define ACE_HAS_STANDARD_CPP_LIBRARY 1 +# define ACE_HAS_STDCPP_STL_INCLUDES 1 +# define ACE_HAS_STRING_CLASS 1 +# define ACE_HAS_TEMPLATE_TYPEDEFS 1 +# define ACE_HAS_USER_MODE_MASKS 1 +# define ACE_LACKS_ACE_IOSTREAM 1 +# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 +# define ACE_HAS_NEW_NOTHROW +# define ACE_TEMPLATES_REQUIRE_SOURCE 1 +# define ACE_SIZEOF_LONG_DOUBLE 10 +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Lu" +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld" +# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +# define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) // must have _MT defined to include multithreading diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh index 818e8f52e95..1b3db772360 100755 --- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh +++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh @@ -1,4 +1,4 @@ -if test -z $1; then olddate=2010_03_03; else olddate=$1; fi +if test -z $1; then olddate=2010_01_31; else olddate=$1; fi if test -z $2; then newdate=`date -u +%Y_%m_%d`; else newdate=$2; fi if test -z $3; then prefix=`date -u +%Y%m%d%a`; else prefix=$3; fi if test -z $ACE_ROOT; then ACE_ROOT=..; fi diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index 23e6cd4ef58..433f45a6612 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/local/bin/python2.5 # @file make_release.py # @author William R. Otte @@ -106,16 +106,13 @@ def parse_args (): # By default get repo root from working copy # default="https://svn.dre.vanderbilt.edu/DOC/") - parser.add_option ("--mpc_root", dest="mpc_root", action="store", - help="Specify an alternate MPC repository root", - default=None) - # By default get repo root from MPC root in working copy - parser.add_option ("-n", dest="take_action", action="store_false", help="Take no action", default=True) parser.add_option ("--verbose", dest="verbose", action="store_true", help="Print out actions as they are being performed", default=False) + parser.add_option ("--override-host", dest="override_host", action="store_true", + help="Override the default release host. Not reccomended", default=False) (options, arguments) = parser.parse_args () if options.action is None: @@ -168,6 +165,12 @@ def check_environment (): print "ERROR: Must define MAILID environment to your email address for changelogs." return False + from socket import gethostname + + if ((not opts.override_host) and gethostname () != "anduril.dre.vanderbilt.edu"): + print "ERROR: Must run script on anduril.dre.vanderbilt.edu" + return False + return True def vprint (string): @@ -213,13 +216,7 @@ def check_workspace (): info = svn_client.info2 (doc_root + "/ACE")[0] opts.repo_root = info[1]["repos_root_URL"] - # By default retrieve MPC root from working copy - if opts.mpc_root is None: - info = svn_client.info2 (doc_root + "/ACE/MPC")[0] - opts.mpc_root = info[1]["repos_root_URL"] - vprint ("Repos root URL = " + opts.repo_root + "\n") - vprint ("Repos MPC root URL = " + opts.mpc_root + "\n") def update_version_files (component): @@ -586,8 +583,8 @@ def tag (): opts.repo_root + "/tags/" + branch) # Tag MPC - svn_client.copy (opts.mpc_root + "/trunk", - opts.mpc_root + "/tags/" + branch) + svn_client.copy (opts.repo_root + "/MPC/trunk", + opts.repo_root + "/MPC/tags/" + branch) # Update latest tag # mcorino@remedy.nl - subversion does not seem to support propset directly @@ -603,8 +600,8 @@ def tag (): #update_latest_tag ("BFO", branch) else: print "Creating tags:\n" - print opts.repo_root + "/trunk -> " + opts.repo_root + "/tags/" + branch + "\n" - print opts.mpc_root + "/trunk -> " + opts.mpc_root + "/tags/" + branch + "\n" + print opts.repo_root + "/Middleware/tags/" + branch + "\n" + print opts.repo_root + "/MPC/tags/" + branch + "\n" ################################################## #### Packaging methods @@ -865,6 +862,9 @@ def generate_workspaces (stage_dir): mpc_option += ' -relative CIAO_ROOT=' + stage_dir + '/ACE_wrappers/TAO/CIAO ' mpc_option += ' -relative DANCE_ROOT=' + stage_dir + '/ACE_wrappers/TAO/CIAO/DAnCE ' + static_vc71_option = ' -static -name_modifier *_vc71_Static -apply_project -exclude TAO/CIAO ' + static_vc71_option += mpc_option + static_vc8_option = ' -static -name_modifier *_vc8_Static -apply_project -exclude TAO/CIAO ' static_vc8_option += mpc_option @@ -873,6 +873,7 @@ def generate_workspaces (stage_dir): vc9_option = ' -name_modifier *_vc9 ' vc8_option = ' -name_modifier *_vc8 ' + vc71_option = ' -name_modifier *_vc71 ' # Build option string for VC8 platforms ce_option = ' -name_modifier *_vc8_WinCE -features "uses_wchar=1,wince=1" ' @@ -880,16 +881,12 @@ def generate_workspaces (stage_dir): ce_option += ' -value_template platforms+=\'"Windows Mobile 5.0 Smartphone SDK (ARMV4I)"\' ' ce_option += ' -value_template platforms+=\'"Windows Mobile 6 Standard SDK (ARMV4I)"\' ' ce_option += ' -value_template platforms+=\'"Windows Mobile 6 Professional SDK (ARMV4I)"\' ' - ce_option += ' -exclude TAO/CIAO ' redirect_option = str () if not opts.verbose: redirect_option = " >> ../mpc.log 2>&1" # Generate GNUmakefiles - print "\tBootstrapping autotools support" - ex ("bin/bootstrap " + redirect_option) - print "\tGenerating GNUmakefiles...." ex (mpc_command + " -type gnuace " + exclude_option + mpc_option + redirect_option) @@ -902,12 +899,21 @@ def generate_workspaces (stage_dir): print "\tGenerating VC8 Windows CE solutions..." ex (mpc_command + " -type vc8 " + mpc_option + ce_option + redirect_option) + print "\tGenerating VC71 solutions..." + ex (mpc_command + " -type vc71 " + mpc_option + vc71_option + redirect_option) + + print "\tGenerating VC71 Static solutions" + ex (mpc_command + " -type vc71 " + static_vc71_option + redirect_option) + print "\tGenerating VC8 Static solutions" ex (mpc_command + " -type vc8 " + static_vc8_option + redirect_option) print "\tGenerating VC9 Static solutions" ex (mpc_command + " -type vc9 " + static_vc9_option + redirect_option) + print "\tBootstrapping autotools support" + ex ("bin/bootstrap " + redirect_option) + print "\tCorrecting permissions for all generated files..." ex ("find ./ -name '*.vc[p,w]' -or -name '*.bmak' -or -name '*.vcproj' -or -name '*.sln' -or -name 'GNUmake*' | xargs chmod 0644") diff --git a/ACE/debianbuild/rules b/ACE/debianbuild/rules index ffea498a2c9..5602c1aed85 100644 --- a/ACE/debianbuild/rules +++ b/ACE/debianbuild/rules @@ -127,6 +127,32 @@ autotools-stamp: prepatch-stamp patch -p1 -d $(ACE_ROOT) < debian/patches/96-build-athena3d.dpatch cd $(ACE_ROOT) && bin/bootstrap +# cd $(ACE_ROOT) && autoconf && autoheader && aclocal && automake && libtoolize +# cd $(TAO_ROOT) && autoconf && autoheader && aclocal && automake && libtoolize + +# echo "ACE_ROOT - autoconf" +# autoconf +# echo "ACE_ROOT - autoheader" +# autoheader +# echo "ACE_ROOT - aclocal" +# aclocal +# echo "ACE_ROOT - automake" +# automake +# echo "ACE_ROOT - libtoolize" +# libtoolize + +# cd $(TAO_ROOT) +# echo "TAO_ROOT - autoconf" +# autoconf +# echo "TAO_ROOT - autoheader" +# autoheader +# echo "TAO_ROOT - aclocal" +# aclocal +# echo "TAO_ROOT - automake" +# automake +# echo "TAO_ROOT - libtoolize" +# libtoolize + touch $@ .PHONY: autotools diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html index 41a05a4c36f..8c9bd0148df 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -84,101 +84,101 @@ of the ACE, TAO, and CIAO micro release kit is available for FilenameDescriptionFullSources only ACE+TAO+CIAO.tar.gz ACE+TAO+CIAO (tar+gzip format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] ACE+TAO+CIAO.tar.bz2 ACE+TAO+CIAO (tar+bzip2 format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] ACE+TAO+CIAO.zip ACE+TAO+CIAO (zip format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] ACE+TAO.tar.gz ACE+TAO (tar+gzip format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] ACE+TAO.tar.bz2 ACE+TAO (tar+bzip2 format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] ACE+TAO.zip ACE+TAO (zip format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] ACE-html.tar.gz Doxygen documentation for ACE+TAO+CIAO (tar+gzip format) - [HTTP] - [FTP] + [HTTP] + [FTP] ACE-html.tar.bz2 Doxygen documentation for ACE+TAO+CIAO (tar+bzip2 format) - [HTTP] - [FTP] + [HTTP] + [FTP] ACE-html.zip Doxygen documentation for ACE+TAO+CIAO (zip format) - [HTTP] - [FTP] + [HTTP] + [FTP] ACE.tar.gz ACE only (tar+gzip format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] ACE.tar.bz2 ACE only (tar+bzip2 format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] ACE.zip ACE only (zip format) - [HTTP] - [FTP] + [HTTP] + [FTP] - [HTTP] - [FTP] + [HTTP] + [FTP] diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index 9c474313acc..60327564b29 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -55,7 +55,7 @@

The Build Czar is empowered to set up more builds on his own for his - convenience. This + convenience. This page has a step by step instructions on how to do that.

@@ -93,19 +93,14 @@

  • Prior to starting this, gather aggregate release notes from all developers. - This is usually in the form of an email plea asking to update all NEWS files in - the archive. These NEWS files are used as part of the release notes for the release.
    • + This is usually in the form of an email plea asking for a writeup of + significant changes since the last beta. Add these notes to the NEWS files + before cutting the release so that all notes are part of the release.
  • - Checkout a new workspace on a Fedora system with the last public release and with - all patches installed. This can be achieved using -
      -
    • yum install perl svn screen pysvn automake doxygen bzip2 tar gzip openssh
      • -
    • yum update
      • -
    -
    • + Checkout a new workspace on anduril.dre.vanderbilt.edu
    • - The best place to create the workspace is under /export/anduriltmp/bczar (if you are on anduril). Don't + The best place to create the workspace is under /export/anduriltmp/bczar. Don't use the home directory itself, it is an NFS share and not really fast.
    • @@ -198,7 +193,7 @@ documentation, this can be started in parrellel with this activity.
    • - The kits end up in $DOC_ROOT/packages
      • + The kits end up in /export/anduriltmp/bczar/packages

    To summarize, the following is a transcript of the steps up to this point @@ -206,7 +201,7 @@

    $ ssh bczar@anduril.dre.vanderbilt.edu
    No default printer
    -bash-3.00$ screen
    - -bash-3.00$ cd /tmp
    + -bash-3.00$ cd /export/anduriltmp/bczar
    -bash-3.00$ rm -rf DOC_ROOT
    -bash-3.00$ mkdir DOC_ROOT
    -bash-3.00$ export DOC_ROOT=$PWD/DOC_ROOT
    @@ -225,11 +220,11 @@ The packages end up by default under $DOC_ROOT/package-<PID>, you can copy them to the webserver using the following commands. (Note that <PID> needs to be the numerical pid of the process that created the kit, use
    - ls -ald + ls -ald
    to determine the correct filename.) At the moment you execute these commands - all users can download these packages. - scp $DOC_ROOT/package-<PID>/ACE* - bczar@anduril.dre.vanderbilt.edu:/export/www/download.dre/ACE+TAO-distribution
    + all users can download these packages.
    + cp $DOC_ROOT/package-<PID>/ACE* + /export/www/download.dre/ACE+TAO-distribution

  • After the repository is tagged you can also start generating the doxygen @@ -282,7 +277,7 @@
  • cd $ACE_ROOT
    - nohup make -f Release manpages & + make -f Release manpages

  • While doxygen churns, format a release announcement, including the release @@ -408,41 +403,41 @@

    Tips to being a Build Czar

    -

      -
    1. Trust no one.
      2. -
    2. Be careful with this guy, he +

      + 1. Trust no one.
      + 2. Be careful with this guy, he is notorious in breaking builds (and fixing them as well...Rumour has it that it's actually a super-scalar, super-pipelined processor capable of out-of-order - execution, in human incarnation).

      3. -
    3. Don't forgive people who break ACE :-)
      4. -
    4. If a build hasn't run in a long time (symptoms are a "red" in the Last Run + execution, in human incarnation).
      + 3. Don't forgive people who break ACE :-)
      + 4. If a build hasn't run in a long time (symptoms are a "red" in the Last Run column of the build scoreboard), delete the .disable file in - /path/to/build/directory/BUILD_NAME/ by hand.
      5. -
    5. Think of the group who wrote the scoreboard update script, every time you + /path/to/build/directory/BUILD_NAME/ by hand.
      + 5. Think of the group who wrote the scoreboard update script, every time you catch an otherwise not so obvious error with the help of the scoreboard. Tell - DEVO group about it.
      6. -
    6. Send a note to sysadmin@isis.vanderbilt.edu asking for the repo to be frozen. Provide them a list of names, including yourself and bczar to be granted write permission. -
      7. -
    7. Compile once on Win32, Linux and Solaris before cutting a beta.
      8. -
    8. Trust the release script when making a release. Don't make tar balls by + DEVO group about it.
      + 6. Send a note to sysadmin@isis.vanderbilt.edu asking for the repo to be frozen. Provide them a list of names, including yourself and bczar to be granted write permission. +
      + 7. Compile once on Win32, Linux and Solaris before cutting a beta.
      + 8. Trust the release script when making a release. Don't make tar balls by hand. Make sure that the public ftp directories (/project/beguine/ftp/pub/ACE+TAO-distribution and /project/beguine/ftp/pub/ACE+TAO-distribution/diffs) have the right - permissions, so that the release script can copy the tar balls.
      9. -
    9. When all hell breaks loose, don't wait for the nightly builds to monitor - improvement. Instead manually start the builds.
      10. -
    10. Maintain private up-to-date workspaces for problem platforms (read as - Solaris).
      11. -
    11. Don't hesitate to ask for help.
      12. -
    12. When you get an account to access the svn repo, make sure you are added to + permissions, so that the release script can copy the tar balls.
      + 9. When all hell breaks loose, don't wait for the nightly builds to monitor + improvement. Instead manually start the builds.
      + 10. Maintain private up-to-date workspaces for problem platforms (read as + Solaris).
      + 11. Don't hesitate to ask for help.
      + 12. When you get an account to access the svn repo, make sure you are added to the correct groups, for example, gid=100(users),5000(doc),5002(acetaodev),5003(cvs). Otherwise you will have - problem to checkout various modules.
      13. -
    13. Install your public key to the different machines you have frequent access - to avoid typing password.
      14. -
    14. Update this page if you have any more tips for future build czars :-). This - page is in svn under ACE_wrappres/docs/bczar/bczar.html
      15. -

    + problem to checkout various modules.
    + 13. Install your public key to the different machines you have frequent access + to avoid typing password.
    + 14. Update this page if you have any more tips for future build czars :-). This + page is in svn under ACE_wrappres/docs/bczar/bczar.html
    +

    The Realm of the Build Czar

    diff --git a/ACE/etc/index.html b/ACE/etc/index.html index 50278ae7bf8..43e1a119cae 100644 --- a/ACE/etc/index.html +++ b/ACE/etc/index.html @@ -35,7 +35,6 @@
    We do have the documentation for previous releases
      -

    • 5.7.7

    • 5.7.6

    • 5.7.5

    • 5.7.4

      • diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index ccd9cc4afbd..ca27ac2a0b1 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -2357,7 +2357,7 @@ fi %doc TAO/VERSION %doc TAO/README %doc TAO/utils/catior/README.catior -%doc TAO/utils/nslist/README.nslist +%doc TAO/utils/catior/README.nslist # ---------------- tao-cosnaming ---------------- diff --git a/ACE/tests/Atomic_Op_Test.cpp b/ACE/tests/Atomic_Op_Test.cpp index 45b709e2612..00dfc06c8af 100644 --- a/ACE/tests/Atomic_Op_Test.cpp +++ b/ACE/tests/Atomic_Op_Test.cpp @@ -30,14 +30,16 @@ ACE_RCSID(tests, Atomic_Op_Test, "$Id$") enum { TEST_ITERATIONS = 1000000 }; -template -void test (const ACE_TCHAR* type) +int +run_main (int, ACE_TCHAR *[]) { - ACE_Atomic_Op foo (5); + ACE_START_TEST (ACE_TEXT ("Atomic_Op_Test")); + + ACE_Atomic_Op foo (5); ACE_ASSERT (foo == 5); - TYPE result = ++foo; + long result = ++foo; ACE_ASSERT (foo == 6); ACE_ASSERT (result == 6); @@ -64,14 +66,14 @@ void test (const ACE_TCHAR* type) foo = 7; ACE_ASSERT (foo == 7); - ACE_Atomic_Op foo2 (5); + ACE_Atomic_Op foo2 (5); foo2 = foo; ACE_ASSERT (foo == 7); ACE_ASSERT (foo2 == 7); ACE_UINT64 usec; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <%s> assignment %D\n"), type)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting assignment %D\n"))); ACE_Time_Value diff = ACE_OS::gettimeofday (); int i; for (i = 0; i < TEST_ITERATIONS; ++i) @@ -83,9 +85,9 @@ void test (const ACE_TCHAR* type) } diff = ACE_OS::gettimeofday () - diff; diff.to_usec (usec); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <%s> assignment %D, took %Q\n"), type, usec)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending assignment %D, took %Q\n"), usec)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <%s> increment %D\n"), type)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting increment %D\n"))); diff = ACE_OS::gettimeofday (); for (i = 0; i < TEST_ITERATIONS; ++i) { @@ -96,9 +98,9 @@ void test (const ACE_TCHAR* type) } diff = ACE_OS::gettimeofday () - diff; diff.to_usec (usec); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <%s> increment %D, took %Q\n"), type, usec)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending increment %D, took %Q\n"), usec)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <%s> decrement %D\n"), type)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting decrement %D\n"))); diff = ACE_OS::gettimeofday (); for (i = 0; i < TEST_ITERATIONS; ++i) { @@ -109,9 +111,9 @@ void test (const ACE_TCHAR* type) } diff = ACE_OS::gettimeofday () - diff; diff.to_usec (usec); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <%s> decrement %D, took %Q\n"), type, usec)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending decrement %D, took %Q\n"), usec)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <%s> addition %D\n"), type)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting addition %D\n"))); diff = ACE_OS::gettimeofday (); for (i = 0; i < TEST_ITERATIONS; ++i) { @@ -122,9 +124,9 @@ void test (const ACE_TCHAR* type) } diff = ACE_OS::gettimeofday () - diff; diff.to_usec (usec); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <%s> addition %D, took %Q\n"), type, usec)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending addition %D, took %Q\n"), usec)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <%s> subtraction %D\n"), type)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting subtraction %D\n"))); diff = ACE_OS::gettimeofday (); for (i = 0; i < TEST_ITERATIONS; ++i) { @@ -135,21 +137,311 @@ void test (const ACE_TCHAR* type) } diff = ACE_OS::gettimeofday () - diff; diff.to_usec (usec); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <%s> subtraction %D, took %Q\n"), type, usec)); -} + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending subtraction %D, took %Q\n"), usec)); -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT ("Atomic_Op_Test")); + ACE_Atomic_Op foo_unsigned (5); + + ACE_ASSERT (foo_unsigned == 5); + + unsigned long ul_result = ++foo_unsigned; + ACE_ASSERT (foo_unsigned == 6); + ACE_ASSERT (ul_result == 6); + + ul_result = --foo_unsigned; + ACE_ASSERT (foo_unsigned == 5); + ACE_ASSERT (ul_result == 5); + + ul_result = foo_unsigned++; + ACE_ASSERT (foo_unsigned == 6); + ACE_ASSERT (ul_result == 5); + + ul_result = foo_unsigned--; + ACE_ASSERT (foo_unsigned == 5); + ACE_ASSERT (ul_result == 6); + + ul_result = foo_unsigned += 10; + ACE_ASSERT (foo_unsigned == 15); + ACE_ASSERT (ul_result == 15); + + ul_result = foo_unsigned -= 10; + ACE_ASSERT (foo_unsigned == 5); + ACE_ASSERT (ul_result == 5); + + foo_unsigned = 7; + ACE_ASSERT (foo_unsigned == 7); + + ACE_Atomic_Op foo_unsigned2 (5); + foo_unsigned2 = foo_unsigned; + ACE_ASSERT (foo_unsigned == 7); + ACE_ASSERT (foo_unsigned2 == 7); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting assignment %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + foo_unsigned = 1; + foo_unsigned = 2; + foo_unsigned = 3; + foo_unsigned = 4; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending assignment %D, took %Q\n"), usec)); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting increment %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + ++foo_unsigned; + ++foo_unsigned; + ++foo_unsigned; + ++foo_unsigned; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending increment %D, took %Q\n"), usec)); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting decrement %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + --foo_unsigned; + --foo_unsigned; + --foo_unsigned; + --foo_unsigned; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending decrement %D, took %Q\n"), usec)); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting addition %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + foo_unsigned += 5; + foo_unsigned += 5; + foo_unsigned += 5; + foo_unsigned += 5; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending addition %D, took %Q\n"), usec)); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting subtraction %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + foo_unsigned -= 5; + foo_unsigned -= 5; + foo_unsigned -= 5; + foo_unsigned -= 5; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending subtraction %D, took %Q\n"), usec)); + + ACE_Atomic_Op bar (5); + + ACE_ASSERT (bar == 5); + + result = ++bar; + ACE_ASSERT (bar == 6); + ACE_ASSERT (result == 6); + + result = --bar; + ACE_ASSERT (bar == 5); + ACE_ASSERT (result == 5); + + result = bar++; + ACE_ASSERT (bar == 6); + ACE_ASSERT (result == 5); + + result = bar--; + ACE_ASSERT (bar == 5); + ACE_ASSERT (result == 6); + + result = bar += 10; + ACE_ASSERT (bar == 15); + ACE_ASSERT (result == 15); + + result = bar -= 10; + ACE_ASSERT (bar == 5); + ACE_ASSERT (result == 5); + + bar = 7L; + ACE_ASSERT (bar == 7); + + ACE_Atomic_Op bar2 (5L); + bar2 = bar; + ACE_ASSERT (bar == 7); + ACE_ASSERT (bar2 == 7); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting assignment %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + bar = 1; + bar = 2; + bar = 3; + bar = 4; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending assignment %D, took %Q\n"), usec)); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting increment %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + ++bar; + ++bar; + ++bar; + ++bar; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending increment %D, took %Q\n"), usec)); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting decrement %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + --bar; + --bar; + --bar; + --bar; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending decrement %D, took %Q\n"), usec)); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting addition %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + bar += 5; + bar += 5; + bar += 5; + bar += 5; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending addition %D, took %Q\n"), usec)); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting subtraction %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + bar -= 5; + bar -= 5; + bar -= 5; + bar -= 5; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending subtraction %D, took %Q\n"), usec)); + + ACE_Atomic_Op unsigned_bar (5); + + ACE_ASSERT (unsigned_bar == 5); + + unsigned int ui_result = ++unsigned_bar; + ACE_ASSERT (unsigned_bar == 6); + ACE_ASSERT (ui_result == 6); + + ui_result = --unsigned_bar; + ACE_ASSERT (unsigned_bar == 5); + ACE_ASSERT (ui_result == 5); + + ui_result = unsigned_bar++; + ACE_ASSERT (unsigned_bar == 6); + ACE_ASSERT (ui_result == 5); + + ui_result = unsigned_bar--; + ACE_ASSERT (unsigned_bar == 5); + ACE_ASSERT (ui_result == 6); + + ui_result = unsigned_bar += 10; + ACE_ASSERT (unsigned_bar == 15); + ACE_ASSERT (ui_result == 15); + + ui_result = unsigned_bar -= 10; + ACE_ASSERT (unsigned_bar == 5); + ACE_ASSERT (ui_result == 5); + + unsigned_bar = 7L; + ACE_ASSERT (unsigned_bar == 7); + + ACE_Atomic_Op unsigned_bar2 (5L); + unsigned_bar2 = unsigned_bar; + ACE_ASSERT (unsigned_bar == 7); + ACE_ASSERT (unsigned_bar2 == 7); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting assignment %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + unsigned_bar = 1; + unsigned_bar = 2; + unsigned_bar = 3; + unsigned_bar = 4; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending assignment %D, took %Q\n"), usec)); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting increment %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + ++unsigned_bar; + ++unsigned_bar; + ++unsigned_bar; + ++unsigned_bar; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending increment %D, took %Q\n"), usec)); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting decrement %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + --unsigned_bar; + --unsigned_bar; + --unsigned_bar; + --unsigned_bar; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending decrement %D, took %Q\n"), usec)); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting addition %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + unsigned_bar += 5; + unsigned_bar += 5; + unsigned_bar += 5; + unsigned_bar += 5; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending addition %D, took %Q\n"), usec)); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting subtraction %D\n"))); + diff = ACE_OS::gettimeofday (); + for (i = 0; i < TEST_ITERATIONS; ++i) + { + unsigned_bar -= 5; + unsigned_bar -= 5; + unsigned_bar -= 5; + unsigned_bar -= 5; + } + diff = ACE_OS::gettimeofday () - diff; + diff.to_usec (usec); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending subtraction %D, took %Q\n"), usec)); - test (ACE_TEXT("int")); - test (ACE_TEXT("long")); - test (ACE_TEXT("unsigned int")); - test (ACE_TEXT("unsigned long")); -#if !defined (ACE_LACKS_LONGLONG_T) - test (ACE_TEXT("long long")); -#endif ACE_END_TEST; return 0; } diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 772f9f1f1a9..b156adb47e4 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,185 +1,1110 @@ -Thu Mar 4 14:27:16 UTC 2010 William R. Otte +Wed Mar 03 01:18:08 CST 2010 Johnny Willemsen - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: + * CIAO version 0.7.7 released. + +Mon Mar 1 22:49:52 UTC 2010 William Otte - Additional logging fixes. + * docs/OMG-CCM-Tutorial.ppt: + * DAnCE/docs/OMG-DnC-Tutorial.ppt: -Thu Mar 4 14:13:36 UTC 2010 William R. Otte + Split OMG-CCM-Tutorial into CIAO and DAnCE parts to + make for more manageably sized documents. Provided + updates to the DnC tutorial. - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: +Mon Mar 1 19:38:29 UTC 2010 Jeff Parsons - Proper ORB destruction in case of error. + * ccm/CCM.mpc: + + Removed the application of the -Ssi IDL compiler option to + Navigation.idl and Receptacles.idl, so that their direct + collocation related code can be compiled for a specialized + build that tests the direct collocation code generation + option. -Thu Mar 4 13:57:48 UTC 2010 William R. Otte +Mon Mar 1 10:00:54 UTC 2010 Johnny Willemsen - * DAnCE/Plan_Launcher/EM_Launcher.h: - * DAnCE/Plan_Launcher/NM_Launcher.h: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: + Fixed versioned namespace builds - Fixed comments from Johnny. +Sun Feb 28 23:13:23 UTC 2010 William R. Otte - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: + * DAnCE/MPC/config/dance_domainapplicationmanager.mpb: - Renamed these files to have _T suffix. + Link error on static linux builds. -Thu Mar 4 13:30:45 UTC 2010 William R. Otte +Fri Feb 26 15:54:33 UTC 2010 William R. Otte - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: + + Expanded NS/PlanLocality testing merged in, converted this test + to use dance_plan_launcher. + * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: + + Removed these files as they are no longer needed for above test. + +Fri Feb 26 13:08:03 UTC 2010 William R. Otte + + * DAnCE/tools/Convert_Plan/Convert_Plan.mpc: + * DAnCE/tools/Split_Plan/Split_Plan.mpc: + + Avoids ace_for_tao, as Convert_Plan requires file connector. + +Fri Feb 26 12:37:53 UTC 2010 William R. Otte + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + + Unicode compile error. + +Fri Feb 26 08:27:17 UTC 2010 Marcel Smit + + * MPC/config/dds4ccm_impl.mpb: + When ndds nor dds4ccm_ndds is set, no need to compile + the derived projects. + +Fri Feb 26 07:40:37 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Getter_T.h: + Optimized doxygen. + +Thu Feb 25 20:03:54 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReader.cpp + * connectors/dds4ccm/impl/ndds/DataReader.h + * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Get_T.h + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener.cpp + * connectors/dds4ccm/impl/ndds/QueryCondition.cpp + * connectors/dds4ccm/impl/ndds/QueryCondition.h + * connectors/dds4ccm/impl/ndds/ReadCondition.cpp + * connectors/dds4ccm/impl/ndds/ReadCondition.h + * connectors/dds4ccm/impl/ndds/Subscriber.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp + * connectors/dds4ccm/impl/ndds/Topic.cpp + * connectors/dds4ccm/impl/ndds/TopicDescription.cpp + * connectors/dds4ccm/impl/ndds/TopicListener.cpp + Set of cleanup of the core library. More will come after the release + of x.7.7. The code is at a much better level than with x.7.6 but + not at the level we aimed for x.7.7 because that was scheduled for + the end of March + +Thu Feb 25 16:23:49 UTC 2010 William R. Otte + + * NEWS: + Added news entries. + +Thu Feb 25 16:20:27 UTC 2010 William R. Otte + + * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h: + Compile error fix. + +Thu Feb 25 15:47:16 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + Optimized logging regarding query condition. + + * connectors/dds4ccm/impl/ndds/Getter_T.h: + Optimized Doxygen documentation. + + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Resolved compile error when QueryConditions are + enabled. + +Thu Feb 25 13:28:31 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Getter_T.h: + Added doxygen documentation. + +Thu Feb 25 12:48:30 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + Optimized get_one. Return false when DDS returns + DDS_RETCODE_NO_DATA (instead of throwing an exception). + +Thu Feb 25 12:43:37 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: + Layout changes. + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + Resolve runtime errors. + +Thu Feb 25 11:24:14 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + Reverted some of the last changes. + +Thu Feb 25 10:14:21 UTC 2010 Marcel Smit + + * MPC/config/dds4ccm_base.mpb: + When no features is set, all dds4cmm should require + dummy_label. + + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.h: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + Implemented some more Qos related methods. + +Thu Feb 25 09:08:55 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + Implemented some get/set_qos methods. + +Thu Feb 25 08:32:54 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc: + Cleanup + +Thu Feb 25 08:29:14 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberQos.h: + Implemented set/get_qos methods. + +Thu Feb 25 08:16:54 UTC 2010 Johnny Willemsen + + * DAnCE/tools/Split_Plan/Split_Plan.mpc: + Added missing base projects + +Thu Feb 25 07:46:04 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + * connectors/dds4ccm/impl/ndds/DataWriter.cpp: + * connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/Topic.cpp: + Implemented methods wich were not implemented yet. + +Wed Feb 24 22:08:45 UTC 2010 William R. Otte + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + + Additional cleanup. + +Wed Feb 24 15:23:40 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: + Resolved compiler errors. + +Wed Feb 24 15:01:17 UTC 2010 Marcel Smit - Fixed an error-checking problem whereby an invalid filename - didn't result in function exit properly. Thanks to Johnny - Willemsen for pointing this out. + * connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h: + * connectors/dds4ccm/impl/ndds/DataReader.h: + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h: + * connectors/dds4ccm/impl/ndds/DataReaderListener.h: + * connectors/dds4ccm/impl/ndds/DataReaderQos.h: + * connectors/dds4ccm/impl/ndds/DataWriter.h: + * connectors/dds4ccm/impl/ndds/DataWriterListener.h: + * connectors/dds4ccm/impl/ndds/DataWriterQos.h: + * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h: + * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h: + * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h: + * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h: + * connectors/dds4ccm/impl/ndds/Duration_t.h: + * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h: + * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h: + * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h: + * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h: + * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h: + * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h: + * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h: + * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h: + * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h: + * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h: + * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h: + * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h: + * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h: + * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h: + * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h: + * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h: + * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h: + * connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h: + * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h: + * connectors/dds4ccm/impl/ndds/Publisher.h: + * connectors/dds4ccm/impl/ndds/PublisherListener.h: + * connectors/dds4ccm/impl/ndds/PublisherQos.h: + * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h: + * connectors/dds4ccm/impl/ndds/QueryCondition.h: + * connectors/dds4ccm/impl/ndds/ReadCondition.h: + * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h: + * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h: + * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h: + * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h: + * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h: + * connectors/dds4ccm/impl/ndds/SampleLostStatus.h: + * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h: + * connectors/dds4ccm/impl/ndds/StatusCondition.h: + * connectors/dds4ccm/impl/ndds/StringSeq.h: + * connectors/dds4ccm/impl/ndds/Subscriber.h: + * connectors/dds4ccm/impl/ndds/SubscriberListener.h: + * connectors/dds4ccm/impl/ndds/SubscriberQos.h: + * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h: + * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h: + * connectors/dds4ccm/impl/ndds/Time_t.h: + * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h: + * connectors/dds4ccm/impl/ndds/TopicListener.h: + * connectors/dds4ccm/impl/ndds/TopicQos.h: + * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h: + * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h: + * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h: + Implemented Qos operators and renamed header defines. -Thu Mar 4 13:27:35 UTC 2010 William R. Otte +Wed Feb 24 14:36:37 UTC 2010 William R. Otte - * DAnCE/Plan_Launcher/EM_Launcher.h: + * DAnCE/tools/Split_Plan/Split_Plan_impl.h: Fuzz fix. -Thu Mar 4 13:11:25 UTC 2010 William R. Otte +Wed Feb 24 13:21:52 UTC 2010 Johnny Willemsen - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl: - * bin/ciao_tests.lst: + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: + Removed all lem interfaces - Added a test which 1) converts XML plans to CDR with - dance_convert_plan, and 2) deploys that plan. + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + Fixed compile errors -Thu Mar 4 13:08:02 UTC 2010 William R. Otte + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: + Some callbacks are ndds specific - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: +Wed Feb 24 11:43:52 UTC 2010 Johnny Willemsen - Ported to use dance_plan_launcher directly. + * MPC/config/dds4ccm_ts_default.mpb: + ndds needs no-strict-aliasing - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: +Wed Feb 24 11:39:52 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataWriter.cpp + * connectors/dds4ccm/impl/ndds/DataWriter.h + * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Write_T.h + * connectors/dds4ccm/impl/ndds/Publisher.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener.cpp + * connectors/dds4ccm/impl/ndds/TopicDescription.h + More cleanup + +Wed Feb 24 11:26:52 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp + * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h + * connectors/dds4ccm/impl/ndds/DataReader.cpp + * connectors/dds4ccm/impl/ndds/DataReader.h + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h + * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener.h + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h + * connectors/dds4ccm/impl/ndds/DataWriter.cpp + * connectors/dds4ccm/impl/ndds/DataWriter.h + * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp + * connectors/dds4ccm/impl/ndds/DataWriterListener.h + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Get_T.h + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Read_T.h + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Update_T.h + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Write_T.h + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipant.h + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h + * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h + * connectors/dds4ccm/impl/ndds/Getter_T.cpp + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h + * connectors/dds4ccm/impl/ndds/Publisher.cpp + * connectors/dds4ccm/impl/ndds/Publisher.h + * connectors/dds4ccm/impl/ndds/PublisherListener.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener.h + * connectors/dds4ccm/impl/ndds/QueryCondition.cpp + * connectors/dds4ccm/impl/ndds/QueryCondition.h + * connectors/dds4ccm/impl/ndds/ReadCondition.cpp + * connectors/dds4ccm/impl/ndds/ReadCondition.h + * connectors/dds4ccm/impl/ndds/Reader_T.cpp + * connectors/dds4ccm/impl/ndds/Subscriber.cpp + * connectors/dds4ccm/impl/ndds/Subscriber.h + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener.h + * connectors/dds4ccm/impl/ndds/Topic.cpp + * connectors/dds4ccm/impl/ndds/TopicDescription.cpp + * connectors/dds4ccm/impl/ndds/Updater_T.cpp + * connectors/dds4ccm/impl/ndds/Updater_T.h + * connectors/dds4ccm/impl/ndds/Writer_T.cpp + * connectors/dds4ccm/impl/ndds/Writer_T.h + Cleaning up the implementation + +Wed Feb 24 10:45:52 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp + * connectors/dds4ccm/impl/ndds/DataReader.cpp + * connectors/dds4ccm/impl/ndds/DataWriter.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp + * connectors/dds4ccm/impl/ndds/Publisher.cpp + * connectors/dds4ccm/impl/ndds/Reader_T.h + * connectors/dds4ccm/impl/ndds/StatusCondition.cpp + * connectors/dds4ccm/impl/ndds/StatusCondition.h + * connectors/dds4ccm/impl/ndds/Subscriber.cpp + * connectors/dds4ccm/impl/ndds/Topic.cpp + * connectors/dds4ccm/impl/ndds/Topic.h + * connectors/dds4ccm/impl/ndds/TopicDescription.cpp + * connectors/dds4ccm/impl/ndds/TopicDescription.h + * connectors/dds4ccm/impl/ndds/TopicListener.cpp + * connectors/dds4ccm/impl/ndds/TopicListener.h + Cleaning up the implementation + +Wed Feb 24 08:09:43 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + Resolved compiler warnings on Linux. + +Wed Feb 24 08:06:47 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: + * connectors/dds4ccm/impl/ndds/DataWriter.cpp: + * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.h: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h: + * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.h: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: + * connectors/dds4ccm/impl/ndds/Topic.cpp: + * connectors/dds4ccm/impl/ndds/Utils.h: + Resolved compiler warnings. Also removed unnecessary + space characters. + +Wed Feb 24 07:28:52 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp + * connectors/dds4ccm/impl/ndds/DataReader.cpp + * connectors/dds4ccm/impl/ndds/DataReader.h + * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp + * connectors/dds4ccm/impl/ndds/DataReaderQos.h + * connectors/dds4ccm/impl/ndds/DataWriter.cpp + * connectors/dds4ccm/impl/ndds/DataWriter.h + * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp + * connectors/dds4ccm/impl/ndds/DataWriterListener.h + * connectors/dds4ccm/impl/ndds/DataWriterQos.h + * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h + * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipant.h + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h + * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h + * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h + * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h + * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h + * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h + * connectors/dds4ccm/impl/ndds/Duration_t.h + * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h + * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h + * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h + * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h + * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h + * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h + * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h + * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h + * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h + * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h + * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h + * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h + * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h + * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h + * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h + * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h + * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h + * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h + * connectors/dds4ccm/impl/ndds/Publisher.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener.h + * connectors/dds4ccm/impl/ndds/PublisherQos.h + * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h + * connectors/dds4ccm/impl/ndds/QueryCondition.cpp + * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h + * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h + * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h + * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h + * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h + * connectors/dds4ccm/impl/ndds/SampleInfo.h + * connectors/dds4ccm/impl/ndds/SampleLostStatus.h + * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h + * connectors/dds4ccm/impl/ndds/StringSeq.h + * connectors/dds4ccm/impl/ndds/Subscriber.cpp + * connectors/dds4ccm/impl/ndds/Subscriber.h + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener.h + * connectors/dds4ccm/impl/ndds/SubscriberQos.h + * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h + * connectors/dds4ccm/impl/ndds/Time_t.h + * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h + * connectors/dds4ccm/impl/ndds/TimeUtilities.h + * connectors/dds4ccm/impl/ndds/Topic.cpp + * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h + * connectors/dds4ccm/impl/ndds/TopicDescription.h + * connectors/dds4ccm/impl/ndds/TopicListener.cpp + * connectors/dds4ccm/impl/ndds/TopicQos.h + * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h + * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h + * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h + Guarded all RTI specific code + + * MPC/config/dds4ccm.mpb: + Don't compile anything related to dds4ccm when we don't have + a dds vendor installed + +Tue Feb 23 21:49:52 UTC 2010 William R. Otte + + * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp: + + Rogue letter was causing a compile error. + +Tue Feb 23 16:22:42 UTC 2010 William R. Otte + + * DAnCE/MPC/config/dance_convert_plan.mpb: + * DAnCE/MPC/config/dance_split_plan.mpb: + * DAnCE/MPC/config/dance_tools.mpb: + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + * DAnCE/tools/Convert_Plan/Convert_Plan.cpp: + * DAnCE/tools/Convert_Plan/Convert_Plan.mpc: + * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h: + * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: + * DAnCE/tools/Split_Plan/Split_Plan.mpc: + * DAnCE/tools/Split_Plan/Split_Plan.cpp: + * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp: + + Fuzz fixes. + +Tue Feb 23 16:13:24 UTC 2010 William R. Otte + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + + Bugfix for how connections are handled when there are two + internalEndpoints but it is _not_ a local conneciton. + + * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp: + * examples/Hello/descriptors/PlanLocality_SameProcess.cdp: + + Corrected IOR file so test script finds controller. + +Tue Feb 23 15:33:33 UTC 2010 Abdul Sowayan + + * DAnCE/tools/Convert_Plan/Convert_Plan.mpc: + + Added dance_config_handlers as a base project to DAnCE_Convert_Plan + project. Thanks to William Otte for the suggestion. + +Tue Feb 23 15:16:24 UTC 2010 William R. Otte + + * DAnCE/ExecutionManager/ExecutionManager.mpc: + + Added split_plan base project. + +Tue Feb 23 14:54:11 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: + Inserted forgotten new line character. + +Tue Feb 23 14:46:23 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp: + Resolved deployment errors related to generation of the connector + code. + +Tue Feb 23 14:34:59 UTC 2010 Marcel Smit + + * bin/ciao_tests.lst: + CSLUnexpStat is not ready, yet. + + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + Layout changes. + + * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp: * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: + * connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp: * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: - * examples/BasicSP/descriptors/run_test.pl: - * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl: - * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl: - * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Null_Component/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test_without_ns.pl: - * examples/Null_Component_Glfa/descriptors/run_test.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: + Resolved deployment errors related to generation of the connector + code. - Ported tests to use new teardown option. +Tue Feb 23 14:28:22 UTC 2010 William R. Otte - * DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc: - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp: + * DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h: - Removed these files, as they are made obsolete by - direct-to-nodemanager deployment. + Missing file. -Thu Mar 4 13:04:14 UTC 2010 William R. Otte +Tue Feb 23 13:25:49 UTC 2010 Johnny Willemsen - * DAnCE/Plan_Launcher/Deployment_Failure.h: - * DAnCE/Plan_Launcher/EM_Launcher.h: - * DAnCE/Plan_Launcher/EM_Launcher.cpp: - * DAnCE/Plan_Launcher/NM_Launcher.h: - * DAnCE/Plan_Launcher/NM_Launcher.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher.mpc: - * DAnCE/Plan_Launcher/Plan_Launcher_Base.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: + * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl + * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl + * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl + Added various pragma's + + * connectors/dds4ccm/idl/dds4ccm.mpc + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h + * connectors/dds4ccm/impl/ndds/Getter_T.h + * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h + * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h + * connectors/dds4ccm/impl/ndds/Publisher.h + * connectors/dds4ccm/impl/ndds/PublisherListener.h + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener_T.h + * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h + * connectors/dds4ccm/impl/ndds/Reader_T.cpp + * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h + * connectors/dds4ccm/impl/ndds/StringSeq.h + * connectors/dds4ccm/impl/ndds/Subscriber.h + * MPC/config/ciaoidldefaults.mpb + * MPC/config/componentidldefaults.mpb + Portability changes - Plan launcher re-factoring. Improves ability to handle CDR - encoded deployment plans, adds ability to perform - direct-to-NodeManager deployments, some command line options - cleaned up. Main user visible change in behavior is the change - of the teardown option from -q to -s. +Tue Feb 23 14:08:20 UTC 2010 William R. Otte -Thu Mar 4 13:02:04 UTC 2010 William R. Otte + * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h: - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h: - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp: - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp: + Use the split plan library instead of internal split plan impl. - Improved reporting of error conditions. + * DAnCE/MPC/config/dance_convert_plan.mpb: + * DAnCE/MPC/config/dance_split_plan.mpb: + * DAnCE/MPC/config/dance_tools.mpb: -Thu Mar 4 12:57:52 UTC 2010 William R. Otte + Base projects for convert_plan/split_plan. + * DAnCE/tools: + * DAnCE/tools/Convert_Plan: * DAnCE/tools/Convert_Plan/Convert_Plan.cpp: * DAnCE/tools/Convert_Plan/Convert_Plan.mpc: + * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h: * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: - Re-implemented CDR logic to not use FILE_Connector. + Tool allowing validation/conversion of XML deployment plans to + CDR. -Thu Mar 4 12:54:14 UTC 2010 Marcel Smit + * DAnCE/tools/Split_Plan: + * DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h: + * DAnCE/tools/Split_Plan/Split_Plan.mpc: + * DAnCE/tools/Split_Plan/Split_Plan.cpp: + * DAnCE/tools/Split_Plan/Split_Plan_impl.h: + * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp: - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc: - Resolved compile issues. + Tool allowing users to split plans into locality constrained + partitions. Also contains important bugfixes for process + colocation. + +Tue Feb 23 13:40:49 UTC 2010 Johnny Willemsen + + * bin/ciao_tests.lst: + Added new 3832 tests + + * ciao/Logger/Logger_Service.cpp: + * ciao/Logger/Logger_Service.h: + * DAnCE/Logger/Logger_Service.cpp: + * DAnCE/Logger/Logger_Service.h: + Fixed service config macros which caused this service not + to get loaded on linux + + * tests/Bug_3832_Regression/* + * DAnCE/tests/Bug_3832_Regression/* + Added new test for 3832 + +Tue Feb 23 12:45:56 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/logger/Log_Macros.h: + * connectors/dds4ccm/impl/logger/Log_Macros.cpp: + Making use of the CIAO_Debug_Level flag of the + CIAO logging framework. + +Tue Feb 23 11:54:21 UTC 2010 Marcel Smit + + * MPC/config/dds4ccm_impl.mpb: + * MPC/config/dds4ccm_logger.mpb: + * connectors/dds4ccm/impl/logger: + * connectors/dds4ccm/impl/logger/Log_Macros.h: + * connectors/dds4ccm/impl/logger/Log_Macros.cpp: + * connectors/dds4ccm/impl/logger/Logger.mpc: + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: + * connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: + * connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataWriter.cpp: + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp: + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp: + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + * connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp: + * connectors/dds4ccm/impl/ndds/StatusCondition.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + * connectors/dds4ccm/impl/ndds/Topic.cpp: + * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: + * connectors/dds4ccm/impl/ndds/TopicListener.cpp: + * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: + * connectors/dds4ccm/impl/ndds/Updater_T.cpp: + * connectors/dds4ccm/impl/ndds/Writer_T.cpp: + * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: + * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: + Created DDS4CCM_DEBUG, DDS4CCM_TRACE and DDS4CCM_ERROR macros. + For now these macros make use of the CIAO logging framework. In + the future, DDS4CCM should have it's own logging framework. + +Tue Feb 23 09:26:15 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Getter_T.h: + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + Refactored get_one, making use of the read_w_condition + API method. + +Tue Feb 23 08:50:49 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl: + Added missing pragma + + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc: + Disabled this project for the moment, rtiddsgen can't handle this -Thu Mar 4 10:39:04 UTC 2010 Johnny Willemsen +Tue Feb 23 07:47:49 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc + Updated to generate connector + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.cpp + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.h + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.cpp + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.h + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.cpp + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.h + removed + +Tue Feb 23 07:22:49 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc + * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc + * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc + * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc + * connectors/dds4ccm/idl/dds4ccm.mpc + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl + * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl + * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl + * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp + * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h + * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h + * connectors/dds4ccm/impl/ndds/DataReader.h + * connectors/dds4ccm/impl/ndds/DataReaderListener.h + * connectors/dds4ccm/impl/ndds/DataWriter.h + * connectors/dds4ccm/impl/ndds/DataWriterListener.h + * connectors/dds4ccm/impl/ndds/DomainParticipant.h + * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h + * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h + * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h + * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h + * connectors/dds4ccm/impl/ndds/Publisher.h + * connectors/dds4ccm/impl/ndds/PublisherListener.h + * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h + * connectors/dds4ccm/impl/ndds/QueryCondition.h + * connectors/dds4ccm/impl/ndds/ReadCondition.h + * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h + * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h + * connectors/dds4ccm/impl/ndds/StatusCondition.h + * connectors/dds4ccm/impl/ndds/Subscriber.h + * connectors/dds4ccm/impl/ndds/SubscriberListener.h + * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h + * connectors/dds4ccm/impl/ndds/TopicDescription.h + * connectors/dds4ccm/impl/ndds/TopicListener.h + * connectors/dds4ccm/impl/ndds/Utils.h + * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc + * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc + * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc + * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc + * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc + * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl + * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc + * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc + * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc + * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc + * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc + * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc + * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc + * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc + * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc + * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc + * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc + * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc + * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc + * MPC/config/connectoridldefaults.mpb + * MPC/config/dds4ccm.mpb + * MPC/config/dds4ccm_base.mpb + * MPC/config/dds4ccm_ts_default.mpb + More portability changes + +Tue Feb 23 04:44:49 UTC 2010 William R. Otte + + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp: + + Tests to excercise process colocation when passed through the + EM. + + * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: + + Test script was broken and not actually running tests. + +Tue Feb 23 04:05:06 UTC 2010 William R. Otte + + * DAnCE/bin/PythonDAnCE/generator/__init__.py: + * DAnCE/bin/PythonDAnCE/generator/comp_impl.py: + * DAnCE/bin/PythonDAnCE/generator/comp_inst.py: + * DAnCE/bin/PythonDAnCE/generator/config_prop.py: + * DAnCE/bin/PythonDAnCE/generator/connection.py: + * DAnCE/bin/PythonDAnCE/generator/deploy_requirement.py: + * DAnCE/bin/PythonDAnCE/generator/external_reference.py: + * DAnCE/bin/PythonDAnCE/generator/internal_endpoint.py: + * DAnCE/bin/generate_plan.py: + + Improvements to allow more expressive plan generation. + +Tue Feb 23 04:03:46 UTC 2010 William R. Otte + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + + Additional error checking, and an improvements to how + colocation groups with NoConstraint are handled. + +Tue Feb 23 02:55:31 UTC 2010 Abdul Sowayan + + * examples/Hello/descriptors/NodeMap.dat: + * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp: + * examples/Hello/descriptors/PlanLocality_SameProcess.cdp: + * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl: + * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: + + Added the files above to test PlanLocality feature. + +Tue Feb 23 02:39:25 UTC 2010 Abdul Sowayan + + * examples/Hello/Receiver/Receiver_exec.h: + * examples/Hello/Receiver/Receiver_exec.cpp: + * examples/Hello/Sender/Sender_exec.h: + * examples/Hello/Sender/Sender_exec.cpp: + + Update this example. It was out of date and as such, it + wouldn't work with CoSMIC generated descriptors (due + to missing entry points). + +Mon Feb 22 22:13:59 UTC 2010 Abdul Sowayan + + * examples/Null_Component/descriptors/NodeMap.dat: + + Changed port number. + + * examples/Null_Component/descriptors/run_test_without_ns.pl: + + Enhanced this script so it would deploy all cdps (component deployment plans) + that are in the directory. + +Mon Feb 22 21:39:08 UTC 2010 Abdul Sowayan + + * examples/Null_Component/descriptors/Null_PlanLocality_DifferentProcesses.cdp: + * examples/Null_Component/descriptors/Null_PlanLocality_SameProcess.cdp: + Add a couple of deployment plans to test the PlanLocality feature. + +Mon Feb 22 20:48:36 UTC 2010 Abdul Sowayan + + * examples/Null_Component/descriptors/NodeMap.dat: + * examples/Null_Component_Glfa/descriptors/NodeMap.dat: + + Fixed a small bug in these files. + + * examples/Null_Component/descriptors/run_test_without_ns.pl: + + Added a new test to deploy this example without using the naming service. + + * bin/ciao_tests.lst: + + Add run_test_without_ns.pl to the daily regression tests. + +Feb 22 14:26:16 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl: + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl: + * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: + Extended test with an extra connector which handles a fixed + size struct. + +Mon Feb 22 13:48:38 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl + * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl + * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl + * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl + * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl + * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl + * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl + * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl + * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl + * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl + * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl + * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl + * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl + * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl + * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl + * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl + * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl + * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl + * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl + * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl + * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl + * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl + * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl + * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl + * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl + * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl + * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl + * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl + * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl + * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl + * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl + * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl + * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl + Updated rti typesupport to ndds typesupport, everywhere we talk + about ndds + +Mon Feb 22 13:39:38 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h + * connectors/dds4ccm/impl/ndds/DataReader.h + * connectors/dds4ccm/impl/ndds/DataWriter.h + * connectors/dds4ccm/impl/ndds/DomainParticipant.h + * connectors/dds4ccm/impl/ndds/Duration_t.h + * connectors/dds4ccm/impl/ndds/Getter_T.h + * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h + * connectors/dds4ccm/impl/ndds/QueryCondition.h + * connectors/dds4ccm/impl/ndds/Reader_T.h + * connectors/dds4ccm/impl/ndds/SampleInfo.h + * connectors/dds4ccm/impl/ndds/Subscriber.h + * connectors/dds4ccm/impl/ndds/Time_t.h + * connectors/dds4ccm/impl/ndds/Topic.h + Portability improvements + + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl: + Updated typesupport + +Mon Feb 22 12:47:38 UTC 2010 Johnny Willemsen + + * DAnCE/MPC/config/dance_nodeapplication.mpb + * DAnCE/NodeApplication/NodeApplication.mpc + Corrected after + +Mon Feb 22 12:46:38 UTC 2010 Johnny Willemsen + + * DAnCE/MPC/config/dance_nodeapplicationmanager.mpb + * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc + Corrected after + +Mon Feb 22 12:36:38 UTC 2010 Johnny Willemsen * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc - * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc @@ -202,400 +1127,7932 @@ Thu Mar 4 10:39:04 UTC 2010 Johnny Willemsen * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc - Make sure we only generate the export file once + Added empty source files to not pickup files that are already generated + by other projects in the same directory -Thu Mar 4 10:30:04 UTC 2010 Marcel Smit +Mon Feb 22 12:30:38 UTC 2010 Johnny Willemsen - * connectors/dds4ccm/impl/dds/TimeUtilities.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/impl/dds/ndds/TimeUtilities.h: - Moved TimeUtilities.h from impl/dds/ndds to impl/dds/. + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc + * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc + * connectors/dds4ccm/impl/ndds/ndds_impl.mpc + * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc + * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc + * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc + * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc + * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc + * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc + * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc + * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc + * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc + * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc + * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc + * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc + * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc + * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc + Removed nddslib as base project -Thu Mar 4 10:22:44 UTC 2010 Marcel Smit + * MPC/config/dds4ccm_base.mpb: + Added nddslib as base project - * connectors/dds4ccm/tests/Policies/pub_qos_test.cpp: - * connectors/dds4ccm/tests/Policies/sub_qos_test.cpp: - Resolved fuzz errors. +Mon Feb 22 12:25:38 UTC 2010 Johnny Willemsen -Thu Mar 4 10:18:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/dds/DataReader.cpp: - * connectors/dds4ccm/impl/dds/DataWriter.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h: - * connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h: - * connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h: - * connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/Duration_t.h: - * connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/OctetSeq.h: - * connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/PublisherQos.h: - * connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/TimeUtilities.h: - * connectors/dds4ccm/impl/dds/ndds/Time_t.h: - * connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/TopicQos.h: - * connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h: - Removed all >>= operators. - - * connectors/dds4ccm/tests/Policies/entity_factory_qos_test.cpp: - * connectors/dds4ccm/tests/Policies/presentation_qos_test.cpp: - * connectors/dds4ccm/tests/Policies/wr_lifecycle_qos_test.cpp: - Resolved compile warnings on Windows. - -Thu Mar 4 09:37:01 UTC 2010 Marcel Smit + * connectors/dds4ccm/impl/ndds/Getter_T.h: + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h + * connectors/dds4ccm/impl/ndds/Reader_T.cpp + Layout changes - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - Changed path to TimeUtilities.h. +Mon Feb 22 12:11:38 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc + * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc + * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc + * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc + * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc + * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc + * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc + * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc + * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc + * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc + * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc + * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc + * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc + * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc + * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc + * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc + * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc + * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc + * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc + Fixed casing problems -Thu Mar 4 09:31:48 UTC 2010 Marcel Smit +Mon Feb 22 11:37:38 UTC 2010 Johnny Willemsen - * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp: - Set is_coherent_write to true. + Reverted change below - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - Resolve compile issue. +Mon Feb 22 10:34:38 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc + * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc + * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc + * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc + * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc + * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc + * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc + * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc + * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc + * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc + * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc + * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc + * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc + * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc + * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc + * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc + * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc + * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc + * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc + Added custom_only=1 + +Mon Feb 22 10:16:38 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h: + Updated ifdef guards + + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc: + Layout changes + + * MPC/config/dds4ccm_base.mpb: + * MPC/config/dds4ccm_impl.mpb: + Simplified thse projects + +Mon Feb 22 09:49:50 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc: + Resolved MPC-warning. + +Mon Feb 22 09:29:38 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc + * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc + * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc + * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc + * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc + * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc + * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc + * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc + * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc + * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc + * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc + * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc + * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc + * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc + * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc + * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc + * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc + * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc + * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc + * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc + * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc + * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc + * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc + Use the new dds4ccm_ts_defaults base project + +Mon Feb 22 08:29:03 UTC 2010 Marcel Smit -Thu Mar 4 09:21:49 UTC 2010 Marijke Hengstmengel + * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Update_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: + Created typedefs of templated classes. +Mon Feb 22 08:21:57 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h: + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Write_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataWriter.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: + Using the ACE_NEW_* macros (instead of C++ new). + +Mon Feb 22 08:22:38 UTC 2010 Johnny Willemsen + + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: + Layout change + + * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp + * DAnCE/RepositoryManager/RepositoryManager.cpp + Shutdown the orb + + * MPC/config/connectoridldefaults.mpb: + No executor header file for a connector + +Mon Feb 22 08:20:38 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Layout and const changes + +Mon Feb 22 07:18:38 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc + * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc + * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc + * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc + * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc + Simplified these base projects + +Sun Feb 21 09:24:38 UTC 2010 Johnny Willemsen + + * ChangeLogs/*: + Use full year + +Sat Feb 20 20:31:38 UTC 2010 Johnny Willemsen + + * MPC/config/dds4ccm_ts_default.mpb: + New base project for dds4ccm dds type support generation. This + base project will be soon be used for all dds4ccm examples and + tests. The typesupport files will now be linked together with + the tao type code to one shared library. dds4ccm should work + on the long term with multiple dds implementations, the fact + that you have an implementation doesn't mean you want to use + it with dds4ccm. with the new features dds4ccm_ndds, dds4ccm_opendds, + and dds4ccm_splice you can control which dds vendor dds4ccm + should use. At this moment ndds is supported and tested + + Thanks to Adam Mitz for extending MPC to make this base + project possible + +Fri Feb 19 15:44:38 UTC 2010 Jeff Parsons + + * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: + + Added #include, newly required due to reordering of + #includes in the front end. + +Fri Feb 19 15:11:38 UTC 2010 Johnny Willemsen + + * docs/OMG-CCM-Tutorial.ppt: + Improved AMI4CCM one step further + +Fri Feb 19 12:53:38 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Get_T.h + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h + * connectors/dds4ccm/impl/ndds/Getter_T.cpp + * connectors/dds4ccm/impl/ndds/Getter_T.h + Added a boolean to the connectors to let the TAO_IDL + compiler generate whether we have a fixed or non fixed + type. The memory management is different and caused + compile and runtime problems with getter::get_one. + We now specialized the Getter::get_one method for + fixed and for non fixed types + +Fri Feb 19 11:53:38 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Topic.cpp: + Implemented some more ACE_NEW_* macros. + +Fri Feb 19 11:29:08 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: + * connectors/dds4ccm/impl/ndds/DataWriter.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: + * connectors/dds4ccm/impl/ndds/Topic.cpp: + Implemented some more ACE_NEW_* macros. + +Fri Feb 19 10:51:49 UTC 2010 Marcel Smit + + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: + Changed value of RELIABLE_READER_ACTIVITY_CHANGED_STATUS. + + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: + Prepared the test to receive the RELIABLE_READER_ACTIVITY_CHANGED_STATUS. + +Fri Feb 19 08:43:52 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/*: + Added tests in order to test the TAO_IDL compliler. + +Fri Feb 19 08:35:57 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.cpp + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.cpp + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.cpp + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp + * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.cpp + * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.cpp + * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.cpp + * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.cpp + * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.cpp + * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.cpp + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp + * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.cpp + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.cpp + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.cpp + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.cpp + * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.cpp + * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.cpp + * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.cpp + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.cpp + * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.cpp + * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.cpp + * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.cpp + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.cpp + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h + * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h + * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h + * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h + * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h + * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h + * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h + * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h + * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h + * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h + * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h + * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h + * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h + * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h + Removed from the archive, generated by tao_idl from now + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl + * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl + * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl + * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl + * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl + * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl + * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl + * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl + * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl + * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl + * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl + * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl + * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl + * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl + * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl + * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl + * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl + * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl + * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl + * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl + * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl + * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl + * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl + * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl + * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl + * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl + * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl + * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl + Added RTI typesupport pragma + + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc + * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc + * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc + * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc + * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc + * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc + Updated to let tao_idl generate the connector + +Thu Feb 18 16:07:57 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl + Added rti typesupport pragma + + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h + Removed from the archive + + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc + Updated to generate the connector + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp + Layout change + +Thu Feb 18 15:47:57 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/id3p_test/*: + Removed, obsolete + +Thu Feb 18 15:43:57 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: + * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl: + Added rti typesupport pragma + + * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.cpp + * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h + * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.cpp + * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.h + Removed from the archive + + * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc + * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc + Updated to generate the connector + +Thu Feb 18 15:36:06 UTC 2010 Marijke Hengstmengel + + * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp: + Remove some tabs. + +Thu Feb 18 15:35:57 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc: + Updated to use tao_idl generation + + * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp: + * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h: + Removed from the archive + +Thu Feb 18 14:22:29 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: + * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: + * connectors/dds4ccm/impl/ndds/ReadCondition.cpp: + * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: + * connectors/dds4ccm/impl/ndds/TopicListener.cpp: + Implemented ACE_NEW_* macros. + +Thu Feb 18 13:48:20 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc: + Removed dummy label to enable compilation. + +Thu Feb 18 13:44:59 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc: + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc: + Removed dummy label. + + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Receiver/*: + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Sender/*: + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/descriptors/*: + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Receiver/*: + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Sender/*: + * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/descriptors/*: + Removed these files since this is there to capture compiler errors. + +Thu Feb 18 13:26:06 UTC 2010 Marijke Hnegstmengel + + * connectors/dds4ccm/performance-tests/Latency: + * connectors/dds4ccm/performance-tests/Latency/Base: * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl: + * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc: + * connectors/dds4ccm/performance-tests/Latency/Connector: + * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.idl: + * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc: + * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.cpp: + * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.h: + * connectors/dds4ccm/performance-tests/Latency/descriptors: * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp: * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp: * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/README: * connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl: * connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl: + * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/Latency/Receiver: + * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.idl: + * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc: * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp: + * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.h: + * connectors/dds4ccm/performance-tests/Latency/Sender: * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl: + * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc: * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp: * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h: - Add statistics, use only fixed size elements in topic and clean up code. + First base of new latency test dds4ccm. +Thu Feb 18 13:22:43 UTC 2010 Marcel Smit -Thu Mar 4 09:06:49 UTC 2010 Marcel Smit + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + Made better use of the ACE_NEW_* macros. - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/CoherentWriter: - Added coherent writer test. +Thu Feb 18 13:13:57 UTC 2010 Johnny Willemsen -Thu Mar 4 08:55:49 UTC 2010 Marcel Smit + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + Fixed gcc compile error - * connectors/dds4ccm/impl/dds/ndds/TimeUtilities.h: - Added. +Thu Feb 18 12:33:06 UTC 2010 Marcel Smit -Thu Mar 4 08:53:03 UTC 2010 Marcel Smit + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + Using the ACE_NEW_* marcros instead of the + regular C++ new. - * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: - Resolved compile issue. +Thu Feb 18 11:36:08 UTC 2010 Marcel Smit -Thu Mar 4 08:30:43 UTC 2010 Marcel Smit + * connectors/dds4ccm/tests/TwoTopics/*: + Test to check whether the generated exec code + compiles without errors when defining two topics + in one connector. - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/Policies/*: - Added a policy test. This tests all the ndds - streaming operators. +Thu Feb 18 09:00:40 UTC 2010 Marcel Smit -Thu Mar 4 07:51:20 UTC 2010 Marcel Smit + * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/*: + Added test to test fixed size data. Fixed size data is handled + in a different way. This'll result in compliler errors when not + coded properly. - * connectors/dds4ccm/idl/ccm_dds.idl: - Renamed ifdef according to file name. - - * connectors/dds4ccm/impl/dds/: - * connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h: - * connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.h: - * connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Get_T.h: - * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Read_T.h: - * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/dds/DDS_Update_T.h: - * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/dds/DDS_Write_T.h: - * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/dds/DataListenerControl_T.h: - * connectors/dds4ccm/impl/dds/DataReader.h: - * connectors/dds4ccm/impl/dds/DataReader.cpp: - * connectors/dds4ccm/impl/dds/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/dds/DataWriter.h: - * connectors/dds4ccm/impl/dds/DataWriter.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener.h: - * connectors/dds4ccm/impl/dds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/dds/DataWriterListener_T.h: - * connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipant.h: - * connectors/dds4ccm/impl/dds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp: - * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/dds/Getter_T.h: - * connectors/dds4ccm/impl/dds/Getter_T.cpp: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/dds/PortStatusListener_T.h: - * connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/dds/Publisher.h: - * connectors/dds4ccm/impl/dds/Publisher.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener.h: - * connectors/dds4ccm/impl/dds/PublisherListener.cpp: - * connectors/dds4ccm/impl/dds/PublisherListener_T.h: - * connectors/dds4ccm/impl/dds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/dds/QueryCondition.h: - * connectors/dds4ccm/impl/dds/QueryCondition.cpp: - * connectors/dds4ccm/impl/dds/ReadCondition.h: - * connectors/dds4ccm/impl/dds/Reader_T.h: - * connectors/dds4ccm/impl/dds/Reader_T.cpp: - * connectors/dds4ccm/impl/dds/StateListenerControl_T.h: - * connectors/dds4ccm/impl/dds/StatusCondition.h: - * connectors/dds4ccm/impl/dds/Subscriber.h: - * connectors/dds4ccm/impl/dds/Subscriber.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener.h: - * connectors/dds4ccm/impl/dds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/dds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/dds/Topic.h: - * connectors/dds4ccm/impl/dds/Topic.cpp: - * connectors/dds4ccm/impl/dds/TopicDescription.h: - * connectors/dds4ccm/impl/dds/TopicListener.cpp: - * connectors/dds4ccm/impl/dds/TopicListener_T.h: - * connectors/dds4ccm/impl/dds/TopicListener_T.cpp: - * connectors/dds4ccm/impl/dds/Updater_T.h: - * connectors/dds4ccm/impl/dds/Updater_T.cpp: - * connectors/dds4ccm/impl/dds/Writer_T.h: - * connectors/dds4ccm/impl/dds/Writer_T.cpp: - - * connectors/dds4ccm/impl/dds/ndds: - * connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h: - * connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h: - * connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h: - * connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/Duration_t.h: - * connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/OctetSeq.h: - * connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/PublisherQos.h: - * connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/SampleInfo.h: - * connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h: - * connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/StringSeq.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/Time_t.h: - * connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/TopicQos.h: - * connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/dds/ndds_impl.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp: - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp: - * connectors/dds4ccm/impl/dds/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/dds/DataReaderQos.h: - * connectors/dds4ccm/impl/dds/DataWriterQos.h: - * connectors/dds4ccm/impl/dds/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/dds/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/dds/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/dds/DomainParticipantQos.h: - * connectors/dds4ccm/impl/dds/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/dds/Duration_t.h: - * connectors/dds4ccm/impl/dds/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/dds/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/dds/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/dds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/dds/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/dds/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/dds/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/dds/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/dds/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/dds/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/dds/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/dds/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/dds/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/dds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/dds/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/dds/PublisherQos.h: - * connectors/dds4ccm/impl/dds/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/dds/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/dds/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/dds/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/dds/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/dds/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/dds/SampleInfo.h: - * connectors/dds4ccm/impl/dds/SampleLostStatus.h: - * connectors/dds4ccm/impl/dds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/dds/StringSeq.h: - * connectors/dds4ccm/impl/dds/SubscriberQos.h: - * connectors/dds4ccm/impl/dds/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/dds/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/dds/TimeUtilities.h: - * connectors/dds4ccm/impl/dds/Time_t.h: - * connectors/dds4ccm/impl/dds/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/TopicQos.h: - * connectors/dds4ccm/impl/dds/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/dds/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/dds/WriterDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/ndds/*: - - Renamed /impl/ndds to /impl/dds. Added /impl/dds/ndds for all - NDDS specific header files. - - Replaced last C++ new's with ACE_NEW* marcros. - - Implemented latest sreaming operators for NDDS specific - conversions. - - Renamed rti_xxx variable names to ccm_dds_xxx. - - Renamed namespace RTI to DDS_CCM. - - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl: - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc: - Renamed /impl/ndds to /impl/dds. Added /impl/dds/ndds for all - NDDS specific header files. - Added a value_type-test for these tests. +Thu Feb 18 08:37:49 UTC 2010 Marcel Smit -Thu Mar 4 07:50:54 UTC 2010 Johnny Willemsen + * connectors/dds4ccm/docs/TestCoverage.ods: + Updated - * NEWS: - Updated for next micro + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + Added some more tracing. - * DAnCE/MPC/config/dance_split_plan.mpb: + * connectors/dds4ccm/tests/FixedSizeStruct/*: + Added test to test fixed size data. Fixed size data is handled + in a different way. This'll result in compliler errors when not + coded properly. + + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: + Improved the way the Receiver receives data. + +Thu Feb 18 08:30:57 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + Fixed compile error with fixed size datatypes + + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Layout and documentation fixes + + * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc: + No need for C.inl + +Wed Feb 17 15:24:57 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: Layout changes - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Extended this test + * DAnCE/DomainApplication/Domain_Application_Impl.cpp + * DAnCE/DomainApplication/Domain_Application_Impl.h + * DAnCE/DomainApplication/DomainApplication.mpc + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h + Cleanup + +Wed Feb 17 13:57:57 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: + Deleted reactor member which is not needed here + + * DAnCE/NodeManager/Node_Manager_Module.h: + * DAnCE/RepositoryManager/Repository_Manager_Module.h: + Removed not needed include + + * DAnCE/RepositoryManager/RepositoryManager.mpc: + Cleanup base projects + +Wed Feb 17 12:14:57 UTC 2010 Johnny Willemsen + + * DAnCE/MPC/config/dance_plan_generator.mpb + * DAnCE/Plan_Generator/PCVisitor.cpp + * DAnCE/Plan_Generator/PCVisitor.h + * DAnCE/Plan_Generator/PCVisitorBase.cpp + * DAnCE/Plan_Generator/PCVisitorBase.h + * DAnCE/Plan_Generator/PCVisitorBase.inl + * DAnCE/Plan_Generator/Plan_Generator.mpc + * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp + * DAnCE/Plan_Generator/Plan_Generator_Impl.h + * DAnCE/Plan_Generator/Plan_Generator_Impl_Export.h + removed, not used at all + +Wed Feb 17 12:10:57 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl: + Added pragma + + * DAnCE/RepositoryManager/DAnCE_RepositoryManager_Module_Export.h: + Deleted + +Wed Feb 17 12:09:57 UTC 2010 Johnny Willemsen + + * DAnCE/NodeManager/Node_Manager_Module.h: + Removed obsolete header + + * DAnCE/MPC/config/dance_utils.mpb + * DAnCE/Utils + * DAnCE/Utils/DAnCE_Utils.mpc + * DAnCE/Utils/DAnCE_Utils_Export.h + * DAnCE/Utils/Plan_Handler.cpp + * DAnCE/Utils/Plan_Handler.h + Removed, not used at all + +Wed Feb 17 11:40:57 UTC 2010 Johnny Willemsen + + Cleanup of the repository manager + + * DAnCE/DAnCE/DAnCE_Loader.h: + * DAnCE/MPC/config/dance_repositorymanager.mpb: + * DAnCE/RepositoryManager/Repository_Manager_Admin_Export.h + Deleted + + * DAnCE/RepositoryManager/PC_Updater.h + * DAnCE/RepositoryManager/Repository_Manager.cpp + * DAnCE/RepositoryManager/repository_manager_admin.h + * DAnCE/RepositoryManager/Repository_Manager_Exec.cpp + * DAnCE/RepositoryManager/Repository_Manager_Module.cpp + * DAnCE/RepositoryManager/Repository_Manager_Module.h + * DAnCE/RepositoryManager/RepositoryManager.mpc + * DAnCE/RepositoryManager/RepositoryManager_Impl.h + * DAnCE/RepositoryManager/RM_Helper.h + * DAnCE/RepositoryManager/URL_Parser.h + Cleanup + +Wed Feb 17 11:20:57 UTC 2010 Johnny Willemsen + + Cleanup of the target manager + + * DAnCE/MPC/config/dance_nodemanager.mpb: + * DAnCE/MPC/config/dance_targetmanager.mpb + Deleted, obsolete + + * DAnCE/NodeApplication/NodeApplication.mpc: + * DAnCE/RepositoryManager/RM_Helper.h: + * DAnCE/TargetManager/ResourceCommitmentManager.h: + layout change + + * DAnCE/NodeManager/NodeManager.mpc: + Reduced dependency + + * DAnCE/TargetManager/Target_Manager_Exec.cpp + * DAnCE/TargetManager/Target_Manager_Module_export.h + * DAnCE/TargetManager/TargetManager_Impl_export.h + Deleted from the archive + + * DAnCE/TargetManager/Target_Manager.cpp + * DAnCE/TargetManager/Target_Manager_Module.cpp + * DAnCE/TargetManager/Target_Manager_Module.h + * DAnCE/TargetManager/TargetManager.mpc + * DAnCE/TargetManager/TargetManager_Impl.cpp + * DAnCE/TargetManager/TargetManager_Impl.h + Simplified and cleanup + +Wed Feb 17 10:54:57 UTC 2010 Johnny Willemsen + + * DAnCE/TargetManager/CmpClient.cpp + * DAnCE/TargetManager/TM_Client.mpc + Moved to DAnCE/tests/TargetManager + +Wed Feb 17 09:49:35 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: + Stopping time when the run actualy starts. + +Wed Feb 17 09:41:57 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: + Added rti typesupport trait + + * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc: + Updated to use tao_idl generated connector + + * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.cpp: + * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h: + Removed from the archive + +Wed Feb 17 09:36:32 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Check whether the get_listener returns nil. + + * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl: + * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h: + * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: + Improved implementation. Sometimes unregister_handles hangs in + a never ending loop. + + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: + Improved implementation. Polling for the last sample in DDS now + is done using the reactor thread. + +Wed Feb 17 09:21:57 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.cpp: + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h: + Deleted, generated by tao_idl now + +Wed Feb 17 09:07:57 UTC 2010 Johnny Willemsen + + Simplified NodeManager + + * DAnCE/NodeManager/DAnCE_NodeManager_Module_Export.h + * DAnCE/NodeManager/Node_Manager_Exec.cpp + * DAnCE/NodeManager/NodeManager_Export.h + Removed + + * DAnCE/NodeManager/Node_Manager.cpp + * DAnCE/NodeManager/Node_Manager_Module.cpp + * DAnCE/NodeManager/Node_Manager_Module.h + * DAnCE/NodeManager/NodeManager.mpc + * DAnCE/NodeManager/NodeManager_Impl.cpp + * DAnCE/NodeManager/NodeManager_Impl.h + Simplified + + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp + Fixed warning + +Tue Feb 16 20:34:27 UTC 2010 Jeff Parsons + + * connectors/dds4ccm/idl/dds4ccm_Connector.idl: + + Removed the line '#define connector component' since we + now have backend and frontend connector support. + + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc: + + Modified projects to generate and compile the + connector implementation. + + * examples/BasicSP/BMClosedED/BMClosedED.idl: + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + + Cosmetic changes. + +Tue Feb 16 20:04:57 UTC 2010 Johnny Willemsen + + Simplified execution manager + + * DAnCE/ExecutionManager/DAnCE_ExecutionManager_Module_Export.h + * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp + * DAnCE/ExecutionManager/ExecutionManager_Export.h + Removed + + * DAnCE/ExecutionManager/Execution_Manager.cpp + * DAnCE/ExecutionManager/ExecutionManager.mpc + * DAnCE/ExecutionManager/ExecutionManager_Impl.h + * DAnCE/ExecutionManager/ExecutionManager_Module.cpp + * DAnCE/ExecutionManager/ExecutionManager_Module.h + Simplified + + * DAnCE/Plan_Launcher/Plan_Launcher.cpp: + Layout changes + +Tue Feb 16 19:33:57 UTC 2010 Johnny Willemsen + + Simplified the plan_launcher, it was way to complex to + build + + * DAnCE/MPC/config/dance_plan_launcher.mpb + * DAnCE/MPC/config/dance_plan_launcher_base.mpb + * DAnCE/Plan_Launcher/Plan_Launcher.h + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_Export.h + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module_Export.h + * DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h + * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Module.h + * DAnCE/Plan_Launcher/Plan_Launcher_Module_Export.h + * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp + Deleted, all not used + + * DAnCE/Plan_Launcher/Plan_Launcher.cpp + * DAnCE/Plan_Launcher/Plan_Launcher.mpc + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h + Updated to contain the Plan_Launcher implementation and main + +Tue Feb 16 18:45:57 UTC 2010 Johnny Willemsen + + * DAnCE/Plan_Launcher/launcher.cpp: + Removed, not used + + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: + Layout changes + +Tue Feb 16 18:04:57 UTC 2010 Johnny Willemsen + + * DAnCE/DAnCE/CIAO_ExecutionManagerDaemon.idl + * DAnCE/DAnCE/CIAO_Interfaces.mpc + * DAnCE/ExecutionManager/ExecutionManager.mpc + * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp + * DAnCE/ExecutionManager/ExecutionManager_Impl.h + * DAnCE/MPC/config/ciao_executionmanager_skel.mpb + * DAnCE/MPC/config/ciao_executionmanager_stub.mpb + * DAnCE/RepositoryManager/RepositoryManager.cpp + Removed shutdown method, it was not used and a non spec interface + +Tue Feb 16 15:48:57 UTC 2010 Johnny Willemsen + + * DAnCE/DAnCE/DAnCE_Properties.mpc: + Added mpc file which should have been committed earlier today + +Tue Feb 16 13:08:57 UTC 2010 Marijke Hemgstmengel + + * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/README: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: + Add attribute number_of_subscribers, made different test scripts. + +Tue Feb 16 12:47:57 UTC 2010 Johnny Willemsen + + * DAnCE/Config_Handlers/Config_Handlers.mpc + * DAnCE/DAnCE/DAnCE_Loader.h + * DAnCE/DAnCE/DAnCE_Properties.idl + * DAnCE/DAnCE/Deployment_common.h + * DAnCE/Deployment/DAnCE_Core.mpc + * DAnCE/Deployment/DAnCE_Loader.h + * DAnCE/Deployment/DAnCE_Properties.idl + * DAnCE/Deployment/Deployment.idl + * DAnCE/Deployment/Deployment_Application.idl + * DAnCE/Deployment/Deployment_ApplicationManager.idl + * DAnCE/Deployment/Deployment_Base.idl + * DAnCE/Deployment/Deployment_common.h + * DAnCE/Deployment/Deployment_DeploymentPlan.idl + * DAnCE/Deployment/Deployment_NodeManager.idl + * DAnCE/Deployment/Deployment_Packaging_Data.idl + * DAnCE/Deployment/Deployment_RepositoryManager.idl + * DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl + * DAnCE/Deployment/Deployment_stub_export.h + * DAnCE/Deployment/Deployment_svnt_export.h + * DAnCE/Deployment/Deployment_TargetData.idl + * DAnCE/ExecutionManager/ExecutionManager_Module.cpp + * DAnCE/NodeApplication/NodeApplication.mpc + * DAnCE/NodeApplication/NodeApplication_Impl.cpp + * DAnCE/NodeApplication/NodeApplication_Impl.h + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp + * DAnCE/NodeManager/Node_Manager_Module.cpp + * DAnCE/NodeManager/Node_Manager_Module.h + * DAnCE/NodeManager/NodeManager_Impl.h + * DAnCE/Plan_Launcher/Plan_Launcher.mpc + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h + * DAnCE/RepositoryManager/Repository_Manager_Module.cpp + * DAnCE/RepositoryManager/Repository_Manager_Module.h + * DAnCE/TargetManager/Target_Manager_Module.cpp + * DAnCE/TargetManager/Target_Manager_Module.h + Removed DAnCE/Deployment to just contain the spec compliant IDL, + non compliant parts have been moved to DAnCE/DAnCE. All using + code has been updated. We did found some problems in the OMG IDL + 07-02-01 which has been reported to the OMG: + - LastConfiguration and InvalidReference are listed in 07-02-01 + but not used at all. + - PlanLocalityKind members have a Plan prefix to resolve a conflict + with LocalityKind::SameProcess. + All extensions for DDS4CCM have now a comment indicating that + +Tue Feb 16 12:32:37 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: + Resolved shutdown errors. + +Tue Feb 16 10:54:26 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp: + Added data listener and test thread switch for this + data listener. + +Tue Feb 16 09:45:32 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + Improved code for thread switch. + + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: + Removed reader implementation since it's unnecessary. Also + optimized logging. + + * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp: + Improved logging. + +Tue Feb 16 08:23:57 UTC 2010 Johnny Willemsen + + * DAnCE/Config_Handlers/Config_Handlers.mpc + * DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc + * DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc + * DAnCE/Deployment/DAnCE_Core.mpc + * DAnCE/DomainApplication/DomainApplication.mpc + * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc + * DAnCE/ExecutionManager/ExecutionManager.mpc + * DAnCE/ExecutionManager/ExecutionManager_Impl.h + * DAnCE/MPC/config/ciao_config_handlers.mpb + * DAnCE/MPC/config/ciao_config_handlers_base.mpb + * DAnCE/MPC/config/ciao_nodeapplication.mpb + * DAnCE/MPC/config/ciao_nodeapplicationmanager.mpb + * DAnCE/MPC/config/ciao_plan_generator.mpb + * DAnCE/MPC/config/ciao_targetmanager_stub.mpb + * DAnCE/MPC/config/ciao_targetmanager_svnt.mpb + * DAnCE/MPC/config/dance_applicationmanager_skel.mpb + * DAnCE/MPC/config/dance_component_server.mpb + * DAnCE/MPC/config/dance_component_server_svnt.mpb + * DAnCE/MPC/config/dance_config_handlers.mpb + * DAnCE/MPC/config/dance_config_handlers_base.mpb + * DAnCE/MPC/config/dance_deployment_skel.mpb + * DAnCE/MPC/config/dance_deployment_svnt.mpb + * DAnCE/MPC/config/dance_domainapplication_skel.mpb + * DAnCE/MPC/config/dance_executionmanager_skel.mpb + * DAnCE/MPC/config/dance_extension_stub.mpb + * DAnCE/MPC/config/dance_nodeapplication_skel.mpb + * DAnCE/MPC/config/dance_nodemanager_skel.mpb + * DAnCE/MPC/config/dance_nodemanager_svnt.mpb + * DAnCE/MPC/config/dance_output.mpb + * DAnCE/MPC/config/dance_plan_generator.mpb + * DAnCE/MPC/config/dance_repositorymanager.mpb + * DAnCE/MPC/config/dance_repositorymanager_skel.mpb + * DAnCE/MPC/config/dance_targetmanager.mpb + * DAnCE/MPC/config/dance_targetmanager_skel.mpb + * DAnCE/MPC/config/dance_tm_daemon.mpb + * DAnCE/NodeApplication/NodeApplication.mpc + * DAnCE/NodeManager/NodeManager.mpc + * DAnCE/Plan_Launcher/Plan_Launcher.mpc + * DAnCE/RepositoryManager/RepositoryManager.mpc + * DAnCE/TargetManager/TargetManager.mpc + * DAnCE/TargetManager/TM_Client.mpc + * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc + * DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc + * DAnCE/tests/Config_Handlers/Config_Handlers.mpc + * DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc + * DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc + * DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc + * DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc + * DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc + * DAnCE/Utils/DAnCE_Utils.mpc + Cleanup of DAnCE base projects + +Mon Feb 15 19:48:57 UTC 2010 Johnny Willemsen + + * DAnCE/DAnCE + * DAnCE/DAnCE/CIAO_Interfaces.mpc + * DAnCE/DAnCE/CIAO_NodeManagerDaemon.idl + * DAnCE/Deployment/ciao + * DAnCE/Deployment/ciao/CIAO_ExecutionManagerDaemon.idl + * DAnCE/Deployment/ciao/CIAO_Interfaces.mpc + * DAnCE/Deployment/ciao/CIAO_NodeManagerDaemon.idl + * DAnCE/Deployment/ciao/Module_Main.h + * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp + * DAnCE/ExecutionManager/ExecutionManager_Impl.h + * DAnCE/MPC/config/ciao_nodemanager_skel.mpb + * DAnCE/MPC/config/ciao_nodemanager_stub.mpb + * DAnCE/NodeManager/Node_Manager_Exec.cpp + * DAnCE/NodeManager/NodeManager_Impl.h + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h + * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp + * DAnCE/RepositoryManager/Repository_Manager_Exec.cpp + * DAnCE/TargetManager/Target_Manager_Exec.cpp + * DAnCE/TargetManager/TM_Client.mpc + Moved DAnCE/Deployment/ciao to DAnCE/DAnCE and removed the + CIAO_NodeManagerDeamon interface, it was not used at all + +Mon Feb 15 19:05:57 UTC 2010 Johnny Willemsen + + * DAnCE/Deployment/ciao/CIAO_NodeManagerDaemon.idl: + Fixed comments and removed commented out stuff + + * DAnCE/NodeManager/Node_Manager_Module.cpp: + * DAnCE/TargetManager/Target_Manager_Module.cpp + Fixed typo in comment + + * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: + Fixed warning + + * DAnCE/RepositoryManager/PC_Updater.cpp: + * DAnCE/RepositoryManager/PC_Updater.h + Layout and documentation fixes + + * DAnCE/RepositoryManager/repository_manager_admin.cpp: + Unicode fixes + + * DAnCE/RepositoryManager/Repository_Manager_Module.cpp + * DAnCE/RepositoryManager/Repository_Manager_Module.h + Removed not used servant map + + * DAnCE/RepositoryManager/RepositoryManager.cpp: + Doxygen fixes + + * DAnCE/RepositoryManager/RepositoryManager_Impl.h: + * DAnCE/RepositoryManager/RM_Helper.cpp + * DAnCE/RepositoryManager/RM_Helper.h + Layout changes + + * DAnCE/TargetManager/DAnCE_TargetManagerDaemon.idl: + Removed, this interface was used, but not implemented at all + + * DAnCE/TargetManager/TargetManager.mpc: + Removed obsolete projects + + * DAnCE/TargetManager/TargetManager_Impl.cpp + * DAnCE/TargetManager/TargetManager_Impl.h + removed not used shutdown + +Mon Feb 15 14:04:57 UTC 2010 Johnny Willemsen + + * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp + * DAnCE/TargetManager/DomainDataManager.cpp + * DAnCE/TargetManager/DomainDataManager.h + * DAnCE/TargetManager/ResourceCommitmentManager.cpp + * DAnCE/TargetManager/ResourceCommitmentManager.h + * DAnCE/TargetManager/TargetManager_Impl.cpp + Various code improvements + +Mon Feb 15 13:32:57 UTC 2010 Johnny Willemsen + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + * DAnCE/NodeApplication/NodeApplication_Impl.h: + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: + * DAnCE/NodeManager/Node_Manager_Module.cpp: + * DAnCE/NodeManager/NodeManager_Impl.h: + Various code improvements + +Mon Feb 15 13:20:10 UTC 2010 Marcel Smit + + * DAnCE/DomainApplication/Domain_Application_Impl.cpp: + Throwing exception when errors occur during shutdown. + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + New line appended to log message. + + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp: + * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: + Throwing and catching exceptions when errors occur + during shutdown. When errors occur, ccm_remove is not + invoked and when it isn't, tests seems to be ok while they're + not. + + * connectors/dds4ccm/docs/ccm_dds.idl: + Layout changes. + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + Added trace. + + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: + Optimized logging. + +Mon Feb 15 13:15:57 UTC 2010 Johnny Willemsen + + * DAnCE/TargetManager/TargetManager_exec.cpp: + * DAnCE/TargetManager/TargetManager_exec.h: + Removed, not used + + * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp + * DAnCE/ExecutionManager/ExecutionManager_Impl.h + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h + * DAnCE/TargetManager/DomainDataManager.cpp + * DAnCE/TargetManager/DomainDataManager.h + * DAnCE/TargetManager/ResourceCommitmentManager.cpp + Reduced includes and dependencies + +Mon Feb 15 12:50:57 UTC 2010 Johnny Willemsen + + * DAnCE/Deployment/ciao + * DAnCE/Deployment/ciao/CIAO_ExecutionManagerDaemon.idl + * DAnCE/Deployment/ciao/CIAO_Interfaces.mpc + * DAnCE/Deployment/ciao/CIAO_NodeManagerDaemon.idl + * DAnCE/Deployment/ciao/Module_Main.h + * DAnCE/Deployment/CIAO_ExecutionManagerDaemon.idl + * DAnCE/Deployment/CIAO_Interfaces.mpc + * DAnCE/Deployment/CIAO_NodeManagerDaemon.idl + * DAnCE/Deployment/DAnCE_Core.mpc + * DAnCE/Deployment/Deployment_common.h + * DAnCE/Deployment/Deployment_NodeManager.idl + * DAnCE/Deployment/Module_Main.h + * DAnCE/DomainApplication/Domain_Application_Impl.cpp + * DAnCE/DomainApplication/Domain_Application_Impl.h + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp + * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp + * DAnCE/ExecutionManager/ExecutionManager_Impl.h + * DAnCE/ExecutionManager/ExecutionManager_Module.cpp + * DAnCE/MPC/config/dance_domainapplicationmanager_skel.mpb + * DAnCE/MPC/config/dance_domainapplicationmanager_stub.mpb + * DAnCE/MPC/config/dance_nodeapplication_stub.mpb + * DAnCE/MPC/config/dance_nodeapplicationmanager_skel.mpb + * DAnCE/MPC/config/dance_nodeapplicationmanager_stub.mpb + * DAnCE/NodeManager/Node_Manager_Exec.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h + * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp + * DAnCE/RepositoryManager/Repository_Manager_Exec.cpp + * DAnCE/TargetManager/Target_Manager_Exec.cpp + Moved the CIAO specific idl/code from DAnCE/Deployment to + DAnCE/Deployment/ciao and updated using code. Move + ApplicationManager to its own DLL and enabled in some projects + AMI. + +Mon Feb 15 09:50:57 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + Optimized logging regarding domain_id. + +Mon Feb 15 09:35:55 UTC 2010 Marcel Smit + + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: + Changed the startup sequence. Don't use a sleep. + + * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: + Extended test time. + +Mon Feb 15 09:19:44 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + Layout changes + + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: + Extend test with two connectors sharing the same topic. + +Fri Feb 12 19:08:36 UTC 2010 Johnny Willemsen + + * MPC/config/dance_applicationmanager.mpb: + * MPC/config/dance_applicationmanager_skel.mpb: + * MPC/config/dance_applicationmanager_stub.mpb: + New base projects for the dance am library + +Fri Feb 12 18:49:36 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h: + Added some missing includes + +Fri Feb 12 18:31:36 UTC 2010 Johnny Willemsen + + * examples/Null_Component_Glfa/Null_Component.mpc: + Removed not needed after + +Fri Feb 12 15:50:36 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + Reusing topic when reusing a domainparticipant. + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + Optimized logging. + +Fri Feb 12 13:18:06 UTC 2010 Marcel Smit + + * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl: + * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h: + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl: + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h: + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl: + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h: + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp: + Moved typed module ShapeType from the CCM_DDS module to the Shapes module + and renamed it to ShapeTypeConn. + +Fri Feb 12 12:37:15 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl: + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl: + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl: + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h: + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl: + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl: + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl: + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: + Moved typed module TestTopic from the CCM_DDS module to the TestTopic module + and renamed it to TestTopicConn. + +Fri Feb 12 11:31:59 UTC 2010 Marcel Smit + + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: + Changed number of RELIABLE_READER_ACTIVITY_CHANGED_STATUS. This now + reflects the DDS_RELIABLE_READER_ACTIVITY_CHANGED_STATUS. + + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl: + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h: + Moved typed connector to the test module. + + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: + Added a reader. Stopping reading after a while. + Also changes related to movement of the connector. + + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: + Changed timing. + + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: + Added reader connection. + + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml: + Removed some unused settings. + + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: + Sleeping 20 seconds. + +Thu Feb 11 15:41:08 UTC 2010 Marcel Smit + + * connectors/dds4ccm/docs/TestCoverage.ods: + Updated. + +Thu Feb 11 15:26:11 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: + Don't need to test thread switch in the receiver because + on_offered_deadline_missed-status is not related to a subsciber and should not + be reaceived. + +Thu Feb 11 15:22:11 UTC 2010 Marcel Smit + + * connectors/dds4ccm/docs/TestCoverage.ods: + Updated to reflect the latest status. + + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: + Resolved test errors. + +Thu Feb 11 11:34:38 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Utils.h: + Added RELIABLE_READER_ACTIVITY_CHANGED_STATUS to string + conversion. + + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: + Layout changes. + + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: + Enabled listener. + + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml: + Added ON_LIVELINESS_LOST status test. + + * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: + Removed ConnectorStatusListener from connection list. + +Thu Feb 11 10:42:55 UTC 2010 Johnny Willemsen + + * examples/Null_Component_Glfa/Null_Component.mpc: + Glem is required + + * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc: + Small cleanup + +Thu Feb 11 08:31:27 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: + Improved test by using a timer to check for last sample in DDS. + + * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: + Incremented iterations + +Thu Feb 11 02:27:37 UTC 2010 Abdul Sowayan + + * bin/ciao_tests.lst: + + Add TAO/CIAO/examples/Null_Component_Glfa to the list of + daily tests we run so we can ensure that the feature + is still functional. + +Thu Feb 11 02:21:29 UTC 2010 Abdul Sowayan + + * examples/Null_Component_Glfa/Null_Component.mpc: + * examples/Null_Component_Glfa/Null_Interface.mpc: + + Decorated project names with Glfa token so project names + won't clash with the Null_Component example. + +Wed Feb 10 22:22:55 UTC 2010 Jeff Parsons + + * connectors/dds4ccm/idl/dds4ccm_Base.idl: + + Removed the line '#define connector component' + +Wed Feb 10 21:36:32 UTC 2010 Abdul Sowayan + + * examples/Null_Component_Glfa/Null_Interface.mpc: + + Minor changes to the MPC files to accomodate Glfa changes. + +Wed Feb 10 21:15:28 UTC 2010 Abdul Sowayan + + * examples/Null_Component_Glfa/StaticDAnCEApp.cpp: + * examples/Null_Component_Glfa/StaticDAnCEApp.mpc: + * examples/Null_Component_Glfa/plan.h: + + Removed these files. They are not relavent to the Glfa + example. + +Wed Feb 10 21:13:53 UTC 2010 Abdul Sowayan + + * examples/Null_Component_Glfa/Null_Component.mpc: + + Added -Glfa option to the project. + +Wed Feb 10 21:02:03 UTC 2010 Abdul Sowayan + + * examples/Null_Component_Glfa/*: + + We should have an example to test the -Glfa feature. + This is a place holder for now, more modifications + are needed to make this functional. + +Wed Feb 10 19:49:13 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DomainParticipant.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + Using refcounting of CORBA::LocalObject since it's thread safe. + + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + Removed unnecessary debug statement. + +Wed Feb 10 15:33:37 UTC 2010 Marijke Hengstmengelt + + * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: + Use a High_Res_Timer in sender in order to make it possible to send more messages in a timeinterval. + +Wed Feb 10 14:23:51 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + Checking whether a connection to the reader is in place before read. + + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: + Wait a while before informing the receiver that the samples + were written. + +Wed Feb 10 14:06:59 UTC 2010 Marcel Smit + + * bin/ciao_tests.lst: + SharedDomainParticipant tests should work again. + + * connectors/dds4ccm/impl/ndds/DomainParticipant.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + Made DomainParticipant proxy class refcounted. Prevented + deleting the DomainParticipant proxy when still in use. + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: + Optimized logging. + +Wed Feb 10 10:26:55 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: + * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h: + Removed generated headers + +Wed Feb 10 10:03:26 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + Implemented thread switch for DataReaderStateListener. + + * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl: + Layout changes. + +Wed Feb 10 09:36:55 UTC 2010 Johnny Willemsen + + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + Extended native example + + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc: + Added the exec export flags to get svn head to compile + + * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl: + Added another pragma + +Wed Feb 10 08:12:55 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h: + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp: + Preparing thread switch DataReaderStateListener_T. + + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + Code alignment. + + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + Check on error listeners pointer. + + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: + Optimized logging. Code alignment. + +Wed Feb 10 8:10:37 UTC 2010 Marijke Hengstmengelt + + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: + Removed unused parameter. + +Tue Feb 9 22:57:04 UTC 2010 Jeff Parsons + + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc: + + Added generation of connector export header file, and cosmetic + changes. + + * MPC/config/connectoridldefaults.mpb: + + Added command line options to trigger generation of connector + implementation and connector export header file. + +Tue Feb 9 13:27:37 UTC 2010 Marijke Hengstmengelt + + * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl: + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: + Get and print throughput statistics, print latency one way, code optimalizations. + +Tue Feb 9 13:27:37 UTC 2010 Marcel Smit + + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl: + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h: + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl: + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl: + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: + Moved typed module Hello to Hello namespace (instead of leaving + it in the CCM_DDS namespace). + +Tue Feb 9 13:25:17 UTC 2010 Johnny Willemsen + + * ciao/Valuetype_Factories/Cookies.h: + Layout change + + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + Added commented out example using native that causes tao_idl to crash + +Tue Feb 9 12:49:17 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: + Code alignment in order to be consistent with other tests. + +Tue Feb 9 12:36:38 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: + Optimized logging. + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.h: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: + Added test for thread switch. + +Tue Feb 9 12:24:14 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: + Optimized logging. + + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: + Added test for thread switch. + + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: + Resolved compiler warnings on Linux. + +Tue Feb 9 12:02:59 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: + Code alignment and optimized logging. + + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h: + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: + Added thread switch test. + + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: + Code aligning. + +Tue Feb 9 11:04:46 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: + Added thread swich test to Sender component. + + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: + Optimized logging. + +Tue Feb 9 10:21:44 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: + Minor code changes. + + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: + Tested thread switch on sender side. Minor code changes. + +Tue Feb 9 10:15:43 UTC 2010 Johnny Willemsen + + * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp: + Fixed memory leak + + * connectors/ami4ccm/docs/AMI4CCM-explanation.odt: + * connectors/ami4ccm/docs/AMI4CCM-spec.odt: + Small updates + +Tue Feb 9 10:03:55 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: + Since on_data_on_readers is not available anymore, this test + didn't start. Resolved this by letting the receiver know that + all samples were written. + +Tue Feb 9 09:29:54 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: + Resolved compiler issue. + +Tue Feb 9 08:40:07 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + * connectors/dds4ccm/impl/ndds/DataWriter.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/Topic.cpp: + When DDS returns nil as a listener, we don't need + to create a proxy. Just return nil will be enough. + Implemented get_listener methods. + +Mon Feb 8 20:22:40 UTC 2010 Marcel Smit + + * connectors/dds4ccm/docs/TestCoverage.ods: + Updated. + + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: + Optimized logging. + + * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl: + * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl: + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl: + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: + Since on_data_on_readers is not available anymore, these tests + didn't start. Resolved this by start listening on ccm_activate. + +Mon Feb 8 15:14:43 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h: + Added explicit global scope + + * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl: + Added pragma rti typesupport to indicate the name of the typesupport + header that will be generated by rtiddsgen. We need to know the + name of this file when generating the dds4ccm connectors by tao_idl + +Mon Feb 8 15:00:45 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: + Extended test with on_publication_matched. Also implemented test regarding + thread switch for all unexpected statusses to be received (instead of + one thread switch test for all statussses). + +Mon Feb 8 13:49:04 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl: + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: + Add tests for thread switch. + + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: + Code aligning. + +Mon Feb 8 13:33:43 UTC 2010 Johnny Willemsen + + * bin/ciao_tests.lst: + Fixed incorrect path + +Mon Feb 8 13:16:43 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp + * connectors/dds4ccm/impl/ndds/DataReader.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp + * connectors/dds4ccm/impl/ndds/DataWriter.cpp + * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp + * connectors/dds4ccm/impl/ndds/Publisher.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener.cpp + * connectors/dds4ccm/impl/ndds/QueryCondition.cpp + * connectors/dds4ccm/impl/ndds/ReadCondition.cpp + * connectors/dds4ccm/impl/ndds/Reader_T.cpp + * connectors/dds4ccm/impl/ndds/StatusCondition.cpp + * connectors/dds4ccm/impl/ndds/Subscriber.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp + * connectors/dds4ccm/impl/ndds/Topic.cpp + * connectors/dds4ccm/impl/ndds/TopicDescription.cpp + * connectors/dds4ccm/impl/ndds/Writer_T.cpp + * DAnCE/TargetManager/ResourceCommitmentManager.cpp + Removed generated comments which didn't had any value + +Mon Feb 8 13:02:39 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: + Resolved compiler issue. + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: + Extended test with thread switch test. + +Mon Feb 8 12:28:48 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp: + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: + Replaced DDS_STATUS_MASK_NONE with 0 since DDS_STATUS_MASK_NONE + is not part of the DDS spec. Also using the DDS namespace to + determine mask. + +Mon Feb 8 12:03:55 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + Shouldn't propagate on_data_on_readers to the user component. + +Mon Feb 8 11:35:22 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp: + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + Moved all empty inline methods from header to source file. + +Mon Feb 8 11:15:00 UTC 2010 Marcel Smit + + + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: + Added test scenario for thread switch. + + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: + Optimized logging regarding thread switch test. + +Mon Feb 8 10:56:43 UTC 2010 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc: + Added missing after + + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + Layout change + +Mon Feb 8 09:54:01 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: + Only test thread switch when CIAO_DDS4CCM_CONTEXT_SWITCH is turned on. + +Mon Feb 8 07:46:43 UTC 2010 Johnny Willemsen + + * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp: + Fixed memory leak + +Fri Feb 5 19:45:46 UTC 2010 Jeff Parsons + + * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: + * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp: + * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: + * tools/IDL3_to_XMI/IR_Simulator_visitor.h: + + Updates to eliminate build errors due to frontend + changes in home factories and finders. Further + work is needed for this tool to support home factories + and finders. + +Fri Feb 5 15:02:23 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: + Implemented thread switch. Test result was incorrectly printed. + + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: + Code aligning. + +Fri Feb 5 14:07:48 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc: + Resolved compiler issues on windows. + +Fri Feb 5 13:11:13 UTC 2010 Marcel Smit + + * connectors/dds4ccm/docs/TestCoverage.ods: + Updated. + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: + Test on thread handle is NIL. + + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: + Tested thread switch for StatusListener. + +Fri Feb 5 12:37:55 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: + Code aligning. + + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: + Tested thread switch for PortStatusListener. + +Fri Feb 5 12:10:58 UTC 2010 Marcel Smit + + * connectors/dds4ccm/docs/TestCoverage.ods: + Added new tests. + + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: + Tested thread switch for ConnectorStatusListener. + + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: + Tested thread switch for ReaderListener. + +Fri Feb 5 10:07:39 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.h: + * connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: + * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp: + Renamed OnUnexpectedStatusHandler to DDSCallbackStatusHandler. + +Fri Feb 5 09:38:48 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + * connectors/dds4ccm/impl/ndds/TopicListener_T.h: + * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: + Only use the DDS listener callbacks when the listener + connection is there or when logging is required. + +Fri Feb 5 07:25:43 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: + Resolved compiler issue. + +Thu Feb 4 15:44:43 UTC 2010 Johnny Willemsen + + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + Added a test related to 3819 + +Thu Feb 4 15:27:32 UTC 2010 Marcel Smit + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/TimeConversion: + * connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc: + * connectors/dds4ccm/tests/TimeConversion/run_test.pl: + * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: + Added test for testing conversions from and to DDS::Time_t. + +Thu Feb 4 15:21:22 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + * connectors/dds4ccm/impl/ndds/Utils.h: + Resolved runtime issues regarding logging an instance_handle + +Thu Feb 4 14:09:43 UTC 2010 Johnny Willemsen + + * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: + Cleanup and log which attribute is causing the exception + +Thu Feb 4 13:21:11 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Utils.h: + * connectors/dds4ccm/impl/ndds/Utils.cpp: + Resolved compiler issues on windows. + +Thu Feb 4 12:42:05 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + Resolved compiler errors. + +Thu Feb 4 12:37:44 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp: + Resolved compiler errors. + +Thu Feb 4 12:31:22 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp: + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: + * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: + Added status logging for each DDS callback. Also implemented + thread switch. + +Thu Feb 4 11:45:20 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + Corrected mask and according methods. + +Thu Feb 4 10:46:25 UTC 2010 Marcel Smit + + * connectors/dds4ccm/idl/ccm_dds.idl: + Code aligning. + + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h: + Added implementation regarding + ReliableReaderActivityChangedStatus. + + * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: + Added status logging for each DDS callback. + + * connectors/dds4ccm/impl/ndds/Utils.h: + * connectors/dds4ccm/impl/ndds/Utils.cpp: + Added helper methods for status logging in + DDS callbacks. + + * connectors/dds4ccm/impl/ndds/TimeUtilities.h: + Removed unnecessary comment. + + * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: + Rewritten to test all unexpected status. Also removed unused + DDS callbacks and realigned some code. + +Thu Feb 4 10:38:43 UTC 2010 Martin Corino + + * tests/Bug_2130_Regression/descriptors/run_test.pl: + * tests/Bug_3769_Regression/descriptors/run_test.pl: + * tests/IDL_Test/Double_Inherited_Component/run_test.pl: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: + * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: + * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: + * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: + * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: + * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: + * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: + * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: + * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: + * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: + * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: + * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: + * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: + * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: + * examples/Hello/descriptors/run_test_without_ns.pl: + * examples/Hello/descriptors/run_test_alias.pl: + * examples/Hello/descriptors/run_test.pl: + * examples/BasicSP/descriptors/run_test.pl: + * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl: + * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: + * examples/Null_Component/descriptors/run_test.pl: + + Added cleanup code to kill off remaining ciao_componentserver processes + (in case of certain test failures) since these otherwise tend to choke test + machines. + +Thu Feb 4 10:30:43 UTC 2010 Johnny Willemsen + + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + Extended this idl file + + * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: + enabled this test for compilation again + +Thu Feb 4 10:25:43 UTC 2010 Johnny Willemsen + + * ciao/Servants/Home_Servant_Impl_T.h: + Layout changes + + * tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc: + New MPC file, this test compiles fine now + +Thu Feb 4 10:23:43 UTC 2010 Johnny Willemsen + + * tools/IDL3_to_IDL2/basic_visitor.cpp + * tools/IDL3_to_IDL2/basic_visitor.h + * tools/IDL3_to_IDL2/checking_visitor.cpp + * tools/IDL3_to_IDL2/checking_visitor.h + * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp + * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h + * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp + * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h + * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp + * tools/IDL3_to_XMI/IR_Simulator_visitor.h + Merged changes from idl3_plus_backend2 branch to svn head + +Thu Feb 4 09:22:31 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: + Solve some compiler warnings. + +Wed Feb 3 15:08:43 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: + Reduced scope of the try/catch blocks + +Wed Feb 3 13:16:43 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Get_T.h + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Read_T.h + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h + * connectors/dds4ccm/impl/ndds/Reader_T.cpp + Distribute the reactor through the connector code + +Wed Feb 3 12:10:43 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp + Extended thread swit code, if you want to use this feature, + add CIAO_DDS4CCM_CONTEXT_SWITCH as 1 to your config.h file, + the code is not tested yet, when that is done, we will enable + this flag by default + +Wed Feb 3 11:59:43 UTC 2010 Marijke Hengstmengel + + * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: + * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: + Split in publisher and subscriber proces. Use other time functions. Set some attributes. + +Wed Feb 3 11:30:43 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h: + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp: + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: + * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: + * connectors/dds4ccm/impl/ndds/TopicListener_T.h: + Thread switch for the on_inconsistent_topic + +Wed Feb 3 11:19:43 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h + * connectors/dds4ccm/impl/ndds/PublisherListener_T.h + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h + More thread switch infrastructure code + +Wed Feb 3 08:10:43 UTC 2010 Johnny Willemsen + + * tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl: + New IDL3+ test file, fails to compile, when TAO_IDL can + handle this, we will add the mpc file + +Tue Feb 2 12:43:43 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: + Added missing export + + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + create eh when there is a reactor + +Tue Feb 2 12:36:43 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp + * connectors/dds4ccm/impl/ndds/ndds_impl.mpc + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp + * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener_T.h + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h + More rework for the thread switch + +Tue Feb 2 12:34:43 UTC 2010 Johnny Willemsen + + * tests/CIAO/CommandlinePassage/CommandlinePassage.mpc: + This test doesn't dependent on dds4ccm + +Tue Feb 2 12:32:43 UTC 2010 Johnny Willemsen + + * tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc: + This test doesn't dependent on dds4ccm + +Tue Feb 2 12:14:43 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener_T.h + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h + More rework for the thread switch + +Tue Feb 2 10:44:43 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h + * connectors/dds4ccm/impl/ndds/TopicListener_T.h + The internal dds4ccm classes will get an ACE_Reactor point, if + that is set, they will handle the thread switch using that + reactor. From the connector side we than only have to pass a + zero pointer or a pointer to a valid reactor + +Tue Feb 2 09:49:43 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h + * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h + * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h + * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h + * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h + * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h + * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h + * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h + * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h + * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h + * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h + * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h + * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h + * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h + * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h + * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h + * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h + removed not needed include of LocalObject + + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h + First rework to implement the required thread switch + +Mon Feb 1 19:16:43 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl: + Removed commented out code + + * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc: + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc: + * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc + Cleanup + + * MPC/config/ciao_dds4ccm_ndds_impl.mpb: + Deleted, not used + +Sun Jan 31 01:04:43 CST 2010 Johnny Willemsen + + * CIAO version 0.7.6 released. + +Fri Jan 29 13:36:30 UTC 2010 Johnny Willemsen + + * docs/OMG-CCM-Tutorial.ppt: + Updated some more parts to match more closely to the current situation + +Thu Jan 28 19:19:30 UTC 2010 Johnny Willemsen + + * docs/OMG-CCM-Tutorial.ppt: + Updated several parts to match more closely to the current situation + +Thu Jan 28 08:50:05 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc: + Resolved dependency. + +Thu Jan 28 07:59:30 UTC 2010 Johnny Willemsen + + * tests/Bug_3817_Regression/Bar.idl: + Enabled all idl, this bug has been fixed by Jeff + +Wed Jan 27 14:26:27 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl + * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl + * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl + * connectors/dds4ccm/idl/ccm_dds.idl + * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl + * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl + * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl + * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl + * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl + * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl + * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl + * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl + * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl + * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.idl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl + * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl + * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl + * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl + * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl + TAO_IDL has now partly support for templated modules in the front end, but + testing shows that this is enough for our current tets. Much more seperate + tests will be created and more work has to be done, but this is a good + step in the right direction + +Wed Jan 27 10:00:27 UTC 2010 Johnny Willemsen + + * bin/ciao_tests.lst: + Added !NO_IDL3_TO_XMI in order to disable idl3_to_xmi tests with cross + platform testing + +Wed Jan 27 09:41:27 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/TimeUtilities.h: + Fixed msvc warnings + +Wed Jan 27 08:34:36 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: + Updated value of the keys. + + * connectors/dds4ccm/impl/ndds/TimeUtilities.h: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: + Added operators in order to convert DDS::Time_T to ACE_Time_Value and + vice versa. The logging now uses ACE_Time_Value to print the timestamp. + +Wed Jan 27 06:47:27 UTC 2010 Johnny Willemsen + + * tests/Bug_3817_Regression/Bar.idl: + Fixed fuzz and commented out the double provides, that will + make the scoreboard turn green again for the moment + +Tue Jan 26 23:07:18 UTC 2010 Abdul Sowayan + + * tests/Bug_3817_Regression/Bar.idl: + * tests/Bug_3817_Regression/Bar.mpc: + + Renamed to avoid project name conflicts with another regression + test. + + * tests/Bug_3817_Regression/Foo.idl: + * tests/Bug_3817_Regression/Foo.mpc: + + Removed these files. + +Tue Jan 26 22:48:49 UTC 2010 Abdul Sowayan + + * tests/Bug_3817_Regression: + * tests/Bug_3817_Regression/Foo.idl: + * tests/Bug_3817_Regression/Foo.mpc: + + This test show an example where TAO_IDL does not generate + correct executor code. + +Tue Jan 26 19:56:27 UTC 2010 Johnny Willemsen + + * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: + Also build with cross compilation + +Tue Jan 26 14:33:35 UTC 2010 Marcel Smit + + * bin/ciao_tests.lst: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + Reverted the implementation of 1 dp per qos_profile for + now. There are some issue regarding which need te be + resolved first. + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + Don't use delete_contained_entities. + + * connectors/dds4ccm/impl/ndds/Subscriber.h: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + Renaming variable. + +Tue Jan 26 14:12:26 UTC 2010 Marijke Hengstmengel + + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: + Compile warning solved. + +Tue Jan 26 13:02:26 UTC 2010 Marijke Hengstmengel + + * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc: + Rename long project name. + +Tue Jan 26 11:39:13 UTC 2010 Marcel Smit + + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: + Resolved compiler errors/warnings on Linux. + + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: + Replaced InternalError with InternalErr. + +Tue Jan 26 11:20:27 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/tests/Performance: + * connectors/dds4ccm/performance-tests: + Renamed to performance-tests + +Tue Jan 26 10:41:26 UTC 2010 Marijke Hengstmengel + + * connectors/dds4ccm/tests/Performance + * connectors/dds4ccm/tests/Performance/Keyed + * connectors/dds4ccm/tests/Performance/Keyed/Base + * connectors/dds4ccm/tests/Performance/Keyed/Base/Perf_Keyed_Test_Base.idl + * connectors/dds4ccm/tests/Performance/Keyed/Base/Perf_Keyed_Test_Base.mpc + * connectors/dds4ccm/tests/Performance/Keyed/Connector + * connectors/dds4ccm/tests/Performance/Keyed/Connector/Perf_Keyed_Test_Connector.idl + * connectors/dds4ccm/tests/Performance/Keyed/Connector/Perf_Keyed_Test_Connector.mpc + * connectors/dds4ccm/tests/Performance/Keyed/Connector/Perf_Keyed_Test_Connector_exec.cpp + * connectors/dds4ccm/tests/Performance/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h + * connectors/dds4ccm/tests/Performance/Keyed/descriptors + * connectors/dds4ccm/tests/Performance/Keyed/descriptors/Plan.cdp + * connectors/dds4ccm/tests/Performance/Keyed/descriptors/run_test.pl + * connectors/dds4ccm/tests/Performance/Keyed/descriptors/USER_QOS_PROFILES.xml + * connectors/dds4ccm/tests/Performance/Keyed/Receiver + * connectors/dds4ccm/tests/Performance/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl + * connectors/dds4ccm/tests/Performance/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc + * connectors/dds4ccm/tests/Performance/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/Performance/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h + * connectors/dds4ccm/tests/Performance/Keyed/Sender + * connectors/dds4ccm/tests/Performance/Keyed/Sender/Perf_Keyed_Test_Sender.idl + * connectors/dds4ccm/tests/Performance/Keyed/Sender/Perf_Keyed_Test_Sender.mpc + * connectors/dds4ccm/tests/Performance/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/Performance/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h + Add first base of performace tests. + +Tue Jan 26 09:29:26 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc: + * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc: + * connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp: + Resolved fuzz warnings. + +Tue Jan 26 07:43:32 UTC 2010 Marcel Smit + + + * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h: + Extended == and != operators. + Resolved compiler warnings. + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/InstanceHandle/*: + Added test in order to test existing operators + for InstanceHandle_t. + +Mon Jan 25 18:25:27 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp + * connectors/dds4ccm/impl/ndds/Publisher.cpp + * connectors/dds4ccm/impl/ndds/Reader_T.cpp + * connectors/dds4ccm/impl/ndds/Subscriber.cpp + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp + Const changes + +Mon Jan 25 13:59:21 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: + Resolved compiler issue on Linux. + +Mon Jan 25 13:19:27 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: + Fixed fuzz + +Mon Jan 25 13:08:46 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: + Setting listener with the appropriate mask. This resolves + test errors regarding the StateListener. + + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: + Changed 'exception' with 'excep'. This'll resolved + test errors which aren't real errors. + +Mon Jan 25 12:04:27 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: + dpf is now a process wide singleton. This uncovers some issues with + the sharing of the dp between connectors + +Mon Jan 25 11:17:27 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp + Const, layout, and debug message changes + +Mon Jan 25 10:01:27 UTC 2010 Johnny Willemsen + + * DAnCE/MPC/config/dance_redirectionservice.mpb + * DAnCE/RedirectionService/* + * DAnCE/tests/ObjectLocatorTest/* + * DAnCE/tests/RedirectionServiceTest/* + Removed, redirectionservice isn't working in DAnCE and there are no + plans to add support for it + +Mon Jan 25 09:10:13 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc: + Resolved compiler. + +Mon Jan 25 09:01:27 UTC 2010 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.cpp: + * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.h: + Removed includes to files that have been removed + +Mon Jan 25 08:49:27 UTC 2010 Johnny Willemsen + + * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: + Always print usage messages + +Sat Jan 23 19:08:27 UTC 2010 Johnny Willemsen + + * DAnCE/ExecutionManager/ExecutionManager_Module.cpp + * DAnCE/NodeManager/Node_Manager_Module.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp + * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp + * DAnCE/RepositoryManager/Repository_Manager_Module.cpp + * DAnCE/TargetManager/Target_Manager_Module.cpp + Always print usage messages + +Sat Jan 23 18:46:27 UTC 2010 Johnny Willemsen + + * DAnCE/DomainApplicationManager/Node_Locator.cpp + * DAnCE/DomainApplicationManager/Node_Locator.h + * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp + * DAnCE/ExecutionManager/ExecutionManager_Impl.h + * DAnCE/ExecutionManager/ExecutionManager_Module.cpp + Unicode fixes + +Fri Jan 22 14:59:22 UTC 2010 Marcel Smit + + * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.idl: + * tests/IDL_Test/Included_Component/IC_Bar.idl: + * tests/IDL_Test/Included_Component/IC_Foo.idl: + Resolved compiler errors due to pragma ciao lem implementation. + +Fri Jan 22 14:52:27 UTC 2010 Johnny Willemsen + + * DAnCE/TargetManager/DomainEvents.idl: + Removed, not used + + * DAnCE/TargetManager/TargetManager_Impl.h: + Layout changes + +Fri Jan 22 14:23:40 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h: + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + * connectors/dds4ccm/impl/ndds/StringSeq.h: + Added operators in order to copy DDS_StringSeq + to and from DDS::StringSeq. + + * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h: + Added == and != operator in order to compare a + DDS_InstanceHandle with a DDS::InstanceHandle_t. + + * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: + Implemented remaining methods. + + * connectors/dds4ccm/impl/ndds/Reader_T.h: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Implemented remaining implementation of QueryCondition. + +Fri Jan 22 12:46:27 UTC 2010 Johnny Willemsen + + * ciao/Contexts/Context_Impl_Base.cpp: + * ciao/Contexts/Context_Impl_Base.h: + * ciao/Contexts/Context_Impl_T.cpp: + * ciao/Contexts/Context_Impl_T.h: + * ciao/Servants/Servant_Impl_T.cpp: + Pass the instance id through the constructor + +Fri Jan 22 11:59:27 UTC 2010 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Base/Hello.mpc + * connectors/ami4ccm/examples/Hello/Connector/AMI.idl + * connectors/ami4ccm/examples/Hello/Connector/AMI.mpc + * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.h + * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc + Use the ami4ccm support in TAO_IDL. The support is partly hardcoded + for just this interface, this is a prototype to show how + ami4ccm could look like. This needs some more tweaks and testing + +Fri Jan 22 11:32:44 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl: + * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl: + * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl: + Resolved compiler errors due to pragma ciao lem implementation. + +Fri Jan 22 10:28:27 UTC 2010 Johnny Willemsen + + * ciao/Servants/Servant_Impl_Base.cpp: + Add debug line + + * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.idl + * DAnCE/tests/CIAO/Components/SimpleProvider.idl + * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.idl + * examples/BasicSP/BMClosedED/BMClosedED.idl + * examples/BasicSP/BMDevice/BMDevice.idl + * examples/DevGuideExamples/Messenger/Messenger.idl + * examples/Display/GPS/GPS.idl + * examples/Display/GPS/GPSEI.idl + * examples/Hello/Sender/Sender.idl + * examples/Null_Component/Null_Component.idl + Updated for pragma ciao lem + +Thu Jan 21 14:58:27 UTC 2010 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Base/Hello.idl: + Use the new pragma ciao lem + +Thu Jan 21 14:57:27 UTC 2010 Johnny Willemsen + + * connectors/ami4ccm/ami4ccm/ami4ccm.idl: + Added include guards + +Thu Jan 21 14:40:27 UTC 2010 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp: + Make sure the executor is always there + +Thu Jan 21 14:37:27 UTC 2010 Johnny Willemsen + + * performance-tests/Benchmark/Benchmark.idl + * performance-tests/Benchmark/RoundTrip/RoundTrip.idl + * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc + * performance-tests/Benchmark/RoundTrip/RoundTripEI.idl + * performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl + * performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl + * performance-tests/Protocols/common/Protocols.idl + * performance-tests/Protocols/Receiver/Receiver.idl + Use the new pragma ciao lem + +Thu Jan 21 14:07:27 UTC 2010 Johnny Willemsen + + * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl + * tests/CIDL/CodeGen/Basic.idl + * tests/CIDL/CodeGen/CodeGen.idl + * tests/IDL_Test/Included_Component/IC_Bar.idl + * tests/IDL_Test/Inherited_Component/IhC_Bar.idl + * tests/IDL_Test/Reused_Facet_Interface/Basic.idl + * tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl + Use the new pragma ciao lem + +Thu Jan 21 13:55:41 UTC 2010 Marcel Smit + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: + Resolved last test errors. + +Thu Jan 21 13:48:27 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl + * connectors/dds4ccm/examples/Quoter/Broker/Broker.idl + * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl + * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc + Use the new pragma ciao lem + + * DAnCE/TargetManager/TargetManager.idl: + * DAnCE/TargetManager/TargetManagerExt.idl: + Deleted, not used + +Thu Jan 21 13:44:27 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/idl/ccm_dds.idl + * connectors/dds4ccm/idl/dds4ccm_Base.idl + * connectors/dds4ccm/idl/dds4ccm_Connector.idl + * connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl + * connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl + * connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl + * connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl + * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl + * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl + * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.idl + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.idl + * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl + * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl + * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl + * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl + * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl + * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl + * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl + * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl + * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl + * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl + * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl + * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl + * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl + * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.idl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.idl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.idl + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl + * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl + * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl + * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl + * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl + * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl + * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl + * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl + * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl + * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl + * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl + Use the new pragma ciao lem + +Thu Jan 21 12:32:27 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl: + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl: + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl: + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h: + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: + Running tests in the ORB reactor thread (instead of running in a + DDS callback thread). This is done because you're not allowed to + set query parameters in a DDS callback thread. + Therefore removed ConnectorStatusListener and implemented an + ACE_EventHandler. Also extended tests. + +Thu Jan 21 11:42:30 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl + * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl + * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl + * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl + * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl + * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl + * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl + * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl + * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.idl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl + * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl + * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl + * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl + * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl + Removed some old comments + +Thu Jan 21 08:45:30 UTC 2010 Johnny Willemsen + + * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: + Compile with cross compile + +Thu Jan 21 08:07:30 UTC 2010 Johnny Willemsen + + * tests/IDL_Test/Lem_Pragma: + * tests/IDL_Test/Lem_Pragma/A.idl: + * tests/IDL_Test/Lem_Pragma/B.idl: + * tests/IDL_Test/Lem_Pragma/C.idl: + * tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc: + New test for the new ciao lem pragma support. All tests and examples + in the archive will be updated to use this new feature + +Wed Jan 20 12:28:43 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: + Resolved compiler error on windows. + + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Throwing an exception when setting the query parameters. + + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h: + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: + Added some more tests. + +Tue Jan 19 13:59:58 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + Resolved compiler errors on Windows. + + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Throwing exception when get_expression_parameters does + not succeed. + + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: + Testing and catching proper exceptions. + +Tue Jan 19 10:57:12 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: + Implemented get_expression_parameters. + + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + Optimized logging. + + * connectors/dds4ccm/impl/ndds/Reader_T.h: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Implemented getter method for filter. + Introduced define in order to switch between ContentFilteredTopics + and QueryConditions. + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc: + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc: + Resolved compile errors on windows. + + * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl: + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl: + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl: + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc: + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h: + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp: + Extended tests. + +Mon Jan 18 10:14:39 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + Renamed set_topic methods on Reader. + + * connectors/dds4ccm/impl/ndds/Reader_T.h: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Implemented basics of filter method. + + * connectors/dds4ccm/impl/ndds/Subscriber.h: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + Now able to create a DDSDataReader with a + ContentFilteredTopic as input. + + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: + Resolved bug. + +Fri Jan 15 14:02:34 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReader.h: + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + Implemented get_listener methods. + Some renaming of variables. + + * connectors/dds4ccm/impl/ndds/Reader_T.h: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Rewritten filter method. Now using DDS proxies instead + of DDS itself. + + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + Renaming some inconsistent named variables. + + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: + Removed unnecessary logging. + +Fri Jan 15 09:11:56 UTC 2010 Johnny Willemsen + + * tools/IDL3_to_IDL2/checking_visitor.cpp + * tools/IDL3_to_IDL2/checking_visitor.h + * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp + * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h + * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp + * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h + * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp + * tools/IDL3_to_XMI/IR_Simulator_visitor.h + Updated for tao_idl changes + +Fri Jan 15 07:03:56 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc: + * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc: + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc: + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc: + * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: + Changed project names due to fuzz warnings. + +Thu Jan 14 19:13:52 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Changed variable name. + +Thu Jan 14 15:54:10 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Created a parameter list of variable size. + + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: + Extended test a bit more. + +Thu Jan 14 15:33:59 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + Reverted DDS logging change. + +Thu Jan 14 14:53:43 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/QueryFilter/*: + * bin/ciao_tests.lst: + Added test to test the QueryFilter on the DataReader. + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/Reader_T.h: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Create a ContentFilteredTopic on a domainparticipant. + +Thu Jan 14 11:18:01 UTC 2010 Johnny Willemsen + + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + Extended idl3+ test, added an example that doesn't compile yet, + commented that out on line 124 + +Thu Jan 14 11:19:04 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Resolved fuzz error. + +Thu Jan 14 10:33:01 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/docs/ccm_dds.idl: + Fixed problem in this IDL file + +Thu Jan 14 10:31:01 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp: + Deploying three connectors with different datatypes. + +Thu Jan 14 10:21:32 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/SharedDomainParticipant/Base: + * connectors/dds4ccm/tests/SharedDomainParticipant/Base/Base.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/Base/Base.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/Component: + * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component_exec.h: + * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component_exec.cpp: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector_exec.h: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector_exec.cpp: + * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors: + * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/run_test.pl: + Removed these files. Moved to SharedDomainParticipant/SameDatatype. + +Thu Jan 14 10:11:06 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/*: + Added files for this test (see previous entry for more details). + +Thu Jan 14 10:08:40 UTC 2010 Marcel Smit + + * bin/ciao_tests.lst: + Added SharedDomainParticipant for different datatypes. + + * connectors/dds4ccm/docs/TestCoverage.ods: + Changed to meet the latest status. + + * connectors/dds4ccm/idl/ccm_dds.idl: + code aligning. + + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h: + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/Reader_T.h: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + * connectors/dds4ccm/impl/ndds/Topic.h: + * connectors/dds4ccm/impl/ndds/Topic.cpp: + * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: + Started with implementation of the QueryFilter attribute. + + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + Optimized logging. + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/*: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/*: + Moved existing SharedDomainParticipant test to SameDatatype sub directory. + Added a new SharedDomainParticipant test with which deploys three connectors + with different datatypes. + +Thu Jan 14 09:10:40 UTC 2010 Marijke Hengstmengel + + * connectors/dds4ccm/docs/TestCoverage.ods + Add new tests. + +Wed Jan 13 13:11:36 UTC 2010 Abdul Sowayan + + * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc: + * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc: + * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc: + * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc: + * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc: + * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc: + * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc: + * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc: + * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc: + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc: + * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc: + * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc: + * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc: + * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc: + * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc: + * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc: + * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc: + * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc: + * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc: + * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc: + * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc: + * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc: + * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/Base/Base.mpc: + * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc: + * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc: + * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc: + * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc: + * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc: + * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc: + + Don't hard code the fact that we are using RTI's CORBA Compatability Kit (CCK) in the + MPC projects. ndds_ts_defaults.mpb now uses the CCK by default. + +Wed Jan 13 12:20:40 UTC 2010 Marijke Hengstmengel + + * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc + Removed some unused libs. + +Wed Jan 13 07:08:40 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1_exec.h: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1_exec.cpp: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2_exec.h: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2_exec.cpp: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3_exec.h: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3_exec.cpp: + Solved compiler errors by removing these files. + +Tue Jan 12 15:56:45 UTC 2010 Marcel Smit + + * bin/ciao_tests.lst: + SharedDomainParticipant test should work now. + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + Added logging when re-using a domainparticipant. + + * connectors/dds4ccm/tests/SharedDomainParticipant/Base/Base.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector_exec.h: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector_exec.cpp: + * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector1.idl: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector1.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector1_exec.h: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector1_exec.cpp: + Rewritten this test. Deploy one connector three times instead of + deploying three seperate connectors. + +Tue Jan 12 13:55:31 UTC 2010 Johnny Willemsen + + * connectors/ami4ccm/ami4ccm/ami4ccm.h + * connectors/ami4ccm/ami4ccm/ami4ccm.idl + * connectors/ami4ccm/examples/Hello/Base/Hello.idl + * connectors/ami4ccm/examples/Hello/Connector/AMI.mpc + * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.cpp + * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc + Use new ami4ccm_stub library + + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc + * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc + * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc + * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc + * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc + * DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage.mpc + Layout changes + +Tue Jan 12 13:31:31 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + Using a define for factory instance method. + + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2.mpc: + * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3.mpc: + Resolved compiler errors on windows. + +Tue Jan 12 11:08:30 UTC 2010 Johnny Willemsen + + * connectors/ami4ccm/ami4ccm/ami4ccm.cpp: + * connectors/ami4ccm/ami4ccm/ami4ccm.h: + * connectors/ami4ccm/ami4ccm/ami4ccm.idl: + * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: + New AMI4CCM stub library which is going to be used by + all connectors and components that want to use ami4ccm + + * MPC/config/ami4ccm_stub.mpb: + New base project + + * tests/Bug_3769_Regression/Foo.mpc + * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc + * tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc + * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc + * tests/IDL_Test/Inherited_Component/IhC_Foo.mpc + * tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc + * tests/IDL_Test/PIDL_Include/PIDLInclude.mpc + * tests/Minimum/Receiver/Receiver.mpc + Layout changes + +Tue Jan 12 10:07:17 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + Made the domainparticipantfactory a singleton. + + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + Outlining code. + + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + Resolved fuzz error. + + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.idl: + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h: + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/SharedDomainParticipant/*: + Added test to test whether the same domainparticipant is used + when two connectors in the same process sharing the same qos_profile. + +Tue Jan 12 08:43:30 UTC 2010 Johnny Willemsen + + * docs/index.html: + Fixed some broken links and removed some old ones. Thanks to + Sreejith for reporting this + + * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc: + * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: + Layout changes + +Mon Jan 11 13:56:30 UTC 2010 Marijke Hengstmengel + + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc + Change in case. + +Mon Jan 11 08:48:30 UTC 2010 Marijke Hengstmengel + + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h + Remove some tabs. + + +Mon Jan 11 08:48:30 UTC 2010 Marijke Hengstmengel + + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h + Remove some tabs and change order in mpc files. + +Thu Jan 7 16:48:30 UTC 2010 Marijke Hengstmengel + + * bin/ciao_tests.lst + * connectors/dds4ccm/tests/VariousTopicsEvent + * connectors/dds4ccm/tests/VariousTopicsEvent/Base + * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors + * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp + * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl + * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver + * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h + * connectors/dds4ccm/tests/VariousTopicsEvent/Sender + * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl + * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc + * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h + * connectors/dds4ccm/tests/VariousTopicsState + * connectors/dds4ccm/tests/VariousTopicsState/Base + * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl + * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Connector + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/descriptors + * connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp + * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl + * connectors/dds4ccm/tests/VariousTopicsState/Receiver + * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl + * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h + * connectors/dds4ccm/tests/VariousTopicsState/Sender + * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl + * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc + * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h + New tests for various topics with DDS_Event and DDS_State connectors. + + + +Thu Jan 7 15:52:30 UTC 2010 Marcel Smit + + * bin/ciao_tests.lst: + Added DDS DataWriter test to the test framework. + +Thu Jan 7 15:50:15 UTC 2010 Marcel Smit + + * connectors/dds4ccm/tests/DDSWriterEntity/*: + Added test which shows how to use the DDSDataWriter + directly. + +Thu Jan 7 13:26:27 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + Provided every read/write operation on the dp map with a mutex. + +Thu Jan 7 11:41:40 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + Resolved runtime issue. + +Thu Jan 7 09:43:56 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: + Call passivate and remove on the base class after passivating + and removing his own stuff. + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + Setting listeners to nil. Also extended logging when deleting + subscriber. + + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + Call passivate and remove on the base class after passivating + and removing his own stuff. + Also setting listeners to nil when passivating. + + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: + Don't use remove_ref. Setting to nil should be enough. + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + There should only one domainparticipant for the same + QOS profile. Build in check to prevent the creation of + another domainparticipant for the same QOS profile. + + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/Getter_T.h: + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + Added a passivate method. This cleans up + DDS read conditions and wait conditions. + + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + Extended log info with CLINFO. + + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + Using %C instead of %c. Also extended logging info. + +Wed Jan 6 12:51:52 UTC 2010 Johnny Willemsen + + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: + Improved debug output + +Wed Jan 6 12:27:52 UTC 2010 Johnny Willemsen + + * ciao/Logger/Logger_Service.cpp: + Changed the commandline flags, to: + -CIAOLogLevel + -CIAOTraceEnable + -CIAOLogFile + + * DAnCE/Logger/Logger_Service.cpp + Changed the commandline flags, to: + -DAnCELogLevel + -DAnCETraceEnable + -DAnCELogFile + +Wed Jan 6 10:39:52 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + Separate DDS lifecycle from CCM lifecycle. Implemented the + various DANCE start/shutdown steps. + + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + Implemented set_listener method. + + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + Do not use listener when nil. + + * connectors/dds4ccm/impl/ndds/Topic.cpp: + Added traces. get_listener should throw a + no implement exception. + +Wed Jan 6 09:39:37 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h: + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + Separate DDS lifecycle from CCM lifecycle. DomainParticipant + now have a configuration_complete, an activate, a passivate + and a remove method. + + * connectors/dds4ccm/impl/ndds/Topic.cpp: + Implemented set_listener method. + +Tue Jan 5 19:25:18 UTC 2010 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc + * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc + * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc + * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc + * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc + * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc + * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc + * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc + * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc + * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc + * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc + * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc + * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc + * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc + Layout changes + +Tue Jan 5 14:01:18 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Update_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Write_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: + Improved shutdown of the DDS connector. + + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + Prevent a pointer creation when the passed listener + is nil. + +Tue Jan 5 09:37:56 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Update_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Write_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: + Separate DDS lifecycle from CCM lifecycle. DDS_Update_T and DDS_Write_T + now have a configuration_complete, activate, passivate and remove + methods. + +Tue Jan 5 08:51:51 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + Optimized error logging. + + * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: + Separate DDS lifecycle from CCM lifecycle. DDS_Read_T and DDS_StateListen_T + now have a configuration_complete, activate, passivate and remove + methods. + +Tue Jan 5 07:31:33 UTC 2010 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + Separate DDS lifecycle from CCM lifecycle. DDS_Get_T and DDS_Listen_T + now have a configuration_complete, activate, passivate and remove + methods. + +Mon Jan 4 20:41:07 UTC 2010 Jeff Parsons + + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + + Cosmetic changes. + +Mon Jan 4 19:43:39 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/docs/AMI4CCM-explanation.odt: + First start on updating this document to the latest ideas + +Mon Jan 4 18:45:39 UTC 2009 Johnny Willemsen + + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + Enabled some commented out idl3+ which now is accepted by the idl + compiler + +Mon Jan 4 13:29:39 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Connector/AMI.idl + * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp + * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.h + * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp + * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl + * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl + Updated name of the AMI connector, it is tied to the sender, + so call it AMI_Sender + + * tests/IDL_Test/Double_Inherited_Component/run_test.pl: + Print message before spawn + +Mon Jan 4 12:14:39 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/docs/AMI4CCM-spec.odt: + Updated with the latest ideas + +Mon Jan 4 11:11:39 UTC 2009 Johnny Willemsen + + * docs/OMG-CCM-Tutorial.ppt: + Updated AMI4CCM story + +Mon Jan 4 10:04:39 UTC 2009 Johnny Willemsen + + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + Added missing semi colon + +Thu Dec 31 12:48:39 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl + * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl + * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl + * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl + * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl + * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl + * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl + * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl + * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl + * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl + * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl + * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl + * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl + * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl + * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl + * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl + * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl + * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl + * examples/BasicSP/descriptors/run_test.pl + * examples/Hello/descriptors/run_test.pl + * examples/Hello/descriptors/run_test_alias.pl + * tests/Bug_3769_Regression/descriptors/run_test.pl + * tests/IDL_Test/Double_Inherited_Component/run_test.pl + Check spawn of naming service + +Thu Dec 31 12:40:39 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl + * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl + * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl + * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl + * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl + * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl + * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl + * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl + * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl + * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl + * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl + * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl + * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl + * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl + * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl + * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl + Check return value of the plan and execution manager + + * DAnCE/Deployment/Module_Main.h: + Always destroy the orb + + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: + Layout changes + + * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: + Rethrow the exception so that we don't fail silently + +Wed Dec 30 12:58:39 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl + * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl + * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl + * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl + * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl + * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl + * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl + * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl + * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl + * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl + * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl + * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl + * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl + * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl + * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl + * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl + * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl + Give the plan launcher some more time, on a vm it seems to take longer + +Wed Dec 30 12:50:39 UTC 2009 Johnny Willemsen + + * ciao/ComponentServer/CIAO_ComponentServer.cpp + * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp + * ciao/ComponentServer/CIAO_ComponentServer_Task.h + * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp + * ciao/ComponentServer/CIAO_RTComponentServer_Task.h + * ciao/Logger/CIAOLoggerFactory.h + * ciao/Logger/File_Logger_Backend.cpp + * ciao/Logger/File_Logger_Backend.h + * ciao/Logger/Logger.mpc + * ciao/Logger/Logger_Service.cpp + * ciao/Logger/Logger_Service.h + * DAnCE/Deployment/Module_Main.h + * DAnCE/Logger/DAnCELoggerFactory.h + * DAnCE/Logger/File_Logger_Backend.cpp + * DAnCE/Logger/File_Logger_Backend.h + * DAnCE/Logger/Logger.mpc + * DAnCE/Logger/Logger_Service.cpp + * DAnCE/Logger/Logger_Service.h + * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp + * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp + * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp + Simplified logging infrastructure code + +Wed Dec 30 11:56:39 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: + Layout changes + +Wed Dec 30 10:31:39 UTC 2009 Johnny Willemsen + + * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: + Removed commented out code + + * AnCE/NodeApplication/NodeApplication.mpc: + Removed commented out lines + + * DAnCE/NodeApplication/ServerActivator_Impl.cpp: + * DAnCE/NodeApplication/ServerActivator_Impl.h: + Removed, not used + + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: + Removed commented out code + + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: + Const changes + + * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: + * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp: + Removed commented out code + +Wed Dec 30 08:14:39 UTC 2009 Johnny Willemsen + + * DAnCE/Deployment/Module_Main.h: + Check if we get an object back and add more exception handling + +Tue Dec 29 11:22:39 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp: + * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.cpp: + Layout changes + +Tue Dec 29 10:16:39 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl + * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl + * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl + * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl + * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl + * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl + * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl + * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl + * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl + * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl + * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl + * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl + * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl + * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl + * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl + * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl + * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl + * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl + * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl + Don't override trace/debug levels + +Tue Dec 29 09:57:39 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Connector/AMI.idl + * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp + * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.h + * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl + * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp + * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp + Use sendc_ as prefix for the implicit ports and updated some more + parts to get a more consistent naming + +Mon Dec 28 17:31:39 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/docs/AMI4CCM-explanation.odt: + * connectors/ami4ccm/docs/AMI4CCM-spec.odt: + Started to update these documents with the current proto + +Mon Dec 28 12:43:39 UTC 2009 Johnny Willemsen + + * ciao/Logger/Logger_Service.cpp: + Use ACE to parse commandline arguments + + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: + Each second call to an attribute results in an exception + + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: + Added missing try/catch for the attributes + + * DAnCE/Config_Handlers/RDD_Handler.cpp: + Unicode fixes + + * DAnCE/Config_Handlers/Utils/Functors.h: + C++ Builder 2010 fix + + * DAnCE/Logger/Logger_Service.cpp: + Use -a for enabling tracing, -t is already used + + * DAnCE/NodeManager/Node_Manager_Module.cpp: + * DAnCE/NodeManager/Node_Manager_Module.h: + Removed ignore_failure, not used + + * DAnCE/RedirectionService/CCMObjectLocator.h: + Doxygen changes + + * DAnCE/RedirectionService/RedirectionService.mpc: + Layout change + +Wed Dec 23 20:14:39 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Base/Hello.idl + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp + Extended this example with more exceptions + +Wed Dec 23 15:20:54 UTC 2009 Marcel Smit + + * DAnCE/Logger/Logger_Service.cpp: + Using %s instead of %C + +Wed Dec 23 15:08:16 UTC 2009 Marcel Smit + + * DAnCE/Logger/Logger_Service.cpp: + Using ace functionality to parse commandline parameters. + + * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: + Removed CIAO/DANCE_LOG_LEVEL parameters. + +Wed Dec 23 14:38:39 UTC 2009 Johnny Willemsen + + * ciao/Logger/Logger_Service.cpp: + Fixed CIAO_TRACE_ENABLE functionality + + * DAnCE/Logger/Logger_Service.cpp: + Fixed DANCE_TRACE_ENABLE functionality + +Wed Dec 23 14:08:39 UTC 2009 Johnny Willemsen + + * ciao/Containers/Servant_Activator.cpp: + Fixed fuzz errors + +Wed Dec 23 14:05:39 UTC 2009 Johnny Willemsen + + * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp: + * ciao/ComponentServer/Client_init.cpp: + Fixed fuzz errors + +Wed Dec 23 12:39:39 UTC 2009 Johnny Willemsen + + * CIAO_TAO_DAnCE.mwc: + Config handlers got moved + + * CIAO_DAnCE.mwc: + Config handlers got moved, don't generate DAnCE/tests + +Wed Dec 23 12:32:39 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + UnkeyedWriter test should be ok now. + +Wed Dec 23 12:23:03 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl: + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: + Reworked this test. DDS does not return an error when max_samples is + reached. Now a large block of data is send. + + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: + Removed this file. + +Wed Dec 23 10:44:14 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp + Set 'OK' in debug message when catching the expected InternalError + +Wed Dec 23 09:17:14 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Resolved fuzz errors regarding trace. + +Wed Dec 23 09:04:04 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: + Using %C instead of %s for char*. Also added ERROR for error logging. + +Wed Dec 23 08:44:50 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: + Removed some commented out logging. + +Wed Dec 23 08:40:22 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: + Using ACE_ERROR and ACE_DEBUG instead of printf. + +Wed Dec 23 08:27:11 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: + * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: + Using ACE_ERROR and ACE_DEBUG instead of printf. + +Wed Dec 23 08:06:34 UTC 2009 Marcel Smit + + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: + Reverted last changes. + +Wed Dec 23 08:02:27 UTC 2009 Marcel Smit + + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: + Using ACE_ERROR and ACE_DEBUG instead of printf. + +Tue Dec 22 17:14:22 UTC 2009 Jeff Parsons + + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + + Uncommented template module construct that was producing a bug, and + added an instantiation of that template module. + +Tue Dec 22 15:41:04 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Base/Hello.idl + * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.cpp + * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h + Introduced CCM_AMI::ExceptionHolder which is just a local interface + where the executor will contain the AMI exception holder, but + this is hidden for the component developer. The example will now + fail because there is a problem in TAO related to attributes + and AMI, see bugzilla 3801 + +Tue Dec 22 14:34:04 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Connector/AMI.mpc + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc + Added missing afters + + * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl + No need to derive from ReplyHandler + +Tue Dec 22 14:36:11 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + Resolved runtime error. + +Tue Dec 22 14:21:32 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h: + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp: + Renamed setter data_writer to set_impl (to be consistent). + +Tue Dec 22 13:34:45 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + * connectors/dds4ccm/impl/ndds/QueryCondition.h: + * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: + Implemented setter and getter for DDSQueryCondition. + +Tue Dec 22 13:01:04 UTC 2009 Johnny Willemsen + + * DAnCE/Starter + * DAnCE/Starter/Starter.cpp + * DAnCE/Starter/Starter.h + * DAnCE/Starter/Starter.mpc + * DAnCE/StaticConfigurator + * DAnCE/StaticConfigurator/README + * DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl + * DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl + * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp + * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc + Removed, really old stuff and not maintained + +Tue Dec 22 13:02:31 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: + * connectors/dds4ccm/impl/ndds/Getter_T.h: + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + * connectors/dds4ccm/impl/ndds/Reader_T.h: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + To be consistent, renamed data_reader () methods to set_impl. + +Tue Dec 22 12:47:04 UTC 2009 Johnny Willemsen + + * DAnCE/Config_Handlers/Config_Handlers.mpc + * DAnCE/Config_Handlers/DynAny_Handler.mpc + * DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc + * DAnCE/Config_Handlers/test.cdp + * DAnCE/Config_Handlers/test.cpp + * DAnCE/Config_Handlers/Utils/Functors.h + * DAnCE/Config_Handlers/XML_File_Intf.h + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp + * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp + * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp + * DAnCE/tests/Config_Handlers/Config_Handlers.mpc + * DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp + * DAnCE/tests/Config_Handlers/test.cdp + * DAnCE/tests/Config_Handlers/test.cpp + * DAnCE/tests/DeploymentPlanDump/test.cpp + * DAnCE/tests/DeploymentPlanTestReferences/test.cpp + * DAnCE/tests/DeploymentTest1/test.cpp + Moved more tests to DAnCE/tests and make sure DANCE_ROOT/docs/schema + is also used + +Tue Dec 22 09:39:04 UTC 2009 Johnny Willemsen + + * DAnCE/Config_Handlers/DynAny_Handler/dynany_test.idl + * DAnCE/Config_Handlers/DynAny_Handler/test.cpp + * DAnCE/Config_Handlers/DynAny_Handler/test.mpc + * DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc + * DAnCE/Config_Handlers/Package_Handlers/test.cpp + * DAnCE/tests/Config_Handlers + * DAnCE/tests/Config_Handlers/DynAny_Handler + * DAnCE/tests/Config_Handlers/DynAny_Handler/dynany_test.idl + * DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp + * DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc + * DAnCE/tests/Config_Handlers/Package_Handlers + * DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc + * DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp + Moved tests to the test directory + + * tools/tools.mwc: + Removed, not needed + +Tue Dec 22 09:32:04 UTC 2009 Johnny Willemsen + + * ciao/Logger/File_Logger_Backend.h + * DAnCE/Config_Handlers + * DAnCE/Config_Handlers/ADD_Handler.cpp + * DAnCE/Config_Handlers/Any_Handler.cpp + * DAnCE/Config_Handlers/CCD_Handler.cpp + * DAnCE/Config_Handlers/CEPE_Handler.cpp + * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp + * DAnCE/Config_Handlers/Config_Handlers.mpc + * DAnCE/Config_Handlers/CPD_Handler.cpp + * DAnCE/Config_Handlers/CRDD_Handler.cpp + * DAnCE/Config_Handlers/DataType_Handler.cpp + * DAnCE/Config_Handlers/DD_Handler.cpp + * DAnCE/Config_Handlers/DP_Handler.cpp + * DAnCE/Config_Handlers/DP_PCD_Handler.cpp + * DAnCE/Config_Handlers/ERE_Handler.cpp + * DAnCE/Config_Handlers/ESD_Handler.cpp + * DAnCE/Config_Handlers/ID_Handler.cpp + * DAnCE/Config_Handlers/IDD_Handler.cpp + * DAnCE/Config_Handlers/IDREF_Base.cpp + * DAnCE/Config_Handlers/IRDD_Handler.cpp + * DAnCE/Config_Handlers/IRDD_Handler.h + * DAnCE/Config_Handlers/MDD_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/PC_Intf.cpp + * DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp + * DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp + * DAnCE/Config_Handlers/PCD_Handler.cpp + * DAnCE/Config_Handlers/PL_Handler.cpp + * DAnCE/Config_Handlers/Property_Handler.cpp + * DAnCE/Config_Handlers/PSPE_Handler.cpp + * DAnCE/Config_Handlers/RDD_Handler.cpp + * DAnCE/Config_Handlers/Req_Handler.cpp + * DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp + * DAnCE/Config_Handlers/STD_PC_Intf.cpp + * DAnCE/Config_Handlers/XML_File_Intf.cpp + * DAnCE/docs/schema + * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp + * DAnCE/MPC/config/ciao_config_handlers.mpb + * DAnCE/MPC/config/ciao_config_handlers_base.mpb + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp + * DAnCE/TargetManager/CmpClient.cpp + * DAnCE/TargetManager/DomainDataManager.cpp + * DAnCE/TargetManager/TargetManager_exec.cpp + * DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp + * DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp + * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp + * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc + * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp + * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp + * DAnCE/tests/DeploymentPlanDump/test.cpp + * DAnCE/tests/DeploymentPlanTestReferences/test.cpp + * DAnCE/tests/DeploymentTest1/test.cpp + * docs/schema + * docs/schema/06-04-02.xsd + * docs/schema/Basic_Deployment_Data.xsd + * docs/schema/ccd.xsd + * docs/schema/cdd.xsd + * docs/schema/cdp.xsd + * docs/schema/CIAOEvents.xsd + * docs/schema/ciaopolicy.xsd + * docs/schema/CIAOServerResources.xsd + * docs/schema/cid.xsd + * docs/schema/cpd.xsd + * docs/schema/Deployment.xsd + * docs/schema/iad.xsd + * docs/schema/Modified_Deployment.xsd + * docs/schema/pcd.xsd + * docs/schema/README.html + * docs/schema/SANet_Network.xsd + * docs/schema/ServerResourceUsage.txt + * docs/schema/Spec_Defined_Deployment.xsd + * docs/schema/Spec_Defined_XMI.xsd + * docs/schema/Task_Map.xsd + * docs/schema/toplevel.xsd + * docs/schema/unused_06-04-02.xsd + * docs/schema/unused_elements.xsd + * docs/schema/XMI.xsd + * docs/schema/xsc-banner.cpp + * docs/schema/xsc-banner.h + * MPC/config/ciao_config_handlers.mpb + * MPC/config/ciao_config_handlers_base.mpb + * tools/Config_Handlers + * tools/Config_Handlers/ADD_Handler.cpp + * tools/Config_Handlers/ADD_Handler.h + * tools/Config_Handlers/Any_Handler.cpp + * tools/Config_Handlers/Any_Handler.h + * tools/Config_Handlers/Basic_Deployment_Data.cpp + * tools/Config_Handlers/Basic_Deployment_Data.hpp + * tools/Config_Handlers/ccd.cpp + * tools/Config_Handlers/ccd.hpp + * tools/Config_Handlers/CCD_Handler.cpp + * tools/Config_Handlers/CCD_Handler.h + * tools/Config_Handlers/cdd.cpp + * tools/Config_Handlers/cdd.hpp + * tools/Config_Handlers/cdp.cpp + * tools/Config_Handlers/cdp.hpp + * tools/Config_Handlers/CEPE_Handler.cpp + * tools/Config_Handlers/CEPE_Handler.h + * tools/Config_Handlers/cid.cpp + * tools/Config_Handlers/cid.hpp + * tools/Config_Handlers/Common.h + * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp + * tools/Config_Handlers/ComponentPropertyDescription_Handler.h + * tools/Config_Handlers/Config_Handlers.mpc + * tools/Config_Handlers/Config_Handlers_Common_Export.h + * tools/Config_Handlers/Config_Handlers_Export.h + * tools/Config_Handlers/cpd.cpp + * tools/Config_Handlers/cpd.hpp + * tools/Config_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/CPD_Handler.h + * tools/Config_Handlers/CRDD_Handler.cpp + * tools/Config_Handlers/CRDD_Handler.h + * tools/Config_Handlers/DataType_Handler.cpp + * tools/Config_Handlers/DataType_Handler.h + * tools/Config_Handlers/DD_Handler.cpp + * tools/Config_Handlers/DD_Handler.h + * tools/Config_Handlers/Deployment.cpp + * tools/Config_Handlers/Deployment.hpp + * tools/Config_Handlers/DnC_Dump.cpp + * tools/Config_Handlers/DnC_Dump.h + * tools/Config_Handlers/DnC_Dump_T.cpp + * tools/Config_Handlers/DnC_Dump_T.h + * tools/Config_Handlers/DP_Handler.cpp + * tools/Config_Handlers/DP_Handler.h + * tools/Config_Handlers/DP_PCD_Handler.cpp + * tools/Config_Handlers/DP_PCD_Handler.h + * tools/Config_Handlers/Dump_Obj.cpp + * tools/Config_Handlers/Dump_Obj.h + * tools/Config_Handlers/DynAny_Handler + * tools/Config_Handlers/DynAny_Handler.mpc + * tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DataType_Handler.h + * tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.h + * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h + * tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h + * tools/Config_Handlers/DynAny_Handler/dynany_test.idl + * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h + * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.h + * tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp + * tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.h + * tools/Config_Handlers/DynAny_Handler/test.cpp + * tools/Config_Handlers/DynAny_Handler/test.mpc + * tools/Config_Handlers/ERE_Handler.cpp + * tools/Config_Handlers/ERE_Handler.h + * tools/Config_Handlers/ESD_Handler.cpp + * tools/Config_Handlers/ESD_Handler.h + * tools/Config_Handlers/iad.cpp + * tools/Config_Handlers/iad.hpp + * tools/Config_Handlers/ID_Handler.cpp + * tools/Config_Handlers/ID_Handler.h + * tools/Config_Handlers/IDD_Handler.cpp + * tools/Config_Handlers/IDD_Handler.h + * tools/Config_Handlers/IDREF_Base.cpp + * tools/Config_Handlers/IDREF_Base.h + * tools/Config_Handlers/IRDD_Handler.cpp + * tools/Config_Handlers/IRDD_Handler.h + * tools/Config_Handlers/MDD_Handler.cpp + * tools/Config_Handlers/MDD_Handler.h + * tools/Config_Handlers/Package_Handlers + * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CAD_Handler.h + * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CID_Handler.h + * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp + * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h + * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/CPD_Handler.h + * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/IAD_Handler.h + * tools/Config_Handlers/Package_Handlers/NIA_Handler.h + * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc + * tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h + * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp + * tools/Config_Handlers/Package_Handlers/PC_Intf.h + * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp + * tools/Config_Handlers/Package_Handlers/PCD_Handler.h + * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp + * tools/Config_Handlers/Package_Handlers/SID_Handler.h + * tools/Config_Handlers/Package_Handlers/test.cpp + * tools/Config_Handlers/pcd.cpp + * tools/Config_Handlers/pcd.hpp + * tools/Config_Handlers/PCD_Handler.cpp + * tools/Config_Handlers/PCD_Handler.h + * tools/Config_Handlers/PL_Handler.cpp + * tools/Config_Handlers/PL_Handler.h + * tools/Config_Handlers/Property_Handler.cpp + * tools/Config_Handlers/Property_Handler.h + * tools/Config_Handlers/PSPE_Handler.cpp + * tools/Config_Handlers/PSPE_Handler.h + * tools/Config_Handlers/RDD_Handler.cpp + * tools/Config_Handlers/RDD_Handler.h + * tools/Config_Handlers/Req_Handler.cpp + * tools/Config_Handlers/Req_Handler.h + * tools/Config_Handlers/SatisfierProperty_Handler.cpp + * tools/Config_Handlers/SatisfierProperty_Handler.h + * tools/Config_Handlers/STD_CID_Handler.cpp + * tools/Config_Handlers/STD_CID_Handler.h + * tools/Config_Handlers/STD_CPD_Handler.cpp + * tools/Config_Handlers/STD_CPD_Handler.h + * tools/Config_Handlers/STD_IAD_Handler.cpp + * tools/Config_Handlers/STD_IAD_Handler.h + * tools/Config_Handlers/STD_PC_Intf.cpp + * tools/Config_Handlers/STD_PC_Intf.h + * tools/Config_Handlers/STD_PCD_Handler.cpp + * tools/Config_Handlers/STD_PCD_Handler.h + * tools/Config_Handlers/test.cdp + * tools/Config_Handlers/test.cpp + * tools/Config_Handlers/toplevel.cpp + * tools/Config_Handlers/toplevel.hpp + * tools/Config_Handlers/Utils + * tools/Config_Handlers/Utils/Exceptions.h + * tools/Config_Handlers/Utils/Functors.h + * tools/Config_Handlers/XMI.cpp + * tools/Config_Handlers/XMI.hpp + * tools/Config_Handlers/XML_File_Intf.cpp + * tools/Config_Handlers/XML_File_Intf.h + * tools/Config_Handlers/XML_Typedefs.cpp + * tools/Config_Handlers/XML_Typedefs.h + * tools/Config_Handlers/XMLSchema + * tools/Config_Handlers/XMLSchema/id_map.hpp + * tools/Config_Handlers/XMLSchema/Traversal.hpp + * tools/Config_Handlers/XMLSchema/Traversal.ipp + * tools/Config_Handlers/XMLSchema/Traversal.tpp + * tools/Config_Handlers/XMLSchema/TypeInfo.hpp + * tools/Config_Handlers/XMLSchema/TypeInfo.ipp + * tools/Config_Handlers/XMLSchema/TypeInfo.tpp + * tools/Config_Handlers/XMLSchema/Types.hpp + * tools/Config_Handlers/XMLSchema/Types.ipp + * tools/Config_Handlers/XMLSchema/Types.tpp + * tools/Config_Handlers/XMLSchema/Writer.hpp + * tools/Config_Handlers/XMLSchema/Writer.ipp + * tools/Config_Handlers/XMLSchema/Writer.tpp + * tools/Config_Handlers/XSC_XML_Handlers_Export.h + * tools/Config_Handlers/XSCRT + * tools/Config_Handlers/XSCRT/Elements.hpp + * tools/Config_Handlers/XSCRT/Elements.ipp + * tools/Config_Handlers/XSCRT/Elements.tpp + * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp + * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp + * tools/Config_Handlers/XSCRT/Parser.hpp + * tools/Config_Handlers/XSCRT/Parser.ipp + * tools/Config_Handlers/XSCRT/Parser.tpp + * tools/Config_Handlers/XSCRT/Traversal.hpp + * tools/Config_Handlers/XSCRT/Traversal.ipp + * tools/Config_Handlers/XSCRT/Traversal.tpp + * tools/Config_Handlers/XSCRT/Writer.hpp + * tools/Config_Handlers/XSCRT/Writer.ipp + * tools/Config_Handlers/XSCRT/Writer.tpp + * tools/Config_Handlers/XSCRT/XML.hpp + * tools/Config_Handlers/XSCRT/XML.ipp + * tools/Config_Handlers/XSCRT/XML.tpp + * tools/Config_Handlers/XSCRT/XMLSchema.hpp + Moved Config_Handlers and schema to DAnCE + +Mon Dec 21 18:26:04 UTC 2009 Johnny Willemsen + + * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp + * ciao/ComponentServer/CIAO_ComponentServer.cpp + * ciao/ComponentServer/CIAO_ComponentServer.mpc + * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp + * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp + * ciao/ComponentServer/CIAO_Container_Impl.cpp + * ciao/ComponentServer/CIAO_RTComponentServer.cpp + * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp + * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp + * ciao/ComponentServer/Client_init.cpp + * ciao/Containers/CIAO_Servant_Activator.mpc + * ciao/Containers/Servant_Activator.cpp + * ciao/Containers/Session/Session_Container.cpp + * ciao/Logger/File_Logger_Backend.cpp + * ciao/Logger/File_Logger_Backend.h + * ciao/Logger/Log_Macros.cpp + * ciao/Logger/Log_Macros.h + * ciao/Logger/Logger.mpc + * ciao/Logger/Logger_Service.cpp + * ciao/Logger/Logger_Service.h + * ciao/Servants/Home_Servant_Impl_T.cpp + * ciao/Servants/Servant_Impl_Base.cpp + * ciao/Servants/Servant_Impl_T.cpp + * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp + * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp + * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp + * connectors/dds4ccm/impl/ndds/Getter_T.cpp + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp + * connectors/dds4ccm/impl/ndds/ndds_impl.mpc + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp + * connectors/dds4ccm/impl/ndds/Publisher.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp + * connectors/dds4ccm/impl/ndds/Reader_T.cpp + * connectors/dds4ccm/impl/ndds/Subscriber.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp + * connectors/dds4ccm/impl/ndds/Writer_T.cpp + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp + * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc + * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp + * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc + * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc + * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc + * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc + * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc + * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc + * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc + * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc + * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc + * DAnCE/Deployment/Module_Main.h + * DAnCE/DomainApplication/Domain_Application_Impl.cpp + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp + * DAnCE/DomainApplicationManager/Node_Locator.cpp + * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp + * DAnCE/ExecutionManager/ExecutionManager_Module.cpp + * DAnCE/Logger/File_Logger_Backend.cpp + * DAnCE/Logger/Log_Macros.cpp + * DAnCE/Logger/Log_Macros.h + * DAnCE/Logger/Logger.mpc + * DAnCE/Logger/Logger_Service.cpp + * DAnCE/Logger/Logger_Service.h + * DAnCE/MPC/config/dance_cdmw_idl.mpb + * DAnCE/MPC/config/dance_mocks.mpb + * DAnCE/MPC/config/dance_plan_generator.mpb + * DAnCE/MPC/config/dance_plan_launcher.mpb + * DAnCE/MPC/config/dance_plan_launcher_base.mpb + * DAnCE/MPC/config/dance_repositorymanager.mpb + * DAnCE/MPC/config/dance_targetmanager.mpb + * DAnCE/MPC/config/dance_utils.mpb + * DAnCE/NodeApplication/ComponentAttributesSetter.cpp + * DAnCE/NodeApplication/Name_Utilities.cpp + * DAnCE/NodeApplication/NodeApplication_Impl.cpp + * DAnCE/NodeApplication/ServerActivator_Impl.cpp + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp + * DAnCE/NodeManager/Node_Manager_Module.cpp + * DAnCE/NodeManager/NodeManager_Impl.cpp + * DAnCE/Plan_Generator/PCVisitor.cpp + * DAnCE/Plan_Generator/Plan_Generator.mpc + * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp + * DAnCE/Plan_Launcher/Plan_Launcher.cpp + * DAnCE/Plan_Launcher/Plan_Launcher.mpc + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp + * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp + * DAnCE/RedirectionService/CCMObjectLocator.cpp + * DAnCE/RedirectionService/NameServiceRedirection.cpp + * DAnCE/RedirectionService/RedirectionService.cpp + * DAnCE/RepositoryManager/PC_Updater.cpp + * DAnCE/RepositoryManager/repository_manager_admin.cpp + * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp + * DAnCE/RepositoryManager/Repository_Manager_Module.cpp + * DAnCE/RepositoryManager/RepositoryManager.cpp + * DAnCE/RepositoryManager/RepositoryManager.mpc + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp + * DAnCE/RepositoryManager/RM_Helper.cpp + * DAnCE/RepositoryManager/URL_Parser.cpp + * DAnCE/RepositoryManager/ZIP_Wrapper.cpp + * DAnCE/Starter/Starter.cpp + * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp + * DAnCE/TargetManager/CmpClient.cpp + * DAnCE/TargetManager/DomainDataManager.cpp + * DAnCE/TargetManager/Target_Manager_Module.cpp + * DAnCE/TargetManager/TargetManager.mpc + * DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp + * DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp + * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp + * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp + * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp + * DAnCE/tests/DeploymentPlanDump/test.cpp + * DAnCE/tests/DeploymentPlanTestReferences/test.cpp + * DAnCE/tests/DeploymentTest1/test.cpp + * DAnCE/tests/NameServiceTest/clt_main.cpp + * DAnCE/tests/NameServiceTest/srv_main.cpp + * DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp + * DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp + * DAnCE/tests/ObjectLocatorTest/clt_main.cpp + * DAnCE/tests/ObjectLocatorTest/srv_main.cpp + * DAnCE/tests/RedirectionServiceTest/clt_main.cpp + * DAnCE/tests/RedirectionServiceTest/srv_main.cpp + * DAnCE/Utils/DAnCE_Utils.mpc + * DAnCE/Utils/Plan_Handler.cpp + * MPC/config/ciao_cs_client.mpb + * MPC/config/ciao_servant_activator.mpb + * MPC/config/dds4ccm_impl.mpb + * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp + * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp + * performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp + * tools/Config_Handlers/XML_File_Intf.cpp + CIAO_DEBUG/CIAO_ERROR/DANCE_DEBUG/DANCE_ERROR now have a level + as first argument. This controls at which level (and higher) the + message is printed. DDS4CCM will get its own level very soon. + All example/test code should use ACE_ERROR/ACE_DEBUG, these + are always printed. + Also cleaned up several base projects and various global search + and replace on layout, typos, and more + +Mon Dec 21 14:56:04 UTC 2009 Johnny Willemsen + + * tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.cpp + * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.cpp + * tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.cpp + Use ACE_ERROR/ACE_DEBUG + +Mon Dec 21 12:52:38 UTC 2009 Marcel Smit + + * connectors/dds4ccm/docs/TestCoverage.ods: + Updated. + +Mon Dec 21 12:20:04 UTC 2009 Johnny Willemsen + + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + Added some more test idl + +Mon Dec 21 11:02:04 UTC 2009 Johnny Willemsen + + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + Removed empty templated module, that is illegal + +Mon Dec 21 10:59:04 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.h: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/Topic.cpp: + * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: + Using set_impl and get_impl on DomainParticipant. + +Mon Dec 21 10:25:22 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + * connectors/dds4ccm/impl/ndds/DataWriter.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/StatusCondition.h: + * connectors/dds4ccm/impl/ndds/StatusCondition.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/Topic.cpp: + Using set_impl and get_impl on StatusCondition. + +Fri Dec 18 20:11:00 UTC 2009 Johnny Willemsen + + * testsIDL_Test/IDL3_Plus/KitchenSink.idl: + Extended test idl + +Fri Dec 18 18:58:00 UTC 2009 Johnny Willemsen + + Merge changes from Jeff Parsons related to templated modules + + Thu Dec 17 21:37:10 UTC 2009 Jeff Parsons + + * tests/IDL_Test/Cornucopia/README: + + Updated this file with info about the non-template + IDL3+ constructs added to the test IDL. + + * tests/IDL_Test/IDL3_Plus/README: + + New file, containing info about the new test in this + directory. + + Thu Dec 17 21:15:05 UTC 2009 Jeff Parsons + + * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: + * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp: + * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: + * tools/IDL3_to_XMI/IR_Simulator_visitor.h: + + Changes needed to this back end required by front end + changes made to support IDL3+ grammar changes. + + Thu Dec 17 19:52:18 UTC 2009 Jeff Parsons + + * tools/IDL3_to_IDL2/basic_visitor.cpp: + * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: + + Changes needed to this back end required by front end + changes made to support IDL template parameters as + base interfaces/valuetypes, supported interfaces, and + primary keys. + + Thu Dec 17 19:37:41 UTC 2009 Jeff Parsons + + * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: + * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: + + New test in new directory (IDL3_Plus) to test IDL3+ + constructs, specifically template-related ones. + TAO_IDL supports IDL3+ only in the front + end currently, this test will be more meaningful as + back end support is added. + + Mon Nov 23 20:39:24 UTC 2009 Jeff Parsons + + * tools/IDL3_to_IDL2/checking_visitor.h: + * tools/IDL3_to_IDL2/basic_visitor.cpp: + * tools/IDL3_to_IDL2/basic_visitor.h: + * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: + * tools/IDL3_to_IDL2/checking_visitor.cpp: + * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: + + Updated visit_* methods. New visit_* methods corresponding + to the revised IDL3+ grammar types, have not yet been + implemented. + +Fri Dec 18 15:28:49 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/ReadCondition.h: + * connectors/dds4ccm/impl/ndds/ReadCondition.cpp: + * connectors/dds4ccm/impl/ndds/TopicDescription.h: + * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: + Two other classes converted. Implemented getter and + setter for variable impl_. + +Fri Dec 18 14:49:31 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp + Solve bug in test on_deletion + +Fri Dec 18 14:17:47 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + Resolved compiler errors on linux. + +Fri Dec 18 10:48:14 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: + Continued working on separating dds lifecycle from + ccm lifecycle. The DDS entities are now created at + connection time. + + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + Logging time difference of get_one. + + * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp: + Some debug statements were logged as error messages. + +Fri Dec 18 08:36:31 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp + Change cdp for test. + +Fri Dec 18 08:32:09 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Update_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Write_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: + Added a datareader/writer in order to separate the + dds lifecycle from the ccm lifecycle. + + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + * connectors/dds4ccm/impl/ndds/DataWriter.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/SampleInfo.h: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/Topic.cpp: + Don't call impl () recursive. Use impl_ to check + for nil. + + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: + Turned off CIAO en DAnCE trace. + +Thu Dec 17 20:43:31 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp + Change cdp for test. + +Thu Dec 17 18:42:31 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp + Add profile to connectorFour. + +Thu Dec 17 13:08:14 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + Reworked Topic in order to separate the DDS lifecycle + from the ccm lifecycle. + + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + Removed unnecessary comments. + +Thu Dec 17 12:56:31 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml + Forgotten profile Hello example. + +Thu Dec 17 12:35:32 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReader.h: + * connectors/dds4ccm/impl/ndds/DataWriter.h: + * connectors/dds4ccm/impl/ndds/Publisher.h: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.h: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/Topic.h: + Made impl (void) private. Resolved runtime errors. + +Thu Dec 17 12:29:31 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp + add '\n' in debug and error messages + +Thu Dec 17 12:21:31 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp + * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp + * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp + * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp + * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h + Change DURABILITY from VOLATILE to TRANSIENT through QoS file. + Add ConectorStatusListener to check on PUBLICATION_MATCHED status. + +Thu Dec 17 09:13:11 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Base + * connectors/ami4ccm/examples/Hello/Base/Hello.mpc + * connectors/ami4ccm/examples/Hello/Base/Hello_Base.idl + * connectors/ami4ccm/examples/Hello/Base/Hello_Base.mpc + * connectors/ami4ccm/examples/Hello/Connector/AMI.idl + * connectors/ami4ccm/examples/Hello/Connector/AMI.mpc + * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.h + * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl + * connectors/ami4ccm/examples/Hello/Hello_Base + * connectors/ami4ccm/examples/Hello/Hello_Base/Hello.idl + * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl + * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.mpc + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h + Moved all connector idl into the connector directory + +Thu Dec 17 08:11:11 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Resolved compiler issues. + +Wed Dec 16 20:05:42 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataWriter.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/Topic.h: + * connectors/dds4ccm/impl/ndds/Topic.cpp: + * connectors/dds4ccm/impl/ndds/TopicListener.cpp: + Reworked Topic in order to separate the DDS lifecycle + from the ccm lifecycle. + +Wed Dec 16 19:42:36 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReader.h: + * connectors/dds4ccm/impl/ndds/DataReader.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: + * connectors/dds4ccm/impl/ndds/ReadCondition.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: + Reworked this in order to separate the dds lifecycle from + the ccm lifecycle. The DDS entity is not passed in the + constructor but can be passed using the set_impl method. + Reworked the DataReader. + +Wed Dec 16 19:16:59 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataWriter.h: + * connectors/dds4ccm/impl/ndds/DataWriter.cpp: + * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.h: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.h: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: + Reworked this in order to separate the dds lifecycle from + the ccm lifecycle. The DDS entity is not passed in the + constructor but can be passed using the set_impl method. + +Wed Dec 16 12:26:24 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: + Only invoke the listeners when there are valid samples. + + * connectors/dds4ccm/impl/ndds/Getter_T.h: + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + Made the waitset a class variable again. + +Wed Dec 16 11:12:46 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl: + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: + Simplified receiver + +Wed Dec 16 11:02:46 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/AMI: + Renamed directory to connector + +Wed Dec 16 10:36:31 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp: + * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: + Cleanup tests, check returned readers, data, info and status. + +Wed Dec 16 09:32:33 UTC 2009 Marcel Smit + + * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: + Resolved errors due to renaming namespaces. + +Wed Dec 16 09:04:31 UTC 2009 Marijke Hengstmengel + + *connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp: + *connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h: + *connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: + *connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: + *connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: + *connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: + *connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp: + *connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h: + *connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: + *connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: + *connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: + *connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: + Cleanup tests, check returned reader and status. + +Wed Dec 16 08:55:31 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + Using this when using members. + + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: + Added newline. + +Wed Dec 16 08:27:46 UTC 2009 Johnny Willemsen + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + Unicode fix + +Wed Dec 16 08:09:46 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/AMI/AMI.idl + * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp + * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h + * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.cpp + * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.h + * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h + Improved naming, everything is now in the Hello module and + everything related to AMI has a AMI_ prefix + +Tue Dec 15 18:12:46 UTC 2009 Johnny Willemsen + + * ami4ccm/examples/Hello/AMI/AMI_exec.cpp: + * ami4ccm/examples/Hello/AMI/AMI_exec.h: + Made code more consistent and error safe + +Tue Dec 15 15:59:46 UTC 2009 Johnny Willemsen + + * ami4ccm/examples/Hello/AMI/AMI.idl + * ami4ccm/examples/Hello/AMI/AMI_exec.cpp + * ami4ccm/examples/Hello/AMI/AMI_exec.h + * ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.cpp + * ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.h + * ami4ccm/examples/Hello/descriptors/run_test.pl + * ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl + * ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp + * ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h + * ami4ccm/examples/Hello/Sender/Hello_Sender.idl + * ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp + * ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h + Simplified this example + +Tue Dec 15 15:59:57 UTC 2009 Marcel Smit + + * connectors/dds4ccm/docs/TestCoverage.ods: + Spreadsheet to keep track of test coverage. + +Tue Dec 15 15:21:46 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h + Cleanup test. Check DDS_entity. + +Tue Dec 15 15:04:46 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp + Cleanup test. + +Tue Dec 15 14:58:21 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h: + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h: + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h: + * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: + * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h: + * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h: + * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: + Optimized code. Removed unused header files, indentation, removed empty lines. + +Tue Dec 15 14:32:46 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp: + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h: + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h: + Cleanup test. + +Tue Dec 15 13:39:46 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp: + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: + Cleanup test. + +Tue Dec 15 13:38:44 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: + Extended tests with checks on the received ReadInfo struct. + +Tue Dec 15 12:46:02 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl: + * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl: + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl: + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: + Extended tests with checks on the received ReadInfo struct. + + * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: + Sleep for 30 (instead of 60) seconds. + +Tue Dec 15 10:31:46 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp + * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp + Solved compile errors. + +Tue Dec 15 10:23:23 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Optimized for loop (++i in stead of i++). + + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: + Catching exceptions as const. + + * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: + Catching exceptions as const. + Extended tests on the listener callback. + +Tue Dec 15 09:01:46 UTC 2009 Marijke Hengstmengel + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/SLManyByMany: + * connectors/dds4ccm/tests/SLManyByMany/Base: + * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl: + * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc: + * connectors/dds4ccm/tests/SLManyByMany/Connector: + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl: + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc: + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.cpp: + * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h: + * connectors/dds4ccm/tests/SLManyByMany/descriptors: + * connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SLManyByMany/Receiver: + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl: + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc: + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h: + * connectors/dds4ccm/tests/SLManyByMany/Sender: + * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl: + * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc: + * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: + * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h: + Add test StateListyener operations with MANY_BY_MANY option. + +Tue Dec 15 08:25:46 UTC 2009 Johnny Willemsen + + * DAnCE/DomainApplicationManager/Node_Locator.cpp: + * DAnCE/DomainApplicationManager/Node_Locator.h: + Use char* instead of tchar + + * ciao/Contexts/Context_Impl_Base.h: + Made constructor private + +Mon Dec 14 20:35:46 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: + Removed virtual methods that where added by accident and which broke + the psl + +Mon Dec 14 20:31:46 UTC 2009 Johnny Willemsen + + * ciao/Containers/Session/Session_Container.cpp: + Use false and extended debug statements + + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: + Extended debug info + + * DAnCE/NodeManager/NodeManager_Impl.cpp: + Removed not needed debug info + + * ciao/Servants/Servant_Impl_T.cpp: + Layout change + +Mon Dec 14 20:07:46 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: + Report which port has the real problem + +Mon Dec 14 19:23:21 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + Resolved fuzz errors/warnings. + +Mon Dec 14 19:06:43 UTC 2009 Marcel Smit + + * examples/Hello/descriptors/run_NodeDaemons.pl: + * examples/Hello/descriptors/run_test.pl: + * examples/Hello/descriptors/run_test_alias.pl: + * examples/Hello/descriptors/run_test_without_ns.pl: + Resolved fuzz errors/warnings. + +Mon Dec 14 14:53:13 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h: + * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: + Cleaned up code. Removed unused headers, made exception variables const + and outlined code. + +Mon Dec 14 14:36:46 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc: + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc: + * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc: + Solve duplicate project names + +Mon Dec 14 14:25:09 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: + * examples/Hello/descriptors/run_test_alias.pl: + * examples/Hello/descriptors/run_test_without_ns.pl: + * tests/Bug_3769_Regression/descriptors/run_test.pl: + * tests/CIAO_ComponentServer/Local_Facet/run_test.pl: + Resolved fuzz erros/warnings. + +Mon Dec 14 14:15:46 UTC 2009 Johnny Willemsen + + * DAnCE/tests/MocksTest/* + Removed, not compiled, not tested + +Mon Dec 14 14:10:11 UTC 2009 Marcel Smit + + * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: + * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: + Resolved fuzz erros/warnings. + +Mon Dec 14 13:59:46 UTC 2009 Johnny Willemsen + + * ciao/Containers/Session/Session_Container.cpp: + Print debug statement when we don't get a facet + + * ciao/Contexts/Context_Impl_T.cpp: + * ciao/Contexts/Context_Impl_T.h: + * ciao/Servants/Servant_Impl_T.cpp: + * ciao/Servants/Servant_Impl_T.h: + Create the context in the base instead of in the generated + code + + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: + Layout change + + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: + Don't clear tracing flags + + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: + Layout changes + +Mon Dec 14 13:42:56 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp: + * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp: + Resolved errors in deployment plans related to local interfaces. + +Mon Dec 14 13:16:16 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + The deleted samples may be invalid. Therefore don't check + on valid_data flag. Implemented this for many_by_many. + +Mon Dec 14 12:56:16 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + The deleted samples may be invalid. Therefore don't check + on valid_data flag. + +Mon Dec 14 12:18:31 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + Added many_by_many listener test to test framework. + +Mon Dec 14 11:37:46 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp + Solve minor bug in test + +Mon Dec 14 11:18:46 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: + Removed generated header + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: + Use ACE_CString for subplan names + + * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: + Removed commented out code + + * DAnCE/NodeApplication/NodeApplication_Impl.h: + Removed not needed include + + * DAnCE/NodeManager/NodeManager_Impl.h + Added missing include + +Mon Dec 14 10:58:46 UTC 2009 Marijke Hengstmengel + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/SLDisabled: + * connectors/dds4ccm/tests/SLDisabled/Base: + * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl: + * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc: + * connectors/dds4ccm/tests/SLDisabled/Connector: + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl: + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc: + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.cpp: + * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h: + * connectors/dds4ccm/tests/SLDisabled/descriptors: + * connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SLDisabled/Receiver: + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl: + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc: + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: + * connectors/dds4ccm/tests/SLDisabled/Sender: + * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl: + * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc: + * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: + * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h: + Added test StateListener: NOT_ENABLED . + +Mon Dec 14 10:46:46 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: + Don't override use trace levels + + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + Initialise all members to zero + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + Improved logging + +Mon Dec 14 10:44:44 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/ListenManyByMany/*: + Added test in order to test many_by_many on the listener. + +Mon Dec 14 09:12:46 UTC 2009 Johnny Willemsen + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + Improved error reporting back to the end user + +Mon Dec 14 08:16:32 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: + * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: + * performance-tests/Benchmark/RoundTripClient/run_test.pl: + * performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl: + * tests/Bug_3769_Regression/descriptors/run_test.pl: + * tests/IDL3/Events/Any/run_test.pl: + * tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: + Resolved fuzz errors/warnings. + +Mon Dec 14 07:39:46 UTC 2009 Johnny Willemsen + + * ciao/Containers/Session/Session_Container.cpp + * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp + * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp + * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp + * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp + * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp + * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp + * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp + * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp + * connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp + * connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h + * connectors/dds4ccm/idl/ccm_dds.idl + * connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl + * connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl + * connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl + * connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Get_T.h + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Read_T.h + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Update_T.h + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Write_T.h + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h + * connectors/dds4ccm/impl/ndds/Getter_T.cpp + * connectors/dds4ccm/impl/ndds/Getter_T.h + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp + * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h + * connectors/dds4ccm/impl/ndds/Reader_T.cpp + * connectors/dds4ccm/impl/ndds/Reader_T.h + * connectors/dds4ccm/impl/ndds/SampleInfo.h + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h + * connectors/dds4ccm/impl/ndds/Updater_T.cpp + * connectors/dds4ccm/impl/ndds/Updater_T.h + * connectors/dds4ccm/impl/ndds/Writer_T.cpp + * connectors/dds4ccm/impl/ndds/Writer_T.h + * connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp + * connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl + * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp + * connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp + * connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp + * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp + * connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp + * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp + * connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp + * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp + * connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp + * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h + * DAnCE/Deployment/Deployment_DeploymentPlan.idl + * DAnCE/NodeApplication/NodeApplication_Impl.cpp + * DAnCE/NodeApplication/NodeApplication_Impl.h + * docs/schema/Basic_Deployment_Data.xsd + * tests/IDL_Test/Cornucopia/Cornucopia.idl + * tools/Config_Handlers/Basic_Deployment_Data.cpp + * tools/Config_Handlers/Basic_Deployment_Data.hpp + * tools/Config_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/DnC_Dump.cpp + * tools/Config_Handlers/PSPE_Handler.cpp + Removed LocalFacet again as connection kind, we now use a + deployRequirement in order to let D&C know we have a local connection. + Use local interfaces for everything in dds4ccm and updated + all deployment plans for this. This does mean the connector + needs to create all executors as construction time, the + lifecycle of the connector is now that all executors + are created at construction, at the moment we do a + ccm_activate we need to create the real dds entities. + When we get an invocation before ccm_activate we do a + BAD_INVORDER exception. + + In the cdp we now use the following with a connection to + indicate that it has to be deployed as a local connection: + + edu.dre.vanderbilt.DAnCE.ConnectionType + Local_Interface + + +Fri Dec 11 14:03:46 UTC 2009 Marcel Smit + + * examples/Display/descriptors/run_NodeDaemons.pl: + * examples/Display/descriptors/run_test_without_ns.pl: + Resolved fuzz errors/warnings/ + +Fri Dec 11 13:19:30 UTC 2009 Marcel Smit + + * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl: + * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: + * examples/Display/descriptors/basicNodeDaemon.pl: + Resolved fuzz errors/warnings/ + +Fri Dec 11 12:00:05 UTC 2009 Marcel Smit + + * examples/BasicSP/descriptors/run_test.pl: + Resolved script errors + +Fri Dec 11 11:50:16 UTC 2009 Johnny Willemsen + + * tests/IDL_Test/Cornucopia/Cornucopia.idl: + Extended tests + +Fri Dec 11 11:07:13 UTC 2009 Marcel Smit + + * performance-tests/Benchmark/RoundTripClient/run_test.pl: + Resolved fuzz errors/warnings + + * performance-tests/Protocols/descriptors/run_test.pl: + Resolved fuzz warnings + +Fri Dec 11 10:52:33 UTC 2009 Marcel Smit + + * performance-tests/Benchmark/Multi_Threaded/run_test.pl: + * performance-tests/Benchmark/RoundTrip/run_test.pl: + Resolved fuzz errors/warnings + +Fri Dec 11 10:27:57 UTC 2009 Marcel Smit + + * tests/Bug_2130_Regression/descriptors/run_test.pl: + * tests/Bug_3769_Regression/descriptors/run_test.pl: + Resolved fuzz errors/warnings + +Fri Dec 11 09:44:14 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: + * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: + * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: + Resolved fuzz errors/warnings + +Fri Dec 11 09:30:29 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: + * examples/Hello/descriptors/run_test.pl: + * examples/Null_Component/descriptors/run_test.pl: + Resolved script errors. + +Fri Dec 11 08:20:57 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp + Resolved warnings. + +Fri Dec 11 08:09:25 UTC 2009 Marcel Smit + + * performance-tests/Protocols/descriptors/run_test.pl: + Resolved fuzz errors/warnings. + +Fri Dec 11 07:44:10 UTC 2009 Marcel Smit + + * examples/Display/descriptors/run_NodeDaemons.pl: + * examples/Hello/descriptors/run_NodeDaemons.pl: + Resolved fuzz errors/warnings. + +Thu Dec 10 20:23:15 UTC 2009 Marcel Smit + + * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: + * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: + * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: + * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: + * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: + * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: + * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: + * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: + * examples/BasicSP/descriptors/run_test.pl: + * examples/Hello/descriptors/run_test.pl: + * examples/Null_Component/descriptors/run_test.pl: + * tests/IDL_Test/Double_Inherited_Component/run_test.pl: + Removed add_lib_path in order to resolve fuzz error. + +Thu Dec 10 20:05:00 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/descriptors/run_test_dds.pl: + * tests/Bug_2130_Regression/descriptors/run_test.pl: + Resolved fuzz errors/warnings. + +Thu Dec 10 19:40:19 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: + * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: + Resolved fuzz errors/warnings. + +Thu Dec 10 19:31:15 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_test_dds.pl: + * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl: + Resolved fuzz errors/warnings. + +Thu Dec 10 19:26:16 UTC 2009 Johnny Willemsen + + * ciao/Servants/Home_Servant_Impl_T.cpp: + Check return value sprintf and use is_nil + +Thu Dec 10 19:15:15 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: + * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: + * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: + * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: + * examples/Hello/descriptors/run_test_alias.pl: + Resolved some fuzz errors/warnings. + +Thu Dec 10 19:03:16 UTC 2009 Johnny Willemsen + + * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h: + * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: + Removed generated headers + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + const changes and improved debug messages + + * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: + Const change + + * DAnCE/RepositoryManager/Repository_Manager_Module.cpp: + Fixed typo in debug statement + +Thu Dec 109 17:02:57 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp + Resolved warning. + +Thu Dec 10 16:20:37 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: + * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: + Resolved some fuzz errors/warnings. + +Thu Dec 10 15:56:13 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: + * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: + * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: + Resolved some fuzz errors/warnings. + +Thu Dec 10 15:42:58 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: + * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: + * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: + Resolved some fuzz errors/warnings. + +Thu Dec 10 15:35:51 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: + * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: + * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: + * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: + Resolved some fuzz errors/warnings. + +Thu Dec 10 15:29:00 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: + * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: + Resolved fuzz errors/warnings. + +Thu Dec 10 14:41:13 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: + Wait a few seconds before the actual writing starts. + + * connectors/dds4ccm/tests/ListenOneByOne/*: + Added one_by_one listener test. + + * bin/ciao_tests.lst: + Added one_by_one test to the test framework. + +Thu Dec 109 14:31:57 UTC 2009 Marijke Hengstmengel + + * bin/ciao_tests.lst + * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl: + * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc: + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl: + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc: + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.cpp: + * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h: + * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/Updater/Receiver: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: + * connectors/dds4ccm/tests/Updater/Sender: + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl: + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc: + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h: + Implement test for Updater functions + +Thu Dec 10 13:30:01 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + Added !FIXED_BUGS_ONLY for the connection tests since + there's a known issue in the connector. + +Thu Dec 10 12:44:31 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + Added ListenNotEnabled test to the test framework. + +Thu Dec 10 12:42:08 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: + Renamed get_many into write_many. + + * connectors/dds4ccm/tests/ListenNotEnabled/*: + * connectors/dds4ccm/tests/Listener/*: + Split the listener into three separate tests. Added + listener test where mode is NOT_ENABLED as starter. + +Thu Dec 10 11:01:16 UTC 2009 Johnny Willemsen + + * ciao/Containers/Servant_Activator.cpp: + Extended logging + +Thu Dec 10 10:11:56 UTC 2009 Marcel Smit + + * examples/Hello/descriptors/run_test_without_ns.pl: + * examples/Null_Component/descriptors/run_test.pl: + Resolved fuzz errors/warnings. + +Thu Dec 10 10:00:16 UTC 2009 Johnny Willemsen + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + Fixed compiler warnings about arguments not used + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + Fixed invalid string comparison and const improvements + +Thu Dec 10 09:41:12 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc: + Removed some unnecessary defines. + + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: + Removed unused class variable. + + * connectors/dds4ccm/tests/Listener/*: + Empty test framework for the listener test. + +Thu Dec 10 08:37:49 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Getter/README: + * connectors/dds4ccm/tests/Reader/README: + Described the tests. + +Thu Dec 10 08:21:16 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/Updater_T.cpp: + * connectors/dds4ccm/impl/ndds/Updater_T.h: + Fixed bugs in the updater + + * connectors/ami4ccm/examples/Hello/AMI/AMI.idl + * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp + * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h + * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp + * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl + * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl + * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.mpc + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h + Merged a revised ami4ccm example that has local interfaces for the + reply handler, which reduces the footprint of ami4ccm and also + simplifies the code + +Thu Dec 10 08:06:08 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc: + * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc: + * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc: + * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc: + * connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp: + Shorten the names of the projects in order to solve some fuzz warnings. + +Wed Dec 9 19:52:16 UTC 2009 Johnny Willemsen + + * DAnCE/Deployment/Deployment_DeploymentPlan.idl + * DAnCE/NodeApplication/NodeApplication_Impl.cpp + * DAnCE/NodeApplication/NodeApplication_Impl.h + * docs/schema/Basic_Deployment_Data.xsd + * tools/Config_Handlers/Basic_Deployment_Data.cpp + * tools/Config_Handlers/Basic_Deployment_Data.hpp + * tools/Config_Handlers/CPD_Handler.cpp + * tools/Config_Handlers/DnC_Dump.cpp + * tools/Config_Handlers/PSPE_Handler.cpp + Merged changes from local_facets branch from Will Otte to svn head. + This is going to be used by at least ami4ccm. We are looking if there + is a different way to determine whether we need to connect a local + facet. + +Wed Dec 9 15:53:16 UTC 2009 Marcel Smit + + * examples/BasicSP/descriptors/run_test.pl: + * examples/Null_Component/descriptors/run_test.pl: + Resolved fuzz errors/warnings. + +Wed Dec 9 15:01:48 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: + Resolved unicode compiler errors. + +Wed Dec 9 14:29:33 UTC 2009 Johnny Willemsen + + * ciao/Containers/Container_Base.cpp: + * ciao/Containers/Container_Base.h: + * ciao/Containers/Container_Base.idl: + * ciao/Containers/Container_Base.inl: + Get rid of the receptacle policy map, this doesn't do a thing + +Wed Dec 9 14:26:17 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: + Extended tests with a timeout test on get_many. + +Wed Dec 9 13:58:44 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: + Don't need the ConnectorStatusListener anymore. + + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: + Print debug message in stead of an error message. + +Wed Dec 9 13:54:33 UTC 2009 Johnny Willemsen + + * ciao/Servants/Servant_Impl_Base.cpp (lookup_facet): + Log an error when we can't find a facet + +Wed Dec 9 13:53:47 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + On get_many should at least return 1 sample. + + * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp: + Return _nil rather than 0. + +Wed Dec 9 13:11:33 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/Updater_T.cpp: + Check whether instance_handle and instance match + +Wed Dec 9 12:55:23 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc: + * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc: + * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc: + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc: + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp: + Changed project names in order to resolve fuzz warnings. + +Wed Dec 9 12:48:35 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc: + Shorten the shared name of DDS_ConnectorStatusListener_TestSec_Connector_lem_stub. + +Wed Dec 9 12:40:33 UTC 2009 Johnny Willemsen + + * bin/ciao_tests.lst: + Added Local_Facet test + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + Resolved a bug whereby connection endpoints in the original plan + would be copied into two separate connections in a child plan. + +Wed Dec 9 12:37:33 UTC 2009 Johnny Willemsen + + * tests/IDL_Test/Local_Facet: + Removed + + * tests/CIAO_ComponentServer/Local_Facet: + New test for testing local facets + + * ciao/ComponentServer/CIAO_ComponentServer.idl + * ciao/ComponentServer/CIAO_Container_Impl.cpp + * ciao/ComponentServer/CIAO_Container_Impl.h + * ciao/Containers/Container_Base.idl + * ciao/Containers/Session/Session_Container.cpp + * ciao/Containers/Session/Session_Container.h + Added support to connect local facets by William Otte + + * ciao/Servants/Servant_Impl_Base.cpp: + * ciao/Servants/Servant_Impl_Base.h: + Made several methods pure virtual instead of not implemented + +Wed Dec 9 11:24:58 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + Resolved compiler warnings. + +Wed Dec 9 11:13:44 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + Added State_Connection_Test. + + * connectors/dds4ccm/tests/Event_Connection_Test/README: + Changed to meet the latest code updates. + + * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl: + Removed comments. + + * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp: + Logging debug messages (in stead of error messages). + + * connectors/dds4ccm/tests/State_Connection_Test/*: + Added this test in order to test all the connections a state connector + needs. + +Wed Dec 9 08:56:42 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl: + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h: + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp: + Support only the DDS_Event connector. Removed DDS_State connector stuff. + +Wed Dec 9 08:25:57 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp + Add newline at end of file + +Wed Dec 9 08:17:27 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Get_Connection_Test/*: + Renamed to Event_Connection_Test. + +Wed Dec 9 08:14:57 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/Event_Connection_Test/*: + Renamed Get_Connection_Test to Event_Connection_Test. + +Wed Dec 9 07:47:33 UTC 2009 Johnny Willemsen + + * etc/ciao_dds4ccm.doxygen: + Also exclude the tests directory + +Wed Dec 9 07:17:32 UTC 2009 Marcel Smit + + * examples/BasicSP/descriptors/run_test.pl: + * examples/Hello/descriptors/run_test.pl: + Resolved some fuzz errors/warnings. + +Tue Dec 8 16:36:33 UTC 2009 Johnny Willemsen + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + Fixes to debug statements + +Tue Dec 8 16:31:33 UTC 2009 Marcel Smit + + * examples/Hello/descriptors/run_test.pl: + Adapted to the new test framework. + +Tue Dec 8 15:54:33 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/Updater_T.cpp: + * connectors/dds4ccm/impl/ndds/Updater_T.h: + Added existence checks as mandated by the spec + +Tue Dec 8 15:29:40 UTC 2009 Marcel Smit + + * examples/BasicSP/descriptors/run_test.pl: + * examples/Hello/descriptors/run_test.pl: + * examples/Null_Component/descriptors/run_test.pl: + Resolved fuzz warnings. + +Tue Dec 8 15:20:33 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Update_T.h + Cache dds executors + +Tue Dec 8 15:17:44 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + Resolved compiler warnings. + +Tue Dec 8 15:11:22 UTC 2009 Marcel Smit + + * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: + * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: + * tests/Bug_3769_Regression/descriptors/run_test.pl: + Resolved fuzz errors. + +Tue Dec 8 15:01:58 UTC 2009 Marcel Smit + + * examples/BasicSP/descriptors/run_test.pl: + * examples/Hello/descriptors/run_test.pl: + * examples/Hello/descriptors/run_test_without_ns.pl: + * examples/Null_Component/descriptors/run_test.pl: + Resolved fuzz errors. + +Tue Dec 8 14:56:33 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: + Provide access to the DDS entities + +Tue Dec 8 12:51:33 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Getter_T.h: + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + Using a local waitset in stead of a global one. + + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + Optimized get_many. + +Tue Dec 8 10:48:04 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + Added Getter test to the test framework. + + * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: + Implemented get_many. + +Tue Dec 8 09:05:57 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: + Change QoS settings of test to generate a on_sample_lost callback. + +Tue Dec 8 08:56:42 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + RETCODE_NO_DATA should throw an exception since + there always must be data after when the timeout does + not occur. + + * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: + Removed qos_profile config property. + +Tue Dec 8 08:47:23 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: + Resolved some timing issues between sender and receiver. + +Tue Dec 8 08:17:57 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc: + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: + Solved errors duplicate projectnames + + +Tue Dec 8 07:21:52 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + Minor changes in order to meet the spec. + + * connectors/dds4ccm/tests/Getter/*: + Added test for the getter. + +Mon Dec 7 15:37:57 UTC 2009 Marijke Hengstmengel + + * bin/ciao_tests.lst + * connectors/dds4ccm/tests/PSLSampleLost: + * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl: + * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc: + * connectors/dds4ccm/tests/PSLSampleLost/Connector: + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl: + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp: + * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h: + * connectors/dds4ccm/tests/PSLSampleLost/descriptors: + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: + * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: + * connectors/dds4ccm/tests/PSLSampleLost/Sender: + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl: + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc: + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: + Add test PortStatusListener:on_sample_lost + +Mon Dec 7 14:53:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: + Implement get_dds_entity methods + + * NEWS + Added DDS4CCM_NDDS_LOG_VERBOSITY + +Mon Dec 7 13:28:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp + Fixed runtime problems and refactored statelistener + +Mon Dec 7 13:25:55 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Getter_T.cpp: + Reads according to DDS4CCM spec. + + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + NO_DATA shouldn't throw an exception but just return + an empty sequence. + + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: + Optimized test. Don't need to sleep prior to writing samples to DDS. + +Mon Dec 7 13:07:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h + * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Get_T.h + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h + * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Read_T.h + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h + * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Update_T.h + * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Write_T.h + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h + * connectors/dds4ccm/impl/ndds/Reader_T.h + * connectors/dds4ccm/impl/ndds/Updater_T.h + Introduced DDS_Get_T, DDS_Listen_T, DDS_Read_T, DDS_Update_T, and + DDS_Write_T templates which implement the dds4ccm extended ports + +Mon Dec 7 11:157:57 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl: + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: + Add second port to test + +Mon Dec 7 11:12:49 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Instance state should be alive in all cases. + +Mon Dec 7 10:54:16 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + Implemented max_delivered_data. + +Mon Dec 7 10:30:38 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: + Rewritten test due to timing issues. Also added a 'no data' test. + +Mon Dec 7 10:07:57 UTC 2009 Marijke Hengstmengel + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/PSLDeadline: + * connectors/dds4ccm/tests/PSLDeadline/Base: + * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl: + * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc: + * connectors/dds4ccm/tests/PSLDeadline/Connector: + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl: + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc: + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp: + * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h: + * connectors/dds4ccm/tests/PSLDeadline/descriptors: + * connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: + * connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/PSLDeadline/Receiver: + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl: + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc: + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h + * connectors/dds4ccm/tests/PSLDeadline/Sender: + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl: + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc: + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: + Add test PortStatusListener:on_requested_deadline_missed for DDS_Listen port + +Mon Dec 7 06:52:05 UTC 2009 Abdullah Sowayan + + * tests/Bug_3769_Regression/Foo.idl: + * tests/Bug_3769_Regression/Foo_exec.h: + * tests/Bug_3769_Regression/Foo_exec.cpp: + + Extended this test to test a struct attribute of a component. + The descriptor file needs to be extended as well. + +Mon Dec 7 06:08:31 UTC 2009 Abdullah Sowayan + + * tests/Bug_3769_Regression/Foo.idl: + * tests/Bug_3769_Regression/Foo_exec.h: + * tests/Bug_3769_Regression/Foo_exec.cpp: + + Extended this test to test a sequence attribute of a component. + The descriptor file needs to be extended to capture data + for the sequence attribute(s). + +Mon Dec 7 03:02:18 UTC 2009 Abdullah Sowayan + + * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: + + Fixed a small bug in a switch statement where one of the + cases did not have a 'break' statement. + +Sun Dec 6 19:22:45 UTC 2009 Johnny Willemsen + + * ciao/ComponentServer/CIAO_Container_Impl.cpp: + Changed layout debug message + + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h + Implement more portstatus listner functionality + +Sun Dec 6 18:49:47 UTC 2009 William R. Otte + + * tests/Bug_3769_Regression/Foo_exec.cpp: + + Fixed the comparison for float to ensure the numeric literal isn't + converted to a double. + + * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: + + Float configproperty was incorrectly typed as a double. + + * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: + + Fixed bug whereby floats/doubles weren't properly dereferences. + +Sat Dec 5 01:06:06 UTC 2009 Abdullah Sowayan + + * bin/ciao_tests.lst: + + Add bugzilla 3769 to the list of test to run. + +Sat Dec 5 00:59:20 UTC 2009 Abdullah Sowayan + + * tests/Bug_3769_Regression: + * tests/Bug_3769_Regression/Foo.idl: + * tests/Bug_3769_Regression/Foo.mpc: + * tests/Bug_3769_Regression/Foo_exec.h: + * tests/Bug_3769_Regression/Foo_exec.cpp: + * tests/Bug_3769_Regression/descriptors: + * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: + * tests/Bug_3769_Regression/descriptors/NodeMap.dat: + * tests/Bug_3769_Regression/descriptors/run_test.pl: + * tests/Bug_3769_Regression/model: + + Added bugzilla 3769. Component attributes of type double and float + do not get set properly by DAnCE. + +Fri Dec 4 20:41:45 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h: + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: + * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + Introduced a PortStatusListener which is than the base of + the DataReaderListener + +Fri Dec 4 14:31:45 UTC 2009 Marcel Smit + + * tests/CIAO_ComponentServer/SimpleComponent/run_test.pl: + Resolved fuzz error. + +Fri Dec 4 14:28:18 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + Enabled some more test for fuzz. + +Fri Dec 4 14:15:24 UTC 2009 Marcel Smit + + * tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: + Adapted to the new test framework. Fuzz + errors/warnings should be resolved + +Fri Dec 4 13:53:04 UTC 2009 Marcel Smit + + * tests/IDL3_to_XMI/Bug_3607_Regression/run_test.pl: + * tests/IDL3_to_XMI/XMI_For_Array/run_test.pl: + * tests/IDL3_to_XMI/XMI_For_Included_File/run_test.pl: + * tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl: + * tests/IDL3_to_XMI/XMI_For_Native/run_test.pl: + * tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: + Resolved some minor fuzz errors/warnings. + +Fri Dec 4 13:49:58 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h: + Add more infrastructure for the 5 extended ports this connector + provides + +Fri Dec 4 13:23:46 UTC 2009 Marcel Smit + + * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: + * tests/CIAO_ComponentServer/Basic/run_test.pl: + Resolved runtime errors in script. + +Fri Dec 4 13:14:10 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + Fixed many_by_many. The last updates should be send to + the listener. + +Fri Dec 4 13:04:58 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/idl/dds4ccm.mpc + * connectors/dds4ccm/impl/ndds/DataListenerControl.cpp + * connectors/dds4ccm/impl/ndds/DataListenerControl.h + * connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp + * connectors/dds4ccm/impl/ndds/DataListenerControl_T.h + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp + * connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h + * connectors/dds4ccm/impl/ndds/ndds_impl.mpc + * connectors/dds4ccm/impl/ndds/StateListenerControl.cpp + * connectors/dds4ccm/impl/ndds/StateListenerControl.h + * connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp + * connectors/dds4ccm/impl/ndds/StateListenerControl_T.h + Refactored data/state listener controls + +Fri Dec 4 12:56:58 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + Refactored MANY_BY_MANY. + +Fri Dec 4 11:24:25 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + Implemented MANY_BY_MANY. First all new samples are handled. + After that the updated ones, by invoking on_many_updates on + the listener. The last step is to inform the listener + about the deleted samples. + +Fri Dec 4 10:38:26 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + Resolved compiler errors. + +Fri Dec 4 10:21:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + Extended logging + +Fri Dec 4 10:11:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: + Removed listener callbacks that are handled by the subscriber + +Fri Dec 4 09:49:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/tests/Updater/* + Use the stateconnector as starting point + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + First compile fixes + + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: + Handle data_on_readers + +Fri Dec 4 09:34:09 UTC 2009 Marcel Smit + + * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: + * tests/CIAO_ComponentServer/Activator/run_test.pl: + * tests/IDL_Test/Double_Inherited_Component/run_test.pl: + Resolved fuzz errors/warnings. + +Fri Dec 4 09:04:34 UTC 2009 Marcel Smit + + * tests/CIAO_ComponentServer/Activator/run_test.pl: + * tests/CIAO_ComponentServer/Basic/run_test.pl: + Resolved fuzz errors/warnings. + +Fri Dec 4 08:32:42 UTC 2009 Marcel Smit + + * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: + Resolved fuzz errors/warnings. + +Thu Dec 3 20:12:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp + Layout changes + +Thu Dec 3 20:08:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp + Added a lot of logging and made the subscriberlistener + working again + +Thu Dec 3 20:08:39 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: + Only returning valid data. + +Thu Dec 3 18:46:35 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: + Using a take in stead of take_next_sample. Also created + Created difference between ONE_BY_ONE and MANY_BY_MANY by + invoking on_one_update and on_many_updates on the listener. + +Thu Dec 3 15:13:57 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp: + Resolved warning unused parameter. + +Thu Dec 3 14:06:14 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: + Removed the context switch. + Created difference between ONE_BY_ONE and MANY_BY_MANY by + introducing a take (in stead of take_next_sample). + +Thu Dec 3 13:57:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: + Handle everything related to the CSL at subscriber/publisher + level + + * DAnCE/RepositoryManager/RepositoryManager.mpc: + Corrected base project + +Thu Dec 3 13:52:57 UTC 2009 Marijke Hengstmengel + + *bin/ciao_tests.lst: + * connectors/dds4ccm/tests/CSLUnexpStat: + * connectors/dds4ccm/tests/CSLUnexpStat/Base: + * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl: + * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc: + * connectors/dds4ccm/tests/CSLUnexpStat/Connector: + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl: + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc: + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp: + * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors: + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: + Test ConnectorStatusListener:on_unexpected_status implemented + + +Thu Dec 3 12:56:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: + Let each layer initialise itself + +Thu Dec 3 12:06:32 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: + Added keys and max_dds_samples to idl. + +Thu Dec 3 11:07:49 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + UnkeyedWriter test may fail since DDS allows more + samples than configured in the QoS file. + +Thu Dec 3 11:06:37 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + Resolved compiler warnings on Windows. + +Thu Dec 3 11:03:34 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp: + Resolved some runtime errors. Expected_samples and name are not + used in Sender. + +Thu Dec 3 10:51:20 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: + Disabled the listener for now. No takes should be performed. + + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: + Rewritten in order to test exceptions from the connector. + +Thu Dec 3 10:14:28 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl: + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: + Build in checks on received data. + + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: + Write more samples + +Wed Dec 3 08:56:57 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: + Solved initialize warnings. + +Thu Dec 3 08:55:27 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: + Reduced log level. + +Thu Dec 3 08:47:23 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl: + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: + Adapted to the update Reader port. + + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + Minor code optimization. + +Thu Dec 3 08:28:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: + Don't handle data_on_readers, if we install this listener, + the data reader listener will not get any on_data_available + +Wed Dec 2 14:57:57 UTC 2009 Johnny Willemsen + + * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: + Use the word error to trigger the scoreboard parser + +Wed Dec 2 14:19:49 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Used operators to file readinfo sequences. + + * connectors/dds4ccm/impl/ndds/SampleInfo.h: + Removed <== operator for readinfo_seq. Also added + instance handle when copying sample_info. + + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + Added handle tests and test exceptions related to handles. + + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: + Changed timing. + +Wed Dec 2 13:58:57 UTC 2009 Marijke Hengstmengel + + * bin/ciao_tests.lst: + Add test to test list. + +Wed Dec 2 13:49:57 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/impl/ndds/Utils.cpp: + * connectors/dds4ccm/impl/ndds/Utils.h: + * connectors/dds4ccm/tests/CSLSampleRejected: + * connectors/dds4ccm/tests/CSLSampleRejected/Base: + * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl: + * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc: + * connectors/dds4ccm/tests/CSLSampleRejected/Connector: + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl: + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc: + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp: + * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h: + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors: + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLSampleRejected/Sender: + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl: + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc: + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: + Created test ConnectorStatusListener:on_sample_rejected + +Wed Dec 2 13:35:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: + Handle data_on_readers + +Wed Dec 2 13:12:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener_T.h + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener.h + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h + * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp + * connectors/dds4ccm/impl/ndds/TopicListener_T.h + Added a get_mask to all listeners, this should return the + mask the listener needs, this is then used by the connector + templates. This way a listener can listen for more callbacks + and update his mask without any connector to be updated + +Wed Dec 2 13:10:40 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Reader_T.h: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Implemented read_last. + + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: + Optimized tests. + +Wed Dec 2 11:52:26 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Reader_T.h: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Cleaned up code by removing double code. Implemented + read_all. + + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + Enabled read_all test. + +Wed Dec 2 11:33:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/Utils.cpp: + * connectors/dds4ccm/impl/ndds/Utils.h: + Added translate_statuskind + +Wed Dec 2 11:16:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener.h: + Implemented more CSL callbacks + +Wed Dec 2 10:57:20 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Reader_T.h: + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Implemented read_one_last and read_one_all according to + spec. + + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + Enabled read_one_last and read_one_all to test. + + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: + Sleep between writing samples to DDS. + + * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: + Optimized logging. + +Wed Dec 2 10:26:57 UTC 2009 Johnny Willemsen + + * ciao/Containers/Session/Session_Container.cpp: + * ciao/Containers/Session/Session_Container.h: + Improved failure reporting in case we can't get the needed + entities + +Wed Dec 2 09:05:57 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h: + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h: + * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: + Moved publisher and subscriber to the DDS_TopicBase + +Wed Dec 2 08:33:57 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + Added reader test to the test framework. + +Wed Dec 2 08:28:44 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Started with read_one_last. + + * connectors/dds4ccm/tests/Reader: + * connectors/dds4ccm/tests/Reader/Base: + * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl: + * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc: + * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl: + * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc: + * connectors/dds4ccm/tests/Reader/Connector: + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl: + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc: + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h: + * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.cpp: + * connectors/dds4ccm/tests/Reader/README: + * connectors/dds4ccm/tests/Reader/Receiver: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Reader/Sender: + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl: + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc: + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h: + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/Reader/descriptors: + * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: + Added test to test the Reader. + +Tue Dec 01 12:39:37 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/Reader_T.cpp: + Implemented read_one_all + +Tue Dec 01 11:50:37 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h + * connectors/dds4ccm/impl/ndds/ndds_impl.mpc + * connectors/dds4ccm/impl/ndds/StateListenerControl.cpp + * connectors/dds4ccm/impl/ndds/StateListenerControl.h + StateListenerControl + +Tue Dec 01 10:59:37 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h + StateListener + +Tue Dec 01 09:42:37 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h + * connectors/dds4ccm/impl/ndds/DataReaderListener.h + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h + * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp + * connectors/dds4ccm/impl/ndds/PublisherListener_T.h + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp + * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h + * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp + * connectors/dds4ccm/impl/ndds/TopicListener_T.h + * connectors/dds4ccm/impl/ndds/Updater_T.cpp + * connectors/dds4ccm/impl/ndds/Updater_T.h + Implemented empty listeners for each dds entity and first + part of DDS_State + +Tue Dec 01 08:33:37 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc + Corrected mpc file for connector_stub + +Mon Nov 30 13:00:37 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp: + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: + Corrected warnings for unused parameters + + +Mon Nov 30 13:00:37 UTC 2009 Marijke Hengstmengel + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc: + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc: + Corrected long project names and add tests to test list. + +Mon Nov 30 12:27:37 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h: + Empty state connector so that we can start with creating tests + + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h: + Corrected ifdef guards + +Mon Nov 30 11:32:37 UTC 2009 Marijke Hengstmengel + + * connectors/dds4ccm/tests/CSLDeadline: + * connectors/dds4ccm/tests/CSLDeadline/Base: + * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl: + * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc: + * connectors/dds4ccm/tests/CSLDeadline/Connector: + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl: + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc: + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp: + * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h: + * connectors/dds4ccm/tests/CSLDeadline/descriptors: + * connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CSLDeadline/Receiver: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLDeadline/Sender: + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl: + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc: + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: + Test ConnectorStatusListener on_offered_deadline_missed. + + * connectors/dds4ccm/tests/CSLQoS: + * connectors/dds4ccm/tests/CSLQoS/Base: + * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl: + * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc: + * connectors/dds4ccm/tests/CSLQoS/Connector: + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl: + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc: + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp: + * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h: + * connectors/dds4ccm/tests/CSLQoS/descriptors: + * connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: + * connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/CSLQoS/Receiver: + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl: + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc: + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLQoS/Sender: + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl: + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc: + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h: + Test ConnectorStatusListener on_requested- and on_offered_incompatible_QoS. + +Mon Nov 30 09:21:37 UTC 2009 Johnny Willemsen + + * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: + * ciao/Servants/Port_Activator_T.h: + * DAnCE/TargetManager/DomainDataManager.h: + * DAnCE/TargetManager/ResourceCommitmentManager.h: + Doxygen fixes + +Sun Nov 29 13:06:02 CST 2009 Johnny Willemsen + + * CIAO version 0.7.5 released. + +Thu Nov 26 20:18:37 UTC 2009 Johnny Willemsen + + * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp: + Layout changes + + * ciao/ComponentServer/CIAO_RTComponentServer.cpp: + * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp: + Latest changes for rt component server to have server declared priorities + +Thu Nov 26 19:30:37 UTC 2009 Johnny Willemsen + + * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: + When creating the process options, calculate the size of the + commandline, the default of 1024 can be too small if the + system has multiple network interfaces + +Thu Nov 26 19:03:37 UTC 2009 Johnny Willemsen + + * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: + Check if we successfully constructed the commandline + +Thu Nov 26 18:52:37 UTC 2009 Johnny Willemsen + + * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp: + If the narrow of the callback IOR fails, print the IOR + + * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: + Const change + +Thu Nov 26 15:32:37 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/KeyedWriter/README: + * connectors/dds4ccm/tests/UnkeyedSamples/README: + Added test description + + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: + Removed keys. + + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: + Removed keys. Added qos_profile. + + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: + Started with configuring DDS in order to test the unkeyed + writer. + +Thu Nov 26 13:59:39 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + KeyedWriter is not fixed, yet. + +Thu Nov 26 13:48:39 UTC 2009 Johnny Willemsen + + * ciao/Servants/Servant_Impl_Base.cpp: + * ciao/Servants/Servant_Impl_Base.h: + Removed some methods or made them pure virtual, no need to let + them throw no_implement, the derived template does implement it + +Thu Nov 26 13:29:51 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: + Removed CLINFO from log message in order to consistent with other + log messages. + +Thu Nov 26 13:11:06 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: + Resolved runtime errors. + + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp: + Resolved test error: test took longer than 60 seconds. + +Thu Nov 26 12:56:39 UTC 2009 Johnny Willemsen + + * ciao/Containers/Session/Session_Container.h: + Removed not needed forward declaration + + * ciao/Servants/Servant_Impl_Base.cpp: + Keep a reference to the home servant so that it doesn't get deleted + when we have a reference to it + + * ciao/Servants/Servant_Impl_T.cpp: + Only print the refcount of the executor when it is > 1, than we have + a leak + +Thu Nov 26 12:54:39 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: + Resolved some test errors when using write_many. + +Thu Nov 26 12:40:18 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: + Resolved test errors. Expected samples should always be in the + deployment plan. + + * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp: + Added expected samples. + + * connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml: + Resolved test error by adding qos_profile to the deployment plan. + +Thu Nov 26 12:18:07 UTC 2009 Marcel Smit + + + * connectors/dds4ccm/examples/Quoter/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/examples/Shapes/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/Get_Connection_Test/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/KeyedSamples/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: + Removed these files since the default qos is coded. + +Thu Nov 26 12:12:36 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: + Resolved compiler warnings on linux. + +Thu Nov 26 11:43:12 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp: + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp: + Also reported messages when things go as planned. + + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: + Resolved some compiler error. + +Thu Nov 26 11:37:12 UTC 2009 Johnny Willemsen + + * examples/Hello/descriptors_RTCCM/*: + Deleted, not used + + * examples/Hello/Sender/Sender_exec.cpp: + Return the correct string + + * examples/Hello/descriptors/DeploymentPlan.cdp: + Removed rate attribute + +Thu Nov 26 10:50:12 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp: + Give more feedback on the test itself + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipant.h + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp + Layout changes, create topic with profile, and fixed key_fields set/get methods + +Thu Nov 26 10:42:12 UTC 2009 Marcel Smit + + * examples/Hello/Receiver/Receiver.idl: + * examples/Hello/Receiver/Receiver_exec.h: + * examples/Hello/Receiver/Receiver_exec.cpp: + Reverted some of my last changes. + Removed timer functionality. + + * examples/Hello/Sender/Sender.idl: + * examples/Hello/Sender/Sender_exec.h: + * examples/Hello/Sender/Sender_exec.cpp: + * examples/Hello/descriptors/DeploymentPlan.cdp: + Removed log_time attribute. + + * examples/Hello/descriptors/run_test.pl: + No sleep necessary anymore. + +Thu Nov 26 10:19:55 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: + Changed logging on exit. Reporting an error only when received < expected. + +Thu Nov 26 09:28:25 UTC 2009 Marcel Smit + + * examples/Hello/Receiver/Receiver.idl: + * examples/Hello/Receiver/Receiver_exec.h: + * examples/Hello/Receiver/Receiver_exec.cpp: + Reviced this example a bit. The receiver now uses the + orb reator thread to call the sender periodically. Therefore + the receiver is not blocked in the receiving CCM event method. + Also introduced a rate in the deployment plan; no hard coded + sleep of 200 seconds anymore. + + * examples/Hello/Sender/Sender.idl: + * examples/Hello/Sender/Sender_exec.h: + * examples/Hello/Sender/Sender_exec.cpp: + Removed attribute Hertz since it was not used + + * examples/Hello/descriptors/DeploymentPlan.cdp: + Introduced rate for the receiver (see above). + + * examples/Hello/descriptors/run_test.pl: + Added a sleep of 60 seconds. + +Thu Nov 26 08:09:39 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: + Optimized logging for ConnectorStatusListener. + + * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc: + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc: + Resolved fuzz warning (project names too long). + +Thu Nov 26 07:32:26 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: + Since the connector is now cleaning up the DDS environment, shutting + down takes considerably longer. Therefore extended the shutdown times. + +Wed Nov 25 16:22:26 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h: + * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: + Using the orb reactor thread in order to handle application specific + logic. + + * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: + Optimized logging. + +Wed Nov 25 15:50:57 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: + Logged errors instead of warnings when received!=expected. + + * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp: + Nothing is received when this deployment plan is ran. + +Wed Nov 25 15:40:59 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp: + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp: + Resolved minor typos. + +Wed Nov 25 15:30:14 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/KeyedSamples/README: + * connectors/dds4ccm/tests/SetConnectorAttributes/README: + Added test description. + +Wed Nov 25 15:15:43 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/Get_Connection_Test/README: + * connectors/dds4ccm/tests/NonChangeableAttribute/README: + Added test description. + +Wed Nov 25 14:26:21 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipant.h + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h + * connectors/dds4ccm/impl/ndds/Publisher.cpp + * connectors/dds4ccm/impl/ndds/Publisher.h + * connectors/dds4ccm/impl/ndds/Subscriber.cpp + * connectors/dds4ccm/impl/ndds/Subscriber.h + Implemented all with_profile methods + +Wed Nov 25 14:12:21 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/UnkeyedWriter: + * connectors/dds4ccm/tests/UnkeyedWriter/Base: + * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl: + * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc: + * connectors/dds4ccm/tests/UnkeyedWriter/Connector: + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl: + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc: + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h: + * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver: + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl: + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc: + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedWriter/Sender: + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc: + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: + * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: + Added an unkeyed writer test. + +Wed Nov 25 13:45:05 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + * connectors/dds4ccm/tests/SetConnectorAttributes: + * connectors/dds4ccm/tests/SetConnectorAttributes/Base: + * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl: + * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc: + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector: + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl: + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc: + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h: + * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp: + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors: + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp: + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: + Added this test in order to test whether the connector attributes are set properly. + +Wed Nov 25 13:15:25 UTC 2009 Marcel Smit + + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + Resolved typo in setting key_fields. + +Wed Nov 25 13:05:24 UTC 2009 Johnny Willemsen + + * ciao/Containers/Servant_Activator.cpp: + Fix typo in debug statement + + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: + Removed updater functionality + + * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: + Added missing \n to debug messages + + * tests/CIAO_ComponentServer/Activator/run_test.pl: + * tests/CIAO_ComponentServer/Basic/run_test.pl: + * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: + Shortened timeouts + + * ciao/ComponentServer/CIAO_ComponentServer.cpp: + For x.7.5, don't wait for worker threads + + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: + Some cleanup and destroy dds entities at ccm_remove + +Wed Nov 25 10:54:24 UTC 2009 Marcel Smit + + * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp: + Resolved some errors. + + * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: + * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: + No need to wait 60 seconds. + + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: + Optimized logging. + +Wed Nov 25 09:39:17 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: + Optimized logging. + +Wed Nov 25 09:37:22 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.cpp: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector_exec.h: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector_exec.cpp: + Renamed ConnectorStatusListener_TestSec_Connecto in order to resolve fuzz errors. + +Wed Nov 25 09:28:44 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: + Some code outlining. + + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl: + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp: + Added connector status listener. + + * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: + Optimized logging. + +Wed Nov 25 09:21:31 UTC 2009 Johnny Willemsen + + * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp: + layout change + + * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: + Added missing trace + + * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: + Fixed trace and layout change + + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + Don't use the qos because the conversions are not fully implemented + + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + Use default qos + +Wed Nov 25 08:47:31 UTC 2009 Johnny Willemsen + + * tests/Bug_2130_Regression/descriptors/run_test.pl: + * examples/Null_Component/descriptors/run_test.pl: + * examples/Hello/descriptors_RTCCM/rt_run_test.pl: + * examples/Hello/descriptors/run_test_without_ns.pl: + * examples/Hello/descriptors/run_test_alias.pl: + * examples/Display/descriptors/run_test_without_ns.pl: + * examples/BasicSP/descriptors/run_test.pl: + * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: + * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: + Use more realistic timeouts, this will shorten the test runs + a lot at the moment a test or example is broken + + * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp + * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h + * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp + * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h + * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h + * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h + * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h + * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h + * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.h + * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.h + * DAnCE/tests/CIAO/Components/SimpleNull_exec.h + * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h + * DAnCE/tests/CIAO/Components/SimplePublisher_exec.h + * DAnCE/tests/CIAO/Components/SimpleUser_exec.h + Removed generated headers from these files + +Wed Nov 25 08:31:31 UTC 2009 Johnny Willemsen + + * examples/Hello/Receiver/Receiver_exec.cpp + * examples/Hello/Receiver/Receiver_exec.h + * examples/Hello/Sender/Sender_exec.cpp + * examples/Hello/Sender/Sender_exec.h + * examples/Null_Component/Null_Component_exec.cpp + * examples/Null_Component/Null_Component_exec.h + * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.h + * tests/Minimum/Receiver/Receiver_exec.cpp + * tests/Minimum/Receiver/Receiver_exec.h + * tests/Minimum/Sender/Sender_exec.cpp + * tests/inimum/Sender/Sender_exec.h + Removed generated headers from these files + +Wed Nov 25 08:19:31 UTC 2009 Marcel Smit + + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc: + Fixed order error on Windows. + +Wed Nov 25 07:52:16 UTC 2009 Marcel Smit + + * bin/ciao_tests.lst: + Added !FIXED_BUGS_ONLY to Get_Connection_Test since the updater + is not working, yet. + + * connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp: + No need to write samples to activate the listener. + + * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: + * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: + Resolved compiler warnings. + +Tue Nov 24 19:34:00 UTC 2009 Johnny Willemsen + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: + + Resolved a bug whereby connection endpoints in the original plan + would be copied into two separate connections in a child plan. + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + + Bugfix with connection logic. + + * connectors/ami4ccm/examples/Hello/AMI/AMI.idl: + * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h: + * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp: + * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl: + * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.mpc: + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl: + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: + * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: + * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: + + Ported to new local interface support. + +Mon Dec 7 18:21:43 UTC 2009 William R. Otte + + * docs/schema/Basic_Deployment_Data.xsd: + * tools/Config_Handlers/Basic_Deployment_Data.cpp: + * tools/Config_Handlers/Basic_Deployment_Data.hpp: + * tools/Config_Handlers/CPD_Handler.cpp: + * tools/Config_Handlers/DnC_Dump.cpp: + * tools/Config_Handlers/PSPE_Handler.cpp: + + Config handler updates. + +Mon Dec 7 17:51:30 UTC 2009 William R. Otte + + * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.idl: + * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc: + * tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.h: + * tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.cpp: + * tests/CIAO_ComponentServer/Local_Facet/client.cpp: + * tests/CIAO_ComponentServer/Local_Facet/run_test.pl: + + Added simple test for local facet connection logic. + +Mon Dec 7 17:04:43 UTC 2009 William R. Otte + + * tests/CIAO_ComponentServer/Local_Facet: + + Moved local facet test under ComponentServer. + + * tests/IDL_Test/Local_Facet: + + Removed these files. + +Mon Dec 7 14:52:43 UTC 2009 William R. Otte + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + * ciao/ComponentServer/CIAO_Container_Impl.h: + * ciao/ComponentServer/CIAO_Container_Impl.cpp: + * ciao/Containers/Session/Session_Container.cpp: + + Integration. + +Mon Dec 7 14:11:14 UTC 2009 William R. Otte + + * ciao/ComponentServer/CIAO_ComponentServer.idl: + * ciao/ComponentServer/CIAO_Container_Impl.h: + * ciao/ComponentServer/CIAO_Container_Impl.cpp: + * ciao/Containers/Container_Base.idl: + * ciao/Containers/Session/Session_Container.h: + * ciao/Containers/Session/Session_Container.cpp: + * ciao/Servants/Servant_Impl_Base.h: + + Container code. + +Sat Dec 5 05:33:43 UTC 2009 William R. Otte + + * DAnCE/Deployment/Deployment_DeploymentPlan.idl: + * DAnCE/NodeApplication/NodeApplication_Impl.h: + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + + Infrastructure to connect local interfaces. + + * tests/IDL_Test/Local_Facet/Local_Facet.mpc: + + Enabled test. Local Variables: mode: change-log diff --git a/CIAO/ChangeLogs/ChangeLog-2010a b/CIAO/ChangeLogs/ChangeLog-2010a deleted file mode 100644 index b156adb47e4..00000000000 --- a/CIAO/ChangeLogs/ChangeLog-2010a +++ /dev/null @@ -1,9061 +0,0 @@ -Wed Mar 03 01:18:08 CST 2010 Johnny Willemsen - - * CIAO version 0.7.7 released. - -Mon Mar 1 22:49:52 UTC 2010 William Otte - - * docs/OMG-CCM-Tutorial.ppt: - * DAnCE/docs/OMG-DnC-Tutorial.ppt: - - Split OMG-CCM-Tutorial into CIAO and DAnCE parts to - make for more manageably sized documents. Provided - updates to the DnC tutorial. - -Mon Mar 1 19:38:29 UTC 2010 Jeff Parsons - - * ccm/CCM.mpc: - - Removed the application of the -Ssi IDL compiler option to - Navigation.idl and Receptacles.idl, so that their direct - collocation related code can be compiled for a specialized - build that tests the direct collocation code generation - option. - -Mon Mar 1 10:00:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - Fixed versioned namespace builds - -Sun Feb 28 23:13:23 UTC 2010 William R. Otte - - * DAnCE/MPC/config/dance_domainapplicationmanager.mpb: - - Link error on static linux builds. - -Fri Feb 26 15:54:33 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_DP.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/MultiplexConnectionExplicitHome_NS_PL_SP.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_DP.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimplexConnectionExplicitHome_NS_PL_SP.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - - Expanded NS/PlanLocality testing merged in, converted this test - to use dance_plan_launcher. - * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp: - - Removed these files as they are no longer needed for above test. - -Fri Feb 26 13:08:03 UTC 2010 William R. Otte - - * DAnCE/tools/Convert_Plan/Convert_Plan.mpc: - * DAnCE/tools/Split_Plan/Split_Plan.mpc: - - Avoids ace_for_tao, as Convert_Plan requires file connector. - -Fri Feb 26 12:37:53 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Unicode compile error. - -Fri Feb 26 08:27:17 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_impl.mpb: - When ndds nor dds4ccm_ndds is set, no need to compile - the derived projects. - -Fri Feb 26 07:40:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - Optimized doxygen. - -Thu Feb 25 20:03:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp - * connectors/dds4ccm/impl/ndds/QueryCondition.h - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp - * connectors/dds4ccm/impl/ndds/ReadCondition.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/Topic.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp - * connectors/dds4ccm/impl/ndds/TopicListener.cpp - Set of cleanup of the core library. More will come after the release - of x.7.7. The code is at a much better level than with x.7.6 but - not at the level we aimed for x.7.7 because that was scheduled for - the end of March - -Thu Feb 25 16:23:49 UTC 2010 William R. Otte - - * NEWS: - Added news entries. - -Thu Feb 25 16:20:27 UTC 2010 William R. Otte - - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h: - Compile error fix. - -Thu Feb 25 15:47:16 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - Optimized logging regarding query condition. - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - Optimized Doxygen documentation. - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Resolved compile error when QueryConditions are - enabled. - -Thu Feb 25 13:28:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - Added doxygen documentation. - -Thu Feb 25 12:48:30 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Optimized get_one. Return false when DDS returns - DDS_RETCODE_NO_DATA (instead of throwing an exception). - -Thu Feb 25 12:43:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - Layout changes. - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Resolve runtime errors. - -Thu Feb 25 11:24:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Reverted some of the last changes. - -Thu Feb 25 10:14:21 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_base.mpb: - When no features is set, all dds4cmm should require - dummy_label. - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Implemented some more Qos related methods. - -Thu Feb 25 09:08:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Implemented some get/set_qos methods. - -Thu Feb 25 08:32:54 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc: - Cleanup - -Thu Feb 25 08:29:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberQos.h: - Implemented set/get_qos methods. - -Thu Feb 25 08:16:54 UTC 2010 Johnny Willemsen - - * DAnCE/tools/Split_Plan/Split_Plan.mpc: - Added missing base projects - -Thu Feb 25 07:46:04 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Implemented methods wich were not implemented yet. - -Wed Feb 24 22:08:45 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Additional cleanup. - -Wed Feb 24 15:23:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Resolved compiler errors. - -Wed Feb 24 15:01:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h: - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderListener.h: - * connectors/dds4ccm/impl/ndds/DataReaderQos.h: - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriterListener.h: - * connectors/dds4ccm/impl/ndds/DataWriterQos.h: - * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h: - * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h: - * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h: - * connectors/dds4ccm/impl/ndds/Duration_t.h: - * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h: - * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h: - * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h: - * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h: - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h: - * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h: - * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h: - * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h: - * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h: - * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h: - * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h: - * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h: - * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h: - * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h: - * connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h: - * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/Publisher.h: - * connectors/dds4ccm/impl/ndds/PublisherListener.h: - * connectors/dds4ccm/impl/ndds/PublisherQos.h: - * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h: - * connectors/dds4ccm/impl/ndds/QueryCondition.h: - * connectors/dds4ccm/impl/ndds/ReadCondition.h: - * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h: - * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h: - * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h: - * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h: - * connectors/dds4ccm/impl/ndds/SampleLostStatus.h: - * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h: - * connectors/dds4ccm/impl/ndds/StatusCondition.h: - * connectors/dds4ccm/impl/ndds/StringSeq.h: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener.h: - * connectors/dds4ccm/impl/ndds/SubscriberQos.h: - * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h: - * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h: - * connectors/dds4ccm/impl/ndds/Time_t.h: - * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/TopicListener.h: - * connectors/dds4ccm/impl/ndds/TopicQos.h: - * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h: - * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h: - * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h: - Implemented Qos operators and renamed header defines. - -Wed Feb 24 14:36:37 UTC 2010 William R. Otte - - * DAnCE/tools/Split_Plan/Split_Plan_impl.h: - - Fuzz fix. - -Wed Feb 24 13:21:52 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Removed all lem interfaces - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Fixed compile errors - - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: - Some callbacks are ndds specific - -Wed Feb 24 11:43:52 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - ndds needs no-strict-aliasing - -Wed Feb 24 11:39:52 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.h - More cleanup - -Wed Feb 24 11:26:52 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener.h - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener.h - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h - * connectors/dds4ccm/impl/ndds/Getter_T.cpp - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/Publisher.h - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.h - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp - * connectors/dds4ccm/impl/ndds/QueryCondition.h - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp - * connectors/dds4ccm/impl/ndds/ReadCondition.h - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.h - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.h - * connectors/dds4ccm/impl/ndds/Topic.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp - * connectors/dds4ccm/impl/ndds/Updater_T.cpp - * connectors/dds4ccm/impl/ndds/Updater_T.h - * connectors/dds4ccm/impl/ndds/Writer_T.cpp - * connectors/dds4ccm/impl/ndds/Writer_T.h - Cleaning up the implementation - -Wed Feb 24 10:45:52 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/Reader_T.h - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp - * connectors/dds4ccm/impl/ndds/StatusCondition.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Topic.cpp - * connectors/dds4ccm/impl/ndds/Topic.h - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.h - * connectors/dds4ccm/impl/ndds/TopicListener.cpp - * connectors/dds4ccm/impl/ndds/TopicListener.h - Cleaning up the implementation - -Wed Feb 24 08:09:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - Resolved compiler warnings on Linux. - -Wed Feb 24 08:06:47 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/Utils.h: - Resolved compiler warnings. Also removed unnecessary - space characters. - -Wed Feb 24 07:28:52 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/DataReaderQos.h - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener.h - * connectors/dds4ccm/impl/ndds/DataWriterQos.h - * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h - * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h - * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h - * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h - * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h - * connectors/dds4ccm/impl/ndds/Duration_t.h - * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h - * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h - * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h - * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h - * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h - * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h - * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h - * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h - * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h - * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h - * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h - * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h - * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h - * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h - * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h - * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h - * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.h - * connectors/dds4ccm/impl/ndds/PublisherQos.h - * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp - * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h - * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h - * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h - * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h - * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h - * connectors/dds4ccm/impl/ndds/SampleInfo.h - * connectors/dds4ccm/impl/ndds/SampleLostStatus.h - * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h - * connectors/dds4ccm/impl/ndds/StringSeq.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.h - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.h - * connectors/dds4ccm/impl/ndds/SubscriberQos.h - * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h - * connectors/dds4ccm/impl/ndds/Time_t.h - * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h - * connectors/dds4ccm/impl/ndds/TimeUtilities.h - * connectors/dds4ccm/impl/ndds/Topic.cpp - * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h - * connectors/dds4ccm/impl/ndds/TopicDescription.h - * connectors/dds4ccm/impl/ndds/TopicListener.cpp - * connectors/dds4ccm/impl/ndds/TopicQos.h - * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h - * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h - * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h - Guarded all RTI specific code - - * MPC/config/dds4ccm.mpb: - Don't compile anything related to dds4ccm when we don't have - a dds vendor installed - -Tue Feb 23 21:49:52 UTC 2010 William R. Otte - - * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp: - - Rogue letter was causing a compile error. - -Tue Feb 23 16:22:42 UTC 2010 William R. Otte - - * DAnCE/MPC/config/dance_convert_plan.mpb: - * DAnCE/MPC/config/dance_split_plan.mpb: - * DAnCE/MPC/config/dance_tools.mpb: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan.mpc: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: - * DAnCE/tools/Split_Plan/Split_Plan.mpc: - * DAnCE/tools/Split_Plan/Split_Plan.cpp: - * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp: - - Fuzz fixes. - -Tue Feb 23 16:13:24 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Bugfix for how connections are handled when there are two - internalEndpoints but it is _not_ a local conneciton. - - * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp: - * examples/Hello/descriptors/PlanLocality_SameProcess.cdp: - - Corrected IOR file so test script finds controller. - -Tue Feb 23 15:33:33 UTC 2010 Abdul Sowayan - - * DAnCE/tools/Convert_Plan/Convert_Plan.mpc: - - Added dance_config_handlers as a base project to DAnCE_Convert_Plan - project. Thanks to William Otte for the suggestion. - -Tue Feb 23 15:16:24 UTC 2010 William R. Otte - - * DAnCE/ExecutionManager/ExecutionManager.mpc: - - Added split_plan base project. - -Tue Feb 23 14:54:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - Inserted forgotten new line character. - -Tue Feb 23 14:46:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp: - Resolved deployment errors related to generation of the connector - code. - -Tue Feb 23 14:34:59 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - CSLUnexpStat is not ready, yet. - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Layout changes. - - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: - Resolved deployment errors related to generation of the connector - code. - -Tue Feb 23 14:28:22 UTC 2010 William R. Otte - - * DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h: - - Missing file. - -Tue Feb 23 13:25:49 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl - Added various pragma's - - * connectors/dds4ccm/idl/dds4ccm.mpc - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h - * connectors/dds4ccm/impl/ndds/Getter_T.h - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h - * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h - * connectors/dds4ccm/impl/ndds/Publisher.h - * connectors/dds4ccm/impl/ndds/PublisherListener.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h - * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h - * connectors/dds4ccm/impl/ndds/StringSeq.h - * connectors/dds4ccm/impl/ndds/Subscriber.h - * MPC/config/ciaoidldefaults.mpb - * MPC/config/componentidldefaults.mpb - Portability changes - -Tue Feb 23 14:08:20 UTC 2010 William R. Otte - - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Use the split plan library instead of internal split plan impl. - - * DAnCE/MPC/config/dance_convert_plan.mpb: - * DAnCE/MPC/config/dance_split_plan.mpb: - * DAnCE/MPC/config/dance_tools.mpb: - - Base projects for convert_plan/split_plan. - - * DAnCE/tools: - * DAnCE/tools/Convert_Plan: - * DAnCE/tools/Convert_Plan/Convert_Plan.cpp: - * DAnCE/tools/Convert_Plan/Convert_Plan.mpc: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h: - * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp: - - Tool allowing validation/conversion of XML deployment plans to - CDR. - - * DAnCE/tools/Split_Plan: - * DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h: - * DAnCE/tools/Split_Plan/Split_Plan.mpc: - * DAnCE/tools/Split_Plan/Split_Plan.cpp: - * DAnCE/tools/Split_Plan/Split_Plan_impl.h: - * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp: - - Tool allowing users to split plans into locality constrained - partitions. Also contains important bugfixes for process - colocation. - -Tue Feb 23 13:40:49 UTC 2010 Johnny Willemsen - - * bin/ciao_tests.lst: - Added new 3832 tests - - * ciao/Logger/Logger_Service.cpp: - * ciao/Logger/Logger_Service.h: - * DAnCE/Logger/Logger_Service.cpp: - * DAnCE/Logger/Logger_Service.h: - Fixed service config macros which caused this service not - to get loaded on linux - - * tests/Bug_3832_Regression/* - * DAnCE/tests/Bug_3832_Regression/* - Added new test for 3832 - -Tue Feb 23 12:45:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/logger/Log_Macros.h: - * connectors/dds4ccm/impl/logger/Log_Macros.cpp: - Making use of the CIAO_Debug_Level flag of the - CIAO logging framework. - -Tue Feb 23 11:54:21 UTC 2010 Marcel Smit - - * MPC/config/dds4ccm_impl.mpb: - * MPC/config/dds4ccm_logger.mpb: - * connectors/dds4ccm/impl/logger: - * connectors/dds4ccm/impl/logger/Log_Macros.h: - * connectors/dds4ccm/impl/logger/Log_Macros.cpp: - * connectors/dds4ccm/impl/logger/Logger.mpc: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - * connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp: - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Updater_T.cpp: - * connectors/dds4ccm/impl/ndds/Writer_T.cpp: - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: - * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: - Created DDS4CCM_DEBUG, DDS4CCM_TRACE and DDS4CCM_ERROR macros. - For now these macros make use of the CIAO logging framework. In - the future, DDS4CCM should have it's own logging framework. - -Tue Feb 23 09:26:15 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Refactored get_one, making use of the read_w_condition - API method. - -Tue Feb 23 08:50:49 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl: - Added missing pragma - - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc: - Disabled this project for the moment, rtiddsgen can't handle this - -Tue Feb 23 07:47:49 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc - Updated to generate connector - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.cpp - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.h - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.cpp - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.h - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.cpp - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.h - removed - -Tue Feb 23 07:22:49 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc - * connectors/dds4ccm/idl/dds4ccm.mpc - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp - * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.h - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/DataWriterListener.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h - * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h - * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h - * connectors/dds4ccm/impl/ndds/Publisher.h - * connectors/dds4ccm/impl/ndds/PublisherListener.h - * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h - * connectors/dds4ccm/impl/ndds/QueryCondition.h - * connectors/dds4ccm/impl/ndds/ReadCondition.h - * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h - * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h - * connectors/dds4ccm/impl/ndds/StatusCondition.h - * connectors/dds4ccm/impl/ndds/Subscriber.h - * connectors/dds4ccm/impl/ndds/SubscriberListener.h - * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h - * connectors/dds4ccm/impl/ndds/TopicDescription.h - * connectors/dds4ccm/impl/ndds/TopicListener.h - * connectors/dds4ccm/impl/ndds/Utils.h - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc - * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc - * MPC/config/connectoridldefaults.mpb - * MPC/config/dds4ccm.mpb - * MPC/config/dds4ccm_base.mpb - * MPC/config/dds4ccm_ts_default.mpb - More portability changes - -Tue Feb 23 04:44:49 UTC 2010 William R. Otte - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp: - - Tests to excercise process colocation when passed through the - EM. - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - - Test script was broken and not actually running tests. - -Tue Feb 23 04:05:06 UTC 2010 William R. Otte - - * DAnCE/bin/PythonDAnCE/generator/__init__.py: - * DAnCE/bin/PythonDAnCE/generator/comp_impl.py: - * DAnCE/bin/PythonDAnCE/generator/comp_inst.py: - * DAnCE/bin/PythonDAnCE/generator/config_prop.py: - * DAnCE/bin/PythonDAnCE/generator/connection.py: - * DAnCE/bin/PythonDAnCE/generator/deploy_requirement.py: - * DAnCE/bin/PythonDAnCE/generator/external_reference.py: - * DAnCE/bin/PythonDAnCE/generator/internal_endpoint.py: - * DAnCE/bin/generate_plan.py: - - Improvements to allow more expressive plan generation. - -Tue Feb 23 04:03:46 UTC 2010 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Additional error checking, and an improvements to how - colocation groups with NoConstraint are handled. - -Tue Feb 23 02:55:31 UTC 2010 Abdul Sowayan - - * examples/Hello/descriptors/NodeMap.dat: - * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp: - * examples/Hello/descriptors/PlanLocality_SameProcess.cdp: - * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl: - * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: - - Added the files above to test PlanLocality feature. - -Tue Feb 23 02:39:25 UTC 2010 Abdul Sowayan - - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Receiver/Receiver_exec.cpp: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - - Update this example. It was out of date and as such, it - wouldn't work with CoSMIC generated descriptors (due - to missing entry points). - -Mon Feb 22 22:13:59 UTC 2010 Abdul Sowayan - - * examples/Null_Component/descriptors/NodeMap.dat: - - Changed port number. - - * examples/Null_Component/descriptors/run_test_without_ns.pl: - - Enhanced this script so it would deploy all cdps (component deployment plans) - that are in the directory. - -Mon Feb 22 21:39:08 UTC 2010 Abdul Sowayan - - * examples/Null_Component/descriptors/Null_PlanLocality_DifferentProcesses.cdp: - * examples/Null_Component/descriptors/Null_PlanLocality_SameProcess.cdp: - Add a couple of deployment plans to test the PlanLocality feature. - -Mon Feb 22 20:48:36 UTC 2010 Abdul Sowayan - - * examples/Null_Component/descriptors/NodeMap.dat: - * examples/Null_Component_Glfa/descriptors/NodeMap.dat: - - Fixed a small bug in these files. - - * examples/Null_Component/descriptors/run_test_without_ns.pl: - - Added a new test to deploy this example without using the naming service. - - * bin/ciao_tests.lst: - - Add run_test_without_ns.pl to the daily regression tests. - -Feb 22 14:26:16 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl: - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl: - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: - Extended test with an extra connector which handles a fixed - size struct. - -Mon Feb 22 13:48:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl - Updated rti typesupport to ndds typesupport, everywhere we talk - about ndds - -Mon Feb 22 13:39:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h - * connectors/dds4ccm/impl/ndds/DataReader.h - * connectors/dds4ccm/impl/ndds/DataWriter.h - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/Duration_t.h - * connectors/dds4ccm/impl/ndds/Getter_T.h - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h - * connectors/dds4ccm/impl/ndds/QueryCondition.h - * connectors/dds4ccm/impl/ndds/Reader_T.h - * connectors/dds4ccm/impl/ndds/SampleInfo.h - * connectors/dds4ccm/impl/ndds/Subscriber.h - * connectors/dds4ccm/impl/ndds/Time_t.h - * connectors/dds4ccm/impl/ndds/Topic.h - Portability improvements - - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl: - Updated typesupport - -Mon Feb 22 12:47:38 UTC 2010 Johnny Willemsen - - * DAnCE/MPC/config/dance_nodeapplication.mpb - * DAnCE/NodeApplication/NodeApplication.mpc - Corrected after - -Mon Feb 22 12:46:38 UTC 2010 Johnny Willemsen - - * DAnCE/MPC/config/dance_nodeapplicationmanager.mpb - * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc - Corrected after - -Mon Feb 22 12:36:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc - Added empty source files to not pickup files that are already generated - by other projects in the same directory - -Mon Feb 22 12:30:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc - Removed nddslib as base project - - * MPC/config/dds4ccm_base.mpb: - Added nddslib as base project - -Mon Feb 22 12:25:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - Layout changes - -Mon Feb 22 12:11:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc - Fixed casing problems - -Mon Feb 22 11:37:38 UTC 2010 Johnny Willemsen - - Reverted change below - -Mon Feb 22 10:34:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc - Added custom_only=1 - -Mon Feb 22 10:16:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h: - Updated ifdef guards - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc: - Layout changes - - * MPC/config/dds4ccm_base.mpb: - * MPC/config/dds4ccm_impl.mpb: - Simplified thse projects - -Mon Feb 22 09:49:50 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc: - Resolved MPC-warning. - -Mon Feb 22 09:29:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc - * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc - Use the new dds4ccm_ts_defaults base project - -Mon Feb 22 08:29:03 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - Created typedefs of templated classes. - -Mon Feb 22 08:21:57 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - Using the ACE_NEW_* macros (instead of C++ new). - -Mon Feb 22 08:22:38 UTC 2010 Johnny Willemsen - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - Layout change - - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp - * DAnCE/RepositoryManager/RepositoryManager.cpp - Shutdown the orb - - * MPC/config/connectoridldefaults.mpb: - No executor header file for a connector - -Mon Feb 22 08:20:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Layout and const changes - -Mon Feb 22 07:18:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc - Simplified these base projects - -Sun Feb 21 09:24:38 UTC 2010 Johnny Willemsen - - * ChangeLogs/*: - Use full year - -Sat Feb 20 20:31:38 UTC 2010 Johnny Willemsen - - * MPC/config/dds4ccm_ts_default.mpb: - New base project for dds4ccm dds type support generation. This - base project will be soon be used for all dds4ccm examples and - tests. The typesupport files will now be linked together with - the tao type code to one shared library. dds4ccm should work - on the long term with multiple dds implementations, the fact - that you have an implementation doesn't mean you want to use - it with dds4ccm. with the new features dds4ccm_ndds, dds4ccm_opendds, - and dds4ccm_splice you can control which dds vendor dds4ccm - should use. At this moment ndds is supported and tested - - Thanks to Adam Mitz for extending MPC to make this base - project possible - -Fri Feb 19 15:44:38 UTC 2010 Jeff Parsons - - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Added #include, newly required due to reordering of - #includes in the front end. - -Fri Feb 19 15:11:38 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - Improved AMI4CCM one step further - -Fri Feb 19 12:53:38 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - * connectors/dds4ccm/impl/ndds/Getter_T.cpp - * connectors/dds4ccm/impl/ndds/Getter_T.h - Added a boolean to the connectors to let the TAO_IDL - compiler generate whether we have a fixed or non fixed - type. The memory management is different and caused - compile and runtime problems with getter::get_one. - We now specialized the Getter::get_one method for - fixed and for non fixed types - -Fri Feb 19 11:53:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Implemented some more ACE_NEW_* macros. - -Fri Feb 19 11:29:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Implemented some more ACE_NEW_* macros. - -Fri Feb 19 10:51:49 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Changed value of RELIABLE_READER_ACTIVITY_CHANGED_STATUS. - - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - Prepared the test to receive the RELIABLE_READER_ACTIVITY_CHANGED_STATUS. - -Fri Feb 19 08:43:52 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TwoTopicsDifferentNs/*: - Added tests in order to test the TAO_IDL compliler. - -Fri Feb 19 08:35:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.cpp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.cpp - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.cpp - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.cpp - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.cpp - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.cpp - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.cpp - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.cpp - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.cpp - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h - Removed from the archive, generated by tao_idl from now - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl - * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl - * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl - Added RTI typesupport pragma - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc - * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc - Updated to let tao_idl generate the connector - -Thu Feb 18 16:07:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl - Added rti typesupport pragma - - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h - Removed from the archive - - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc - Updated to generate the connector - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp - Layout change - -Thu Feb 18 15:47:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/id3p_test/*: - Removed, obsolete - -Thu Feb 18 15:43:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl: - Added rti typesupport pragma - - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.cpp - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.cpp - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.h - Removed from the archive - - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc - Updated to generate the connector - -Thu Feb 18 15:36:06 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp: - Remove some tabs. - -Thu Feb 18 15:35:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc: - Updated to use tao_idl generation - - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h: - Removed from the archive - -Thu Feb 18 14:22:29 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener.cpp: - Implemented ACE_NEW_* macros. - -Thu Feb 18 13:48:20 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc: - Removed dummy label to enable compilation. - -Thu Feb 18 13:44:59 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc: - Removed dummy label. - - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Receiver/*: - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Sender/*: - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/descriptors/*: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Receiver/*: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Sender/*: - * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/descriptors/*: - Removed these files since this is there to capture compiler errors. - -Thu Feb 18 13:26:06 UTC 2010 Marijke Hnegstmengel - - * connectors/dds4ccm/performance-tests/Latency: - * connectors/dds4ccm/performance-tests/Latency/Base: - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc: - * connectors/dds4ccm/performance-tests/Latency/Connector: - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.idl: - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc: - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.h: - * connectors/dds4ccm/performance-tests/Latency/descriptors: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Latency/Receiver: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.idl: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Latency/Sender: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h: - First base of new latency test dds4ccm. - -Thu Feb 18 13:22:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Made better use of the ACE_NEW_* macros. - -Thu Feb 18 13:13:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Fixed gcc compile error - -Thu Feb 18 12:33:06 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Using the ACE_NEW_* marcros instead of the - regular C++ new. - -Thu Feb 18 11:36:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TwoTopics/*: - Test to check whether the generated exec code - compiles without errors when defining two topics - in one connector. - -Thu Feb 18 09:00:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/*: - Added test to test fixed size data. Fixed size data is handled - in a different way. This'll result in compliler errors when not - coded properly. - -Thu Feb 18 08:37:49 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated - - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Added some more tracing. - - * connectors/dds4ccm/tests/FixedSizeStruct/*: - Added test to test fixed size data. Fixed size data is handled - in a different way. This'll result in compliler errors when not - coded properly. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Improved the way the Receiver receives data. - -Thu Feb 18 08:30:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Fixed compile error with fixed size datatypes - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Layout and documentation fixes - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc: - No need for C.inl - -Wed Feb 17 15:24:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - Layout changes - - * DAnCE/DomainApplication/Domain_Application_Impl.cpp - * DAnCE/DomainApplication/Domain_Application_Impl.h - * DAnCE/DomainApplication/DomainApplication.mpc - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - Cleanup - -Wed Feb 17 13:57:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: - Deleted reactor member which is not needed here - - * DAnCE/NodeManager/Node_Manager_Module.h: - * DAnCE/RepositoryManager/Repository_Manager_Module.h: - Removed not needed include - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - Cleanup base projects - -Wed Feb 17 12:14:57 UTC 2010 Johnny Willemsen - - * DAnCE/MPC/config/dance_plan_generator.mpb - * DAnCE/Plan_Generator/PCVisitor.cpp - * DAnCE/Plan_Generator/PCVisitor.h - * DAnCE/Plan_Generator/PCVisitorBase.cpp - * DAnCE/Plan_Generator/PCVisitorBase.h - * DAnCE/Plan_Generator/PCVisitorBase.inl - * DAnCE/Plan_Generator/Plan_Generator.mpc - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp - * DAnCE/Plan_Generator/Plan_Generator_Impl.h - * DAnCE/Plan_Generator/Plan_Generator_Impl_Export.h - removed, not used at all - -Wed Feb 17 12:10:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl: - Added pragma - - * DAnCE/RepositoryManager/DAnCE_RepositoryManager_Module_Export.h: - Deleted - -Wed Feb 17 12:09:57 UTC 2010 Johnny Willemsen - - * DAnCE/NodeManager/Node_Manager_Module.h: - Removed obsolete header - - * DAnCE/MPC/config/dance_utils.mpb - * DAnCE/Utils - * DAnCE/Utils/DAnCE_Utils.mpc - * DAnCE/Utils/DAnCE_Utils_Export.h - * DAnCE/Utils/Plan_Handler.cpp - * DAnCE/Utils/Plan_Handler.h - Removed, not used at all - -Wed Feb 17 11:40:57 UTC 2010 Johnny Willemsen - - Cleanup of the repository manager - - * DAnCE/DAnCE/DAnCE_Loader.h: - * DAnCE/MPC/config/dance_repositorymanager.mpb: - * DAnCE/RepositoryManager/Repository_Manager_Admin_Export.h - Deleted - - * DAnCE/RepositoryManager/PC_Updater.h - * DAnCE/RepositoryManager/Repository_Manager.cpp - * DAnCE/RepositoryManager/repository_manager_admin.h - * DAnCE/RepositoryManager/Repository_Manager_Exec.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.h - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/RepositoryManager/RepositoryManager_Impl.h - * DAnCE/RepositoryManager/RM_Helper.h - * DAnCE/RepositoryManager/URL_Parser.h - Cleanup - -Wed Feb 17 11:20:57 UTC 2010 Johnny Willemsen - - Cleanup of the target manager - - * DAnCE/MPC/config/dance_nodemanager.mpb: - * DAnCE/MPC/config/dance_targetmanager.mpb - Deleted, obsolete - - * DAnCE/NodeApplication/NodeApplication.mpc: - * DAnCE/RepositoryManager/RM_Helper.h: - * DAnCE/TargetManager/ResourceCommitmentManager.h: - layout change - - * DAnCE/NodeManager/NodeManager.mpc: - Reduced dependency - - * DAnCE/TargetManager/Target_Manager_Exec.cpp - * DAnCE/TargetManager/Target_Manager_Module_export.h - * DAnCE/TargetManager/TargetManager_Impl_export.h - Deleted from the archive - - * DAnCE/TargetManager/Target_Manager.cpp - * DAnCE/TargetManager/Target_Manager_Module.cpp - * DAnCE/TargetManager/Target_Manager_Module.h - * DAnCE/TargetManager/TargetManager.mpc - * DAnCE/TargetManager/TargetManager_Impl.cpp - * DAnCE/TargetManager/TargetManager_Impl.h - Simplified and cleanup - -Wed Feb 17 10:54:57 UTC 2010 Johnny Willemsen - - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/TM_Client.mpc - Moved to DAnCE/tests/TargetManager - -Wed Feb 17 09:49:35 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Stopping time when the run actualy starts. - -Wed Feb 17 09:41:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl: - Added rti typesupport trait - - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc: - Updated to use tao_idl generated connector - - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.cpp: - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h: - Removed from the archive - -Wed Feb 17 09:36:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Check whether the get_listener returns nil. - - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: - Improved implementation. Sometimes unregister_handles hangs in - a never ending loop. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Improved implementation. Polling for the last sample in DDS now - is done using the reactor thread. - -Wed Feb 17 09:21:57 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.cpp: - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h: - Deleted, generated by tao_idl now - -Wed Feb 17 09:07:57 UTC 2010 Johnny Willemsen - - Simplified NodeManager - - * DAnCE/NodeManager/DAnCE_NodeManager_Module_Export.h - * DAnCE/NodeManager/Node_Manager_Exec.cpp - * DAnCE/NodeManager/NodeManager_Export.h - Removed - - * DAnCE/NodeManager/Node_Manager.cpp - * DAnCE/NodeManager/Node_Manager_Module.cpp - * DAnCE/NodeManager/Node_Manager_Module.h - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/NodeManager/NodeManager_Impl.h - Simplified - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - Fixed warning - -Tue Feb 16 20:34:27 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/idl/dds4ccm_Connector.idl: - - Removed the line '#define connector component' since we - now have backend and frontend connector support. - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc: - - Modified projects to generate and compile the - connector implementation. - - * examples/BasicSP/BMClosedED/BMClosedED.idl: - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Cosmetic changes. - -Tue Feb 16 20:04:57 UTC 2010 Johnny Willemsen - - Simplified execution manager - - * DAnCE/ExecutionManager/DAnCE_ExecutionManager_Module_Export.h - * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp - * DAnCE/ExecutionManager/ExecutionManager_Export.h - Removed - - * DAnCE/ExecutionManager/Execution_Manager.cpp - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - * DAnCE/ExecutionManager/ExecutionManager_Module.h - Simplified - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp: - Layout changes - -Tue Feb 16 19:33:57 UTC 2010 Johnny Willemsen - - Simplified the plan_launcher, it was way to complex to - build - - * DAnCE/MPC/config/dance_plan_launcher.mpb - * DAnCE/MPC/config/dance_plan_launcher_base.mpb - * DAnCE/Plan_Launcher/Plan_Launcher.h - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_Export.h - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module_Export.h - * DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Module.h - * DAnCE/Plan_Launcher/Plan_Launcher_Module_Export.h - * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp - Deleted, all not used - - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h - Updated to contain the Plan_Launcher implementation and main - -Tue Feb 16 18:45:57 UTC 2010 Johnny Willemsen - - * DAnCE/Plan_Launcher/launcher.cpp: - Removed, not used - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h: - Layout changes - -Tue Feb 16 18:04:57 UTC 2010 Johnny Willemsen - - * DAnCE/DAnCE/CIAO_ExecutionManagerDaemon.idl - * DAnCE/DAnCE/CIAO_Interfaces.mpc - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/MPC/config/ciao_executionmanager_skel.mpb - * DAnCE/MPC/config/ciao_executionmanager_stub.mpb - * DAnCE/RepositoryManager/RepositoryManager.cpp - Removed shutdown method, it was not used and a non spec interface - -Tue Feb 16 15:48:57 UTC 2010 Johnny Willemsen - - * DAnCE/DAnCE/DAnCE_Properties.mpc: - Added mpc file which should have been committed earlier today - -Tue Feb 16 13:08:57 UTC 2010 Marijke Hemgstmengel - - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/README: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: - Add attribute number_of_subscribers, made different test scripts. - -Tue Feb 16 12:47:57 UTC 2010 Johnny Willemsen - - * DAnCE/Config_Handlers/Config_Handlers.mpc - * DAnCE/DAnCE/DAnCE_Loader.h - * DAnCE/DAnCE/DAnCE_Properties.idl - * DAnCE/DAnCE/Deployment_common.h - * DAnCE/Deployment/DAnCE_Core.mpc - * DAnCE/Deployment/DAnCE_Loader.h - * DAnCE/Deployment/DAnCE_Properties.idl - * DAnCE/Deployment/Deployment.idl - * DAnCE/Deployment/Deployment_Application.idl - * DAnCE/Deployment/Deployment_ApplicationManager.idl - * DAnCE/Deployment/Deployment_Base.idl - * DAnCE/Deployment/Deployment_common.h - * DAnCE/Deployment/Deployment_DeploymentPlan.idl - * DAnCE/Deployment/Deployment_NodeManager.idl - * DAnCE/Deployment/Deployment_Packaging_Data.idl - * DAnCE/Deployment/Deployment_RepositoryManager.idl - * DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl - * DAnCE/Deployment/Deployment_stub_export.h - * DAnCE/Deployment/Deployment_svnt_export.h - * DAnCE/Deployment/Deployment_TargetData.idl - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - * DAnCE/NodeApplication/NodeApplication.mpc - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeManager/Node_Manager_Module.cpp - * DAnCE/NodeManager/Node_Manager_Module.h - * DAnCE/NodeManager/NodeManager_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.h - * DAnCE/TargetManager/Target_Manager_Module.cpp - * DAnCE/TargetManager/Target_Manager_Module.h - Removed DAnCE/Deployment to just contain the spec compliant IDL, - non compliant parts have been moved to DAnCE/DAnCE. All using - code has been updated. We did found some problems in the OMG IDL - 07-02-01 which has been reported to the OMG: - - LastConfiguration and InvalidReference are listed in 07-02-01 - but not used at all. - - PlanLocalityKind members have a Plan prefix to resolve a conflict - with LocalityKind::SameProcess. - All extensions for DDS4CCM have now a comment indicating that - -Tue Feb 16 12:32:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: - Resolved shutdown errors. - -Tue Feb 16 10:54:26 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp: - Added data listener and test thread switch for this - data listener. - -Tue Feb 16 09:45:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Improved code for thread switch. - - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Removed reader implementation since it's unnecessary. Also - optimized logging. - - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp: - Improved logging. - -Tue Feb 16 08:23:57 UTC 2010 Johnny Willemsen - - * DAnCE/Config_Handlers/Config_Handlers.mpc - * DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc - * DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * DAnCE/Deployment/DAnCE_Core.mpc - * DAnCE/DomainApplication/DomainApplication.mpc - * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc - * DAnCE/ExecutionManager/ExecutionManager.mpc - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/MPC/config/ciao_config_handlers.mpb - * DAnCE/MPC/config/ciao_config_handlers_base.mpb - * DAnCE/MPC/config/ciao_nodeapplication.mpb - * DAnCE/MPC/config/ciao_nodeapplicationmanager.mpb - * DAnCE/MPC/config/ciao_plan_generator.mpb - * DAnCE/MPC/config/ciao_targetmanager_stub.mpb - * DAnCE/MPC/config/ciao_targetmanager_svnt.mpb - * DAnCE/MPC/config/dance_applicationmanager_skel.mpb - * DAnCE/MPC/config/dance_component_server.mpb - * DAnCE/MPC/config/dance_component_server_svnt.mpb - * DAnCE/MPC/config/dance_config_handlers.mpb - * DAnCE/MPC/config/dance_config_handlers_base.mpb - * DAnCE/MPC/config/dance_deployment_skel.mpb - * DAnCE/MPC/config/dance_deployment_svnt.mpb - * DAnCE/MPC/config/dance_domainapplication_skel.mpb - * DAnCE/MPC/config/dance_executionmanager_skel.mpb - * DAnCE/MPC/config/dance_extension_stub.mpb - * DAnCE/MPC/config/dance_nodeapplication_skel.mpb - * DAnCE/MPC/config/dance_nodemanager_skel.mpb - * DAnCE/MPC/config/dance_nodemanager_svnt.mpb - * DAnCE/MPC/config/dance_output.mpb - * DAnCE/MPC/config/dance_plan_generator.mpb - * DAnCE/MPC/config/dance_repositorymanager.mpb - * DAnCE/MPC/config/dance_repositorymanager_skel.mpb - * DAnCE/MPC/config/dance_targetmanager.mpb - * DAnCE/MPC/config/dance_targetmanager_skel.mpb - * DAnCE/MPC/config/dance_tm_daemon.mpb - * DAnCE/NodeApplication/NodeApplication.mpc - * DAnCE/NodeManager/NodeManager.mpc - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/TargetManager/TargetManager.mpc - * DAnCE/TargetManager/TM_Client.mpc - * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc - * DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc - * DAnCE/tests/Config_Handlers/Config_Handlers.mpc - * DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc - * DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc - * DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc - * DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc - * DAnCE/Utils/DAnCE_Utils.mpc - Cleanup of DAnCE base projects - -Mon Feb 15 19:48:57 UTC 2010 Johnny Willemsen - - * DAnCE/DAnCE - * DAnCE/DAnCE/CIAO_Interfaces.mpc - * DAnCE/DAnCE/CIAO_NodeManagerDaemon.idl - * DAnCE/Deployment/ciao - * DAnCE/Deployment/ciao/CIAO_ExecutionManagerDaemon.idl - * DAnCE/Deployment/ciao/CIAO_Interfaces.mpc - * DAnCE/Deployment/ciao/CIAO_NodeManagerDaemon.idl - * DAnCE/Deployment/ciao/Module_Main.h - * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/MPC/config/ciao_nodemanager_skel.mpb - * DAnCE/MPC/config/ciao_nodemanager_stub.mpb - * DAnCE/NodeManager/Node_Manager_Exec.cpp - * DAnCE/NodeManager/NodeManager_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp - * DAnCE/RepositoryManager/Repository_Manager_Exec.cpp - * DAnCE/TargetManager/Target_Manager_Exec.cpp - * DAnCE/TargetManager/TM_Client.mpc - Moved DAnCE/Deployment/ciao to DAnCE/DAnCE and removed the - CIAO_NodeManagerDeamon interface, it was not used at all - -Mon Feb 15 19:05:57 UTC 2010 Johnny Willemsen - - * DAnCE/Deployment/ciao/CIAO_NodeManagerDaemon.idl: - Fixed comments and removed commented out stuff - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/TargetManager/Target_Manager_Module.cpp - Fixed typo in comment - - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - Fixed warning - - * DAnCE/RepositoryManager/PC_Updater.cpp: - * DAnCE/RepositoryManager/PC_Updater.h - Layout and documentation fixes - - * DAnCE/RepositoryManager/repository_manager_admin.cpp: - Unicode fixes - - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.h - Removed not used servant map - - * DAnCE/RepositoryManager/RepositoryManager.cpp: - Doxygen fixes - - * DAnCE/RepositoryManager/RepositoryManager_Impl.h: - * DAnCE/RepositoryManager/RM_Helper.cpp - * DAnCE/RepositoryManager/RM_Helper.h - Layout changes - - * DAnCE/TargetManager/DAnCE_TargetManagerDaemon.idl: - Removed, this interface was used, but not implemented at all - - * DAnCE/TargetManager/TargetManager.mpc: - Removed obsolete projects - - * DAnCE/TargetManager/TargetManager_Impl.cpp - * DAnCE/TargetManager/TargetManager_Impl.h - removed not used shutdown - -Mon Feb 15 14:04:57 UTC 2010 Johnny Willemsen - - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/TargetManager/DomainDataManager.cpp - * DAnCE/TargetManager/DomainDataManager.h - * DAnCE/TargetManager/ResourceCommitmentManager.cpp - * DAnCE/TargetManager/ResourceCommitmentManager.h - * DAnCE/TargetManager/TargetManager_Impl.cpp - Various code improvements - -Mon Feb 15 13:32:57 UTC 2010 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/NodeManager/NodeManager_Impl.h: - Various code improvements - -Mon Feb 15 13:20:10 UTC 2010 Marcel Smit - - * DAnCE/DomainApplication/Domain_Application_Impl.cpp: - Throwing exception when errors occur during shutdown. - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - New line appended to log message. - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp: - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - Throwing and catching exceptions when errors occur - during shutdown. When errors occur, ccm_remove is not - invoked and when it isn't, tests seems to be ok while they're - not. - - * connectors/dds4ccm/docs/ccm_dds.idl: - Layout changes. - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Added trace. - - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Optimized logging. - -Mon Feb 15 13:15:57 UTC 2010 Johnny Willemsen - - * DAnCE/TargetManager/TargetManager_exec.cpp: - * DAnCE/TargetManager/TargetManager_exec.h: - Removed, not used - - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h - * DAnCE/TargetManager/DomainDataManager.cpp - * DAnCE/TargetManager/DomainDataManager.h - * DAnCE/TargetManager/ResourceCommitmentManager.cpp - Reduced includes and dependencies - -Mon Feb 15 12:50:57 UTC 2010 Johnny Willemsen - - * DAnCE/Deployment/ciao - * DAnCE/Deployment/ciao/CIAO_ExecutionManagerDaemon.idl - * DAnCE/Deployment/ciao/CIAO_Interfaces.mpc - * DAnCE/Deployment/ciao/CIAO_NodeManagerDaemon.idl - * DAnCE/Deployment/ciao/Module_Main.h - * DAnCE/Deployment/CIAO_ExecutionManagerDaemon.idl - * DAnCE/Deployment/CIAO_Interfaces.mpc - * DAnCE/Deployment/CIAO_NodeManagerDaemon.idl - * DAnCE/Deployment/DAnCE_Core.mpc - * DAnCE/Deployment/Deployment_common.h - * DAnCE/Deployment/Deployment_NodeManager.idl - * DAnCE/Deployment/Module_Main.h - * DAnCE/DomainApplication/Domain_Application_Impl.cpp - * DAnCE/DomainApplication/Domain_Application_Impl.h - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - * DAnCE/MPC/config/dance_domainapplicationmanager_skel.mpb - * DAnCE/MPC/config/dance_domainapplicationmanager_stub.mpb - * DAnCE/MPC/config/dance_nodeapplication_stub.mpb - * DAnCE/MPC/config/dance_nodeapplicationmanager_skel.mpb - * DAnCE/MPC/config/dance_nodeapplicationmanager_stub.mpb - * DAnCE/NodeManager/Node_Manager_Exec.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h - * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp - * DAnCE/RepositoryManager/Repository_Manager_Exec.cpp - * DAnCE/TargetManager/Target_Manager_Exec.cpp - Moved the CIAO specific idl/code from DAnCE/Deployment to - DAnCE/Deployment/ciao and updated using code. Move - ApplicationManager to its own DLL and enabled in some projects - AMI. - -Mon Feb 15 09:50:57 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Optimized logging regarding domain_id. - -Mon Feb 15 09:35:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Changed the startup sequence. Don't use a sleep. - - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - Extended test time. - -Mon Feb 15 09:19:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Layout changes - - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: - Extend test with two connectors sharing the same topic. - -Fri Feb 12 19:08:36 UTC 2010 Johnny Willemsen - - * MPC/config/dance_applicationmanager.mpb: - * MPC/config/dance_applicationmanager_skel.mpb: - * MPC/config/dance_applicationmanager_stub.mpb: - New base projects for the dance am library - -Fri Feb 12 18:49:36 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h: - Added some missing includes - -Fri Feb 12 18:31:36 UTC 2010 Johnny Willemsen - - * examples/Null_Component_Glfa/Null_Component.mpc: - Removed not needed after - -Fri Feb 12 15:50:36 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Reusing topic when reusing a domainparticipant. - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Optimized logging. - -Fri Feb 12 13:18:06 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl: - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h: - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp: - Moved typed module ShapeType from the CCM_DDS module to the Shapes module - and renamed it to ShapeTypeConn. - -Fri Feb 12 12:37:15 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - Moved typed module TestTopic from the CCM_DDS module to the TestTopic module - and renamed it to TestTopicConn. - -Fri Feb 12 11:31:59 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - Changed number of RELIABLE_READER_ACTIVITY_CHANGED_STATUS. This now - reflects the DDS_RELIABLE_READER_ACTIVITY_CHANGED_STATUS. - - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h: - Moved typed connector to the test module. - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - Added a reader. Stopping reading after a while. - Also changes related to movement of the connector. - - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - Changed timing. - - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: - Added reader connection. - - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml: - Removed some unused settings. - - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - Sleeping 20 seconds. - -Thu Feb 11 15:41:08 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated. - -Thu Feb 11 15:26:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - Don't need to test thread switch in the receiver because - on_offered_deadline_missed-status is not related to a subsciber and should not - be reaceived. - -Thu Feb 11 15:22:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated to reflect the latest status. - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - Resolved test errors. - -Thu Feb 11 11:34:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Utils.h: - Added RELIABLE_READER_ACTIVITY_CHANGED_STATUS to string - conversion. - - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - Layout changes. - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - Enabled listener. - - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml: - Added ON_LIVELINESS_LOST status test. - - * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: - Removed ConnectorStatusListener from connection list. - -Thu Feb 11 10:42:55 UTC 2010 Johnny Willemsen - - * examples/Null_Component_Glfa/Null_Component.mpc: - Glem is required - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc: - Small cleanup - -Thu Feb 11 08:31:27 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Improved test by using a timer to check for last sample in DDS. - - * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: - Incremented iterations - -Thu Feb 11 02:27:37 UTC 2010 Abdul Sowayan - - * bin/ciao_tests.lst: - - Add TAO/CIAO/examples/Null_Component_Glfa to the list of - daily tests we run so we can ensure that the feature - is still functional. - -Thu Feb 11 02:21:29 UTC 2010 Abdul Sowayan - - * examples/Null_Component_Glfa/Null_Component.mpc: - * examples/Null_Component_Glfa/Null_Interface.mpc: - - Decorated project names with Glfa token so project names - won't clash with the Null_Component example. - -Wed Feb 10 22:22:55 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/idl/dds4ccm_Base.idl: - - Removed the line '#define connector component' - -Wed Feb 10 21:36:32 UTC 2010 Abdul Sowayan - - * examples/Null_Component_Glfa/Null_Interface.mpc: - - Minor changes to the MPC files to accomodate Glfa changes. - -Wed Feb 10 21:15:28 UTC 2010 Abdul Sowayan - - * examples/Null_Component_Glfa/StaticDAnCEApp.cpp: - * examples/Null_Component_Glfa/StaticDAnCEApp.mpc: - * examples/Null_Component_Glfa/plan.h: - - Removed these files. They are not relavent to the Glfa - example. - -Wed Feb 10 21:13:53 UTC 2010 Abdul Sowayan - - * examples/Null_Component_Glfa/Null_Component.mpc: - - Added -Glfa option to the project. - -Wed Feb 10 21:02:03 UTC 2010 Abdul Sowayan - - * examples/Null_Component_Glfa/*: - - We should have an example to test the -Glfa feature. - This is a place holder for now, more modifications - are needed to make this functional. - -Wed Feb 10 19:49:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Using refcounting of CORBA::LocalObject since it's thread safe. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Removed unnecessary debug statement. - -Wed Feb 10 15:33:37 UTC 2010 Marijke Hengstmengelt - - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: - Use a High_Res_Timer in sender in order to make it possible to send more messages in a timeinterval. - -Wed Feb 10 14:23:51 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Checking whether a connection to the reader is in place before read. - - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Wait a while before informing the receiver that the samples - were written. - -Wed Feb 10 14:06:59 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - SharedDomainParticipant tests should work again. - - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Made DomainParticipant proxy class refcounted. Prevented - deleting the DomainParticipant proxy when still in use. - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: - Optimized logging. - -Wed Feb 10 10:26:55 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h: - Removed generated headers - -Wed Feb 10 10:03:26 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Implemented thread switch for DataReaderStateListener. - - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl: - Layout changes. - -Wed Feb 10 09:36:55 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Extended native example - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc: - Added the exec export flags to get svn head to compile - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl: - Added another pragma - -Wed Feb 10 08:12:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp: - Preparing thread switch DataReaderStateListener_T. - - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - Code alignment. - - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - Check on error listeners pointer. - - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Optimized logging. Code alignment. - -Wed Feb 10 8:10:37 UTC 2010 Marijke Hengstmengelt - - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: - Removed unused parameter. - -Tue Feb 9 22:57:04 UTC 2010 Jeff Parsons - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc: - - Added generation of connector export header file, and cosmetic - changes. - - * MPC/config/connectoridldefaults.mpb: - - Added command line options to trigger generation of connector - implementation and connector export header file. - -Tue Feb 9 13:27:37 UTC 2010 Marijke Hengstmengelt - - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: - Get and print throughput statistics, print latency one way, code optimalizations. - -Tue Feb 9 13:27:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl: - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - Moved typed module Hello to Hello namespace (instead of leaving - it in the CCM_DDS namespace). - -Tue Feb 9 13:25:17 UTC 2010 Johnny Willemsen - - * ciao/Valuetype_Factories/Cookies.h: - Layout change - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Added commented out example using native that causes tao_idl to crash - -Tue Feb 9 12:49:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - Code alignment in order to be consistent with other tests. - -Tue Feb 9 12:36:38 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - Optimized logging. - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.h: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: - Added test for thread switch. - -Tue Feb 9 12:24:14 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - Optimized logging. - - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - Added test for thread switch. - - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - Resolved compiler warnings on Linux. - -Tue Feb 9 12:02:59 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - Code alignment and optimized logging. - - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - Added thread switch test. - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - Code aligning. - -Tue Feb 9 11:04:46 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - Added thread swich test to Sender component. - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - Optimized logging. - -Tue Feb 9 10:21:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - Minor code changes. - - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - Tested thread switch on sender side. Minor code changes. - -Tue Feb 9 10:15:43 UTC 2010 Johnny Willemsen - - * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp: - Fixed memory leak - - * connectors/ami4ccm/docs/AMI4CCM-explanation.odt: - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - Small updates - -Tue Feb 9 10:03:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Since on_data_on_readers is not available anymore, this test - didn't start. Resolved this by letting the receiver know that - all samples were written. - -Tue Feb 9 09:29:54 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - Resolved compiler issue. - -Tue Feb 9 08:40:07 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - When DDS returns nil as a listener, we don't need - to create a proxy. Just return nil will be enough. - Implemented get_listener methods. - -Mon Feb 8 20:22:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated. - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - Optimized logging. - - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - Since on_data_on_readers is not available anymore, these tests - didn't start. Resolved this by start listening on ccm_activate. - -Mon Feb 8 15:14:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h: - Added explicit global scope - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl: - Added pragma rti typesupport to indicate the name of the typesupport - header that will be generated by rtiddsgen. We need to know the - name of this file when generating the dds4ccm connectors by tao_idl - -Mon Feb 8 15:00:45 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - Extended test with on_publication_matched. Also implemented test regarding - thread switch for all unexpected statusses to be received (instead of - one thread switch test for all statussses). - -Mon Feb 8 13:49:04 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - Add tests for thread switch. - - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - Code aligning. - -Mon Feb 8 13:33:43 UTC 2010 Johnny Willemsen - - * bin/ciao_tests.lst: - Fixed incorrect path - -Mon Feb 8 13:16:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp - * connectors/dds4ccm/impl/ndds/DataReader.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp - * connectors/dds4ccm/impl/ndds/DataWriter.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/Topic.cpp - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp - * connectors/dds4ccm/impl/ndds/Writer_T.cpp - * DAnCE/TargetManager/ResourceCommitmentManager.cpp - Removed generated comments which didn't had any value - -Mon Feb 8 13:02:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - Resolved compiler issue. - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - Extended test with thread switch test. - -Mon Feb 8 12:28:48 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - Replaced DDS_STATUS_MASK_NONE with 0 since DDS_STATUS_MASK_NONE - is not part of the DDS spec. Also using the DDS namespace to - determine mask. - -Mon Feb 8 12:03:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Shouldn't propagate on_data_on_readers to the user component. - -Mon Feb 8 11:35:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Moved all empty inline methods from header to source file. - -Mon Feb 8 11:15:00 UTC 2010 Marcel Smit - - - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - Added test scenario for thread switch. - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Optimized logging regarding thread switch test. - -Mon Feb 8 10:56:43 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc: - Added missing after - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Layout change - -Mon Feb 8 09:54:01 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Only test thread switch when CIAO_DDS4CCM_CONTEXT_SWITCH is turned on. - -Mon Feb 8 07:46:43 UTC 2010 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp: - Fixed memory leak - -Fri Feb 5 19:45:46 UTC 2010 Jeff Parsons - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/IDL3_to_XMI/IR_Simulator_visitor.h: - - Updates to eliminate build errors due to frontend - changes in home factories and finders. Further - work is needed for this tool to support home factories - and finders. - -Fri Feb 5 15:02:23 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - Implemented thread switch. Test result was incorrectly printed. - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - Code aligning. - -Fri Feb 5 14:07:48 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc: - Resolved compiler issues on windows. - -Fri Feb 5 13:11:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated. - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - Test on thread handle is NIL. - - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Tested thread switch for StatusListener. - -Fri Feb 5 12:37:55 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - Code aligning. - - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - Tested thread switch for PortStatusListener. - -Fri Feb 5 12:10:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Added new tests. - - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - Tested thread switch for ConnectorStatusListener. - - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - Tested thread switch for ReaderListener. - -Fri Feb 5 10:07:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.h: - * connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp: - Renamed OnUnexpectedStatusHandler to DDSCallbackStatusHandler. - -Fri Feb 5 09:38:48 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.h: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - Only use the DDS listener callbacks when the listener - connection is there or when logging is required. - -Fri Feb 5 07:25:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: - Resolved compiler issue. - -Thu Feb 4 15:44:43 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Added a test related to 3819 - -Thu Feb 4 15:27:32 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/TimeConversion: - * connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc: - * connectors/dds4ccm/tests/TimeConversion/run_test.pl: - * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: - Added test for testing conversions from and to DDS::Time_t. - -Thu Feb 4 15:21:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Utils.h: - Resolved runtime issues regarding logging an instance_handle - -Thu Feb 4 14:09:43 UTC 2010 Johnny Willemsen - - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - Cleanup and log which attribute is causing the exception - -Thu Feb 4 13:21:11 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Utils.h: - * connectors/dds4ccm/impl/ndds/Utils.cpp: - Resolved compiler issues on windows. - -Thu Feb 4 12:42:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Resolved compiler errors. - -Thu Feb 4 12:37:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp: - Resolved compiler errors. - -Thu Feb 4 12:31:22 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - Added status logging for each DDS callback. Also implemented - thread switch. - -Thu Feb 4 11:45:20 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Corrected mask and according methods. - -Thu Feb 4 10:46:25 UTC 2010 Marcel Smit - - * connectors/dds4ccm/idl/ccm_dds.idl: - Code aligning. - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h: - Added implementation regarding - ReliableReaderActivityChangedStatus. - - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - Added status logging for each DDS callback. - - * connectors/dds4ccm/impl/ndds/Utils.h: - * connectors/dds4ccm/impl/ndds/Utils.cpp: - Added helper methods for status logging in - DDS callbacks. - - * connectors/dds4ccm/impl/ndds/TimeUtilities.h: - Removed unnecessary comment. - - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: - Rewritten to test all unexpected status. Also removed unused - DDS callbacks and realigned some code. - -Thu Feb 4 10:38:43 UTC 2010 Martin Corino - - * tests/Bug_2130_Regression/descriptors/run_test.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: - * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/BasicSP/descriptors/run_test.pl: - * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl: - * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test.pl: - - Added cleanup code to kill off remaining ciao_componentserver processes - (in case of certain test failures) since these otherwise tend to choke test - machines. - -Thu Feb 4 10:30:43 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Extended this idl file - - * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: - enabled this test for compilation again - -Thu Feb 4 10:25:43 UTC 2010 Johnny Willemsen - - * ciao/Servants/Home_Servant_Impl_T.h: - Layout changes - - * tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc: - New MPC file, this test compiles fine now - -Thu Feb 4 10:23:43 UTC 2010 Johnny Willemsen - - * tools/IDL3_to_IDL2/basic_visitor.cpp - * tools/IDL3_to_IDL2/basic_visitor.h - * tools/IDL3_to_IDL2/checking_visitor.cpp - * tools/IDL3_to_IDL2/checking_visitor.h - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp - * tools/IDL3_to_XMI/IR_Simulator_visitor.h - Merged changes from idl3_plus_backend2 branch to svn head - -Thu Feb 4 09:22:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - Solve some compiler warnings. - -Wed Feb 3 15:08:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - Reduced scope of the try/catch blocks - -Wed Feb 3 13:16:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - Distribute the reactor through the connector code - -Wed Feb 3 12:10:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - Extended thread swit code, if you want to use this feature, - add CIAO_DDS4CCM_CONTEXT_SWITCH as 1 to your config.h file, - the code is not tested yet, when that is done, we will enable - this flag by default - -Wed Feb 3 11:59:43 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl: - * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: - Split in publisher and subscriber proces. Use other time functions. Set some attributes. - -Wed Feb 3 11:30:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp: - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.h: - Thread switch for the on_inconsistent_topic - -Wed Feb 3 11:19:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h - More thread switch infrastructure code - -Wed Feb 3 08:10:43 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl: - New IDL3+ test file, fails to compile, when TAO_IDL can - handle this, we will add the mpc file - -Tue Feb 2 12:43:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h: - Added missing export - - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - create eh when there is a reactor - -Tue Feb 2 12:36:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp - * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h - More rework for the thread switch - -Tue Feb 2 12:34:43 UTC 2010 Johnny Willemsen - - * tests/CIAO/CommandlinePassage/CommandlinePassage.mpc: - This test doesn't dependent on dds4ccm - -Tue Feb 2 12:32:43 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc: - This test doesn't dependent on dds4ccm - -Tue Feb 2 12:14:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h - More rework for the thread switch - -Tue Feb 2 10:44:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h - * connectors/dds4ccm/impl/ndds/TopicListener_T.h - The internal dds4ccm classes will get an ACE_Reactor point, if - that is set, they will handle the thread switch using that - reactor. From the connector side we than only have to pass a - zero pointer or a pointer to a valid reactor - -Tue Feb 2 09:49:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h - removed not needed include of LocalObject - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - First rework to implement the required thread switch - -Mon Feb 1 19:16:43 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl: - Removed commented out code - - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc - Cleanup - - * MPC/config/ciao_dds4ccm_ndds_impl.mpb: - Deleted, not used - -Sun Jan 31 01:04:43 CST 2010 Johnny Willemsen - - * CIAO version 0.7.6 released. - -Fri Jan 29 13:36:30 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - Updated some more parts to match more closely to the current situation - -Thu Jan 28 19:19:30 UTC 2010 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - Updated several parts to match more closely to the current situation - -Thu Jan 28 08:50:05 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc: - Resolved dependency. - -Thu Jan 28 07:59:30 UTC 2010 Johnny Willemsen - - * tests/Bug_3817_Regression/Bar.idl: - Enabled all idl, this bug has been fixed by Jeff - -Wed Jan 27 14:26:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl - * connectors/dds4ccm/idl/ccm_dds.idl - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.idl - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl - TAO_IDL has now partly support for templated modules in the front end, but - testing shows that this is enough for our current tets. Much more seperate - tests will be created and more work has to be done, but this is a good - step in the right direction - -Wed Jan 27 10:00:27 UTC 2010 Johnny Willemsen - - * bin/ciao_tests.lst: - Added !NO_IDL3_TO_XMI in order to disable idl3_to_xmi tests with cross - platform testing - -Wed Jan 27 09:41:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/TimeUtilities.h: - Fixed msvc warnings - -Wed Jan 27 08:34:36 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - Updated value of the keys. - - * connectors/dds4ccm/impl/ndds/TimeUtilities.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - Added operators in order to convert DDS::Time_T to ACE_Time_Value and - vice versa. The logging now uses ACE_Time_Value to print the timestamp. - -Wed Jan 27 06:47:27 UTC 2010 Johnny Willemsen - - * tests/Bug_3817_Regression/Bar.idl: - Fixed fuzz and commented out the double provides, that will - make the scoreboard turn green again for the moment - -Tue Jan 26 23:07:18 UTC 2010 Abdul Sowayan - - * tests/Bug_3817_Regression/Bar.idl: - * tests/Bug_3817_Regression/Bar.mpc: - - Renamed to avoid project name conflicts with another regression - test. - - * tests/Bug_3817_Regression/Foo.idl: - * tests/Bug_3817_Regression/Foo.mpc: - - Removed these files. - -Tue Jan 26 22:48:49 UTC 2010 Abdul Sowayan - - * tests/Bug_3817_Regression: - * tests/Bug_3817_Regression/Foo.idl: - * tests/Bug_3817_Regression/Foo.mpc: - - This test show an example where TAO_IDL does not generate - correct executor code. - -Tue Jan 26 19:56:27 UTC 2010 Johnny Willemsen - - * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: - Also build with cross compilation - -Tue Jan 26 14:33:35 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Reverted the implementation of 1 dp per qos_profile for - now. There are some issue regarding which need te be - resolved first. - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - Don't use delete_contained_entities. - - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Renaming variable. - -Tue Jan 26 14:12:26 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - Compile warning solved. - -Tue Jan 26 13:02:26 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc: - Rename long project name. - -Tue Jan 26 11:39:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: - Resolved compiler errors/warnings on Linux. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Replaced InternalError with InternalErr. - -Tue Jan 26 11:20:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/Performance: - * connectors/dds4ccm/performance-tests: - Renamed to performance-tests - -Tue Jan 26 10:41:26 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/Performance - * connectors/dds4ccm/tests/Performance/Keyed - * connectors/dds4ccm/tests/Performance/Keyed/Base - * connectors/dds4ccm/tests/Performance/Keyed/Base/Perf_Keyed_Test_Base.idl - * connectors/dds4ccm/tests/Performance/Keyed/Base/Perf_Keyed_Test_Base.mpc - * connectors/dds4ccm/tests/Performance/Keyed/Connector - * connectors/dds4ccm/tests/Performance/Keyed/Connector/Perf_Keyed_Test_Connector.idl - * connectors/dds4ccm/tests/Performance/Keyed/Connector/Perf_Keyed_Test_Connector.mpc - * connectors/dds4ccm/tests/Performance/Keyed/Connector/Perf_Keyed_Test_Connector_exec.cpp - * connectors/dds4ccm/tests/Performance/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h - * connectors/dds4ccm/tests/Performance/Keyed/descriptors - * connectors/dds4ccm/tests/Performance/Keyed/descriptors/Plan.cdp - * connectors/dds4ccm/tests/Performance/Keyed/descriptors/run_test.pl - * connectors/dds4ccm/tests/Performance/Keyed/descriptors/USER_QOS_PROFILES.xml - * connectors/dds4ccm/tests/Performance/Keyed/Receiver - * connectors/dds4ccm/tests/Performance/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl - * connectors/dds4ccm/tests/Performance/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc - * connectors/dds4ccm/tests/Performance/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Performance/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h - * connectors/dds4ccm/tests/Performance/Keyed/Sender - * connectors/dds4ccm/tests/Performance/Keyed/Sender/Perf_Keyed_Test_Sender.idl - * connectors/dds4ccm/tests/Performance/Keyed/Sender/Perf_Keyed_Test_Sender.mpc - * connectors/dds4ccm/tests/Performance/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/Performance/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h - Add first base of performace tests. - -Tue Jan 26 09:29:26 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc: - * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp: - Resolved fuzz warnings. - -Tue Jan 26 07:43:32 UTC 2010 Marcel Smit - - - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h: - Extended == and != operators. - Resolved compiler warnings. - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/InstanceHandle/*: - Added test in order to test existing operators - for InstanceHandle_t. - -Mon Jan 25 18:25:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp - Const changes - -Mon Jan 25 13:59:21 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - Resolved compiler issue on Linux. - -Mon Jan 25 13:19:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - Fixed fuzz - -Mon Jan 25 13:08:46 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - Setting listener with the appropriate mask. This resolves - test errors regarding the StateListener. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Changed 'exception' with 'excep'. This'll resolved - test errors which aren't real errors. - -Mon Jan 25 12:04:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - dpf is now a process wide singleton. This uncovers some issues with - the sharing of the dp between connectors - -Mon Jan 25 11:17:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - Const, layout, and debug message changes - -Mon Jan 25 10:01:27 UTC 2010 Johnny Willemsen - - * DAnCE/MPC/config/dance_redirectionservice.mpb - * DAnCE/RedirectionService/* - * DAnCE/tests/ObjectLocatorTest/* - * DAnCE/tests/RedirectionServiceTest/* - Removed, redirectionservice isn't working in DAnCE and there are no - plans to add support for it - -Mon Jan 25 09:10:13 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc: - Resolved compiler. - -Mon Jan 25 09:01:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.cpp: - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.h: - Removed includes to files that have been removed - -Mon Jan 25 08:49:27 UTC 2010 Johnny Willemsen - - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - Always print usage messages - -Sat Jan 23 19:08:27 UTC 2010 Johnny Willemsen - - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - * DAnCE/NodeManager/Node_Manager_Module.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp - * DAnCE/TargetManager/Target_Manager_Module.cpp - Always print usage messages - -Sat Jan 23 18:46:27 UTC 2010 Johnny Willemsen - - * DAnCE/DomainApplicationManager/Node_Locator.cpp - * DAnCE/DomainApplicationManager/Node_Locator.h - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.h - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - Unicode fixes - -Fri Jan 22 14:59:22 UTC 2010 Marcel Smit - - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.idl: - * tests/IDL_Test/Included_Component/IC_Bar.idl: - * tests/IDL_Test/Included_Component/IC_Foo.idl: - Resolved compiler errors due to pragma ciao lem implementation. - -Fri Jan 22 14:52:27 UTC 2010 Johnny Willemsen - - * DAnCE/TargetManager/DomainEvents.idl: - Removed, not used - - * DAnCE/TargetManager/TargetManager_Impl.h: - Layout changes - -Fri Jan 22 14:23:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/StringSeq.h: - Added operators in order to copy DDS_StringSeq - to and from DDS::StringSeq. - - * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h: - Added == and != operator in order to compare a - DDS_InstanceHandle with a DDS::InstanceHandle_t. - - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - Implemented remaining methods. - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Implemented remaining implementation of QueryCondition. - -Fri Jan 22 12:46:27 UTC 2010 Johnny Willemsen - - * ciao/Contexts/Context_Impl_Base.cpp: - * ciao/Contexts/Context_Impl_Base.h: - * ciao/Contexts/Context_Impl_T.cpp: - * ciao/Contexts/Context_Impl_T.h: - * ciao/Servants/Servant_Impl_T.cpp: - Pass the instance id through the constructor - -Fri Jan 22 11:59:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc - * connectors/ami4ccm/examples/Hello/Connector/AMI.idl - * connectors/ami4ccm/examples/Hello/Connector/AMI.mpc - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.h - * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc - Use the ami4ccm support in TAO_IDL. The support is partly hardcoded - for just this interface, this is a prototype to show how - ami4ccm could look like. This needs some more tweaks and testing - -Fri Jan 22 11:32:44 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl: - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl: - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl: - Resolved compiler errors due to pragma ciao lem implementation. - -Fri Jan 22 10:28:27 UTC 2010 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.cpp: - Add debug line - - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider.idl - * DAnCE/tests/CIAO/Components/SimpleProvider.idl - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.idl - * examples/BasicSP/BMClosedED/BMClosedED.idl - * examples/BasicSP/BMDevice/BMDevice.idl - * examples/DevGuideExamples/Messenger/Messenger.idl - * examples/Display/GPS/GPS.idl - * examples/Display/GPS/GPSEI.idl - * examples/Hello/Sender/Sender.idl - * examples/Null_Component/Null_Component.idl - Updated for pragma ciao lem - -Thu Jan 21 14:58:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base/Hello.idl: - Use the new pragma ciao lem - -Thu Jan 21 14:57:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/ami4ccm/ami4ccm.idl: - Added include guards - -Thu Jan 21 14:40:27 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp: - Make sure the executor is always there - -Thu Jan 21 14:37:27 UTC 2010 Johnny Willemsen - - * performance-tests/Benchmark/Benchmark.idl - * performance-tests/Benchmark/RoundTrip/RoundTrip.idl - * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc - * performance-tests/Benchmark/RoundTrip/RoundTripEI.idl - * performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl - * performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl - * performance-tests/Protocols/common/Protocols.idl - * performance-tests/Protocols/Receiver/Receiver.idl - Use the new pragma ciao lem - -Thu Jan 21 14:07:27 UTC 2010 Johnny Willemsen - - * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl - * tests/CIDL/CodeGen/Basic.idl - * tests/CIDL/CodeGen/CodeGen.idl - * tests/IDL_Test/Included_Component/IC_Bar.idl - * tests/IDL_Test/Inherited_Component/IhC_Bar.idl - * tests/IDL_Test/Reused_Facet_Interface/Basic.idl - * tests/IDL_Test/Reused_Facet_Interface/CodeGen.idl - Use the new pragma ciao lem - -Thu Jan 21 13:55:41 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Resolved last test errors. - -Thu Jan 21 13:48:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/dds4ccm/examples/Quoter/Broker/Broker.idl - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc - Use the new pragma ciao lem - - * DAnCE/TargetManager/TargetManager.idl: - * DAnCE/TargetManager/TargetManagerExt.idl: - Deleted, not used - -Thu Jan 21 13:44:27 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/idl/ccm_dds.idl - * connectors/dds4ccm/idl/dds4ccm_Base.idl - * connectors/dds4ccm/idl/dds4ccm_Connector.idl - * connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl - * connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl - * connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl - * connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.idl - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.idl - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.idl - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.idl - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.idl - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.idl - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.idl - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.idl - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.idl - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl - Use the new pragma ciao lem - -Thu Jan 21 12:32:27 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: - Running tests in the ORB reactor thread (instead of running in a - DDS callback thread). This is done because you're not allowed to - set query parameters in a DDS callback thread. - Therefore removed ConnectorStatusListener and implemented an - ACE_EventHandler. Also extended tests. - -Thu Jan 21 11:42:30 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl - * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.idl - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.idl - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.idl - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.idl - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.idl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.idl - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.idl - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl - * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector.idl - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.idl - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl - Removed some old comments - -Thu Jan 21 08:45:30 UTC 2010 Johnny Willemsen - - * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc: - Compile with cross compile - -Thu Jan 21 08:07:30 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/Lem_Pragma: - * tests/IDL_Test/Lem_Pragma/A.idl: - * tests/IDL_Test/Lem_Pragma/B.idl: - * tests/IDL_Test/Lem_Pragma/C.idl: - * tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc: - New test for the new ciao lem pragma support. All tests and examples - in the archive will be updated to use this new feature - -Wed Jan 20 12:28:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - Resolved compiler error on windows. - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Throwing an exception when setting the query parameters. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: - Added some more tests. - -Tue Jan 19 13:59:58 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Resolved compiler errors on Windows. - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Throwing exception when get_expression_parameters does - not succeed. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Testing and catching proper exceptions. - -Tue Jan 19 10:57:12 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - Implemented get_expression_parameters. - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Optimized logging. - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Implemented getter method for filter. - Introduced define in order to switch between ContentFilteredTopics - and QueryConditions. - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc: - Resolved compile errors on windows. - - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.idl: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.idl: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp: - Extended tests. - -Mon Jan 18 10:14:39 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - Renamed set_topic methods on Reader. - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Implemented basics of filter method. - - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Now able to create a DDSDataReader with a - ContentFilteredTopic as input. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Resolved bug. - -Fri Jan 15 14:02:34 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - Implemented get_listener methods. - Some renaming of variables. - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Rewritten filter method. Now using DDS proxies instead - of DDS itself. - - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Renaming some inconsistent named variables. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Removed unnecessary logging. - -Fri Jan 15 09:11:56 UTC 2010 Johnny Willemsen - - * tools/IDL3_to_IDL2/checking_visitor.cpp - * tools/IDL3_to_IDL2/checking_visitor.h - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp - * tools/IDL3_to_XMI/IR_Simulator_visitor.h - Updated for tao_idl changes - -Fri Jan 15 07:03:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc: - * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc: - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc: - * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc: - * connectors/dds4ccm/tests/QueryFilter/descriptors/Plan.cdp: - Changed project names due to fuzz warnings. - -Thu Jan 14 19:13:52 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Changed variable name. - -Thu Jan 14 15:54:10 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Created a parameter list of variable size. - - * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp: - Extended test a bit more. - -Thu Jan 14 15:33:59 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - Reverted DDS logging change. - -Thu Jan 14 14:53:43 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/QueryFilter/*: - * bin/ciao_tests.lst: - Added test to test the QueryFilter on the DataReader. - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Create a ContentFilteredTopic on a domainparticipant. - -Thu Jan 14 11:18:01 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Extended idl3+ test, added an example that doesn't compile yet, - commented that out on line 124 - -Thu Jan 14 11:19:04 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Resolved fuzz error. - -Thu Jan 14 10:33:01 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/docs/ccm_dds.idl: - Fixed problem in this IDL file - -Thu Jan 14 10:31:01 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp: - Deploying three connectors with different datatypes. - -Thu Jan 14 10:21:32 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/Base: - * connectors/dds4ccm/tests/SharedDomainParticipant/Base/Base.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Base/Base.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors: - * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/run_test.pl: - Removed these files. Moved to SharedDomainParticipant/SameDatatype. - -Thu Jan 14 10:11:06 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/*: - Added files for this test (see previous entry for more details). - -Thu Jan 14 10:08:40 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Added SharedDomainParticipant for different datatypes. - - * connectors/dds4ccm/docs/TestCoverage.ods: - Changed to meet the latest status. - - * connectors/dds4ccm/idl/ccm_dds.idl: - code aligning. - - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h: - * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - * connectors/dds4ccm/impl/ndds/Topic.h: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc: - Started with implementation of the QueryFilter attribute. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Optimized logging. - - * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/*: - * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/*: - Moved existing SharedDomainParticipant test to SameDatatype sub directory. - Added a new SharedDomainParticipant test with which deploys three connectors - with different datatypes. - -Thu Jan 14 09:10:40 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/docs/TestCoverage.ods - Add new tests. - -Wed Jan 13 13:11:36 UTC 2010 Abdul Sowayan - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc: - * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc: - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc: - * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc: - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc: - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc: - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc: - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc: - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc: - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc: - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Base/Base.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc: - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc: - - Don't hard code the fact that we are using RTI's CORBA Compatability Kit (CCK) in the - MPC projects. ndds_ts_defaults.mpb now uses the CCK by default. - -Wed Jan 13 12:20:40 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc - Removed some unused libs. - -Wed Jan 13 07:08:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3_exec.cpp: - Solved compiler errors by removing these files. - -Tue Jan 12 15:56:45 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - SharedDomainParticipant test should work now. - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Added logging when re-using a domainparticipant. - - * connectors/dds4ccm/tests/SharedDomainParticipant/Base/Base.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Component/Component.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector_exec.cpp: - * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SharedDomainParticipant/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector1.idl: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector1.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector1_exec.h: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector/Connector1_exec.cpp: - Rewritten this test. Deploy one connector three times instead of - deploying three seperate connectors. - -Tue Jan 12 13:55:31 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/ami4ccm/ami4ccm.h - * connectors/ami4ccm/ami4ccm/ami4ccm.idl - * connectors/ami4ccm/examples/Hello/Base/Hello.idl - * connectors/ami4ccm/examples/Hello/Connector/AMI.mpc - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.cpp - * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc - Use new ami4ccm_stub library - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc - * DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage.mpc - Layout changes - -Tue Jan 12 13:31:31 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Using a define for factory instance method. - - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector1/Connector1.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector2/Connector2.mpc: - * connectors/dds4ccm/tests/SharedDomainParticipant/Connector3/Connector3.mpc: - Resolved compiler errors on windows. - -Tue Jan 12 11:08:30 UTC 2010 Johnny Willemsen - - * connectors/ami4ccm/ami4ccm/ami4ccm.cpp: - * connectors/ami4ccm/ami4ccm/ami4ccm.h: - * connectors/ami4ccm/ami4ccm/ami4ccm.idl: - * connectors/ami4ccm/ami4ccm/ami4ccm.mpc: - New AMI4CCM stub library which is going to be used by - all connectors and components that want to use ami4ccm - - * MPC/config/ami4ccm_stub.mpb: - New base project - - * tests/Bug_3769_Regression/Foo.mpc - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc - * tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc - * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc - * tests/IDL_Test/Inherited_Component/IhC_Foo.mpc - * tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc - * tests/IDL_Test/PIDL_Include/PIDLInclude.mpc - * tests/Minimum/Receiver/Receiver.mpc - Layout changes - -Tue Jan 12 10:07:17 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Made the domainparticipantfactory a singleton. - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - Outlining code. - - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - Resolved fuzz error. - - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/SharedDomainParticipant/*: - Added test to test whether the same domainparticipant is used - when two connectors in the same process sharing the same qos_profile. - -Tue Jan 12 08:43:30 UTC 2010 Johnny Willemsen - - * docs/index.html: - Fixed some broken links and removed some old ones. Thanks to - Sreejith for reporting this - - * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc: - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc: - Layout changes - -Mon Jan 11 13:56:30 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc - Change in case. - -Mon Jan 11 08:48:30 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h - Remove some tabs. - - -Mon Jan 11 08:48:30 UTC 2010 Marijke Hengstmengel - - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h - Remove some tabs and change order in mpc files. - -Thu Jan 7 16:48:30 UTC 2010 Marijke Hengstmengel - - * bin/ciao_tests.lst - * connectors/dds4ccm/tests/VariousTopicsEvent - * connectors/dds4ccm/tests/VariousTopicsEvent/Base - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp - * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.h - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.idl - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.h - * connectors/dds4ccm/tests/VariousTopicsState - * connectors/dds4ccm/tests/VariousTopicsState/Base - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl - * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Connector - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.idl - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/descriptors - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp - * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl - * connectors/dds4ccm/tests/VariousTopicsState/Receiver - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.idl - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.h - * connectors/dds4ccm/tests/VariousTopicsState/Sender - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.idl - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp - * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.h - New tests for various topics with DDS_Event and DDS_State connectors. - - - -Thu Jan 7 15:52:30 UTC 2010 Marcel Smit - - * bin/ciao_tests.lst: - Added DDS DataWriter test to the test framework. - -Thu Jan 7 15:50:15 UTC 2010 Marcel Smit - - * connectors/dds4ccm/tests/DDSWriterEntity/*: - Added test which shows how to use the DDSDataWriter - directly. - -Thu Jan 7 13:26:27 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Provided every read/write operation on the dp map with a mutex. - -Thu Jan 7 11:41:40 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Resolved runtime issue. - -Thu Jan 7 09:43:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - Call passivate and remove on the base class after passivating - and removing his own stuff. - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - Setting listeners to nil. Also extended logging when deleting - subscriber. - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - Call passivate and remove on the base class after passivating - and removing his own stuff. - Also setting listeners to nil when passivating. - - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - Don't use remove_ref. Setting to nil should be enough. - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - There should only one domainparticipant for the same - QOS profile. Build in check to prevent the creation of - another domainparticipant for the same QOS profile. - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/Getter_T.h: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Added a passivate method. This cleans up - DDS read conditions and wait conditions. - - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Extended log info with CLINFO. - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Using %C instead of %c. Also extended logging info. - -Wed Jan 6 12:51:52 UTC 2010 Johnny Willemsen - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - Improved debug output - -Wed Jan 6 12:27:52 UTC 2010 Johnny Willemsen - - * ciao/Logger/Logger_Service.cpp: - Changed the commandline flags, to: - -CIAOLogLevel - -CIAOTraceEnable - -CIAOLogFile - - * DAnCE/Logger/Logger_Service.cpp - Changed the commandline flags, to: - -DAnCELogLevel - -DAnCETraceEnable - -DAnCELogFile - -Wed Jan 6 10:39:52 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - Separate DDS lifecycle from CCM lifecycle. Implemented the - various DANCE start/shutdown steps. - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Implemented set_listener method. - - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - Do not use listener when nil. - - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Added traces. get_listener should throw a - no implement exception. - -Wed Jan 6 09:39:37 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Separate DDS lifecycle from CCM lifecycle. DomainParticipant - now have a configuration_complete, an activate, a passivate - and a remove method. - - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Implemented set_listener method. - -Tue Jan 5 19:25:18 UTC 2010 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc - * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc - * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc - * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc - Layout changes - -Tue Jan 5 14:01:18 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - Improved shutdown of the DDS connector. - - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Prevent a pointer creation when the passed listener - is nil. - -Tue Jan 5 09:37:56 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - Separate DDS lifecycle from CCM lifecycle. DDS_Update_T and DDS_Write_T - now have a configuration_complete, activate, passivate and remove - methods. - -Tue Jan 5 08:51:51 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - Optimized error logging. - - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - Separate DDS lifecycle from CCM lifecycle. DDS_Read_T and DDS_StateListen_T - now have a configuration_complete, activate, passivate and remove - methods. - -Tue Jan 5 07:31:33 UTC 2010 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - Separate DDS lifecycle from CCM lifecycle. DDS_Get_T and DDS_Listen_T - now have a configuration_complete, activate, passivate and remove - methods. - -Mon Jan 4 20:41:07 UTC 2010 Jeff Parsons - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Cosmetic changes. - -Mon Jan 4 19:43:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/docs/AMI4CCM-explanation.odt: - First start on updating this document to the latest ideas - -Mon Jan 4 18:45:39 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Enabled some commented out idl3+ which now is accepted by the idl - compiler - -Mon Jan 4 13:29:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Connector/AMI.idl - * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp - * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.h - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl - Updated name of the AMI connector, it is tied to the sender, - so call it AMI_Sender - - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - Print message before spawn - -Mon Jan 4 12:14:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - Updated with the latest ideas - -Mon Jan 4 11:11:39 UTC 2009 Johnny Willemsen - - * docs/OMG-CCM-Tutorial.ppt: - Updated AMI4CCM story - -Mon Jan 4 10:04:39 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Added missing semi colon - -Thu Dec 31 12:48:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl - * examples/BasicSP/descriptors/run_test.pl - * examples/Hello/descriptors/run_test.pl - * examples/Hello/descriptors/run_test_alias.pl - * tests/Bug_3769_Regression/descriptors/run_test.pl - * tests/IDL_Test/Double_Inherited_Component/run_test.pl - Check spawn of naming service - -Thu Dec 31 12:40:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl - Check return value of the plan and execution manager - - * DAnCE/Deployment/Module_Main.h: - Always destroy the orb - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Layout changes - - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - Rethrow the exception so that we don't fail silently - -Wed Dec 30 12:58:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl - Give the plan launcher some more time, on a vm it seems to take longer - -Wed Dec 30 12:50:39 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer.cpp - * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp - * ciao/ComponentServer/CIAO_ComponentServer_Task.h - * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp - * ciao/ComponentServer/CIAO_RTComponentServer_Task.h - * ciao/Logger/CIAOLoggerFactory.h - * ciao/Logger/File_Logger_Backend.cpp - * ciao/Logger/File_Logger_Backend.h - * ciao/Logger/Logger.mpc - * ciao/Logger/Logger_Service.cpp - * ciao/Logger/Logger_Service.h - * DAnCE/Deployment/Module_Main.h - * DAnCE/Logger/DAnCELoggerFactory.h - * DAnCE/Logger/File_Logger_Backend.cpp - * DAnCE/Logger/File_Logger_Backend.h - * DAnCE/Logger/Logger.mpc - * DAnCE/Logger/Logger_Service.cpp - * DAnCE/Logger/Logger_Service.h - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp - Simplified logging infrastructure code - -Wed Dec 30 11:56:39 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - Layout changes - -Wed Dec 30 10:31:39 UTC 2009 Johnny Willemsen - - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - Removed commented out code - - * AnCE/NodeApplication/NodeApplication.mpc: - Removed commented out lines - - * DAnCE/NodeApplication/ServerActivator_Impl.cpp: - * DAnCE/NodeApplication/ServerActivator_Impl.h: - Removed, not used - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - Removed commented out code - - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: - Const changes - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp: - Removed commented out code - -Wed Dec 30 08:14:39 UTC 2009 Johnny Willemsen - - * DAnCE/Deployment/Module_Main.h: - Check if we get an object back and add more exception handling - -Tue Dec 29 11:22:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp: - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.cpp: - Layout changes - -Tue Dec 29 10:16:39 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl - * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl - Don't override trace/debug levels - -Tue Dec 29 09:57:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Connector/AMI.idl - * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.cpp - * connectors/ami4ccm/examples/Hello/Connector/AMI_exec.h - * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - Use sendc_ as prefix for the implicit ports and updated some more - parts to get a more consistent naming - -Mon Dec 28 17:31:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/docs/AMI4CCM-explanation.odt: - * connectors/ami4ccm/docs/AMI4CCM-spec.odt: - Started to update these documents with the current proto - -Mon Dec 28 12:43:39 UTC 2009 Johnny Willemsen - - * ciao/Logger/Logger_Service.cpp: - Use ACE to parse commandline arguments - - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Each second call to an attribute results in an exception - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Added missing try/catch for the attributes - - * DAnCE/Config_Handlers/RDD_Handler.cpp: - Unicode fixes - - * DAnCE/Config_Handlers/Utils/Functors.h: - C++ Builder 2010 fix - - * DAnCE/Logger/Logger_Service.cpp: - Use -a for enabling tracing, -t is already used - - * DAnCE/NodeManager/Node_Manager_Module.cpp: - * DAnCE/NodeManager/Node_Manager_Module.h: - Removed ignore_failure, not used - - * DAnCE/RedirectionService/CCMObjectLocator.h: - Doxygen changes - - * DAnCE/RedirectionService/RedirectionService.mpc: - Layout change - -Wed Dec 23 20:14:39 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base/Hello.idl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - Extended this example with more exceptions - -Wed Dec 23 15:20:54 UTC 2009 Marcel Smit - - * DAnCE/Logger/Logger_Service.cpp: - Using %s instead of %C - -Wed Dec 23 15:08:16 UTC 2009 Marcel Smit - - * DAnCE/Logger/Logger_Service.cpp: - Using ace functionality to parse commandline parameters. - - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - Removed CIAO/DANCE_LOG_LEVEL parameters. - -Wed Dec 23 14:38:39 UTC 2009 Johnny Willemsen - - * ciao/Logger/Logger_Service.cpp: - Fixed CIAO_TRACE_ENABLE functionality - - * DAnCE/Logger/Logger_Service.cpp: - Fixed DANCE_TRACE_ENABLE functionality - -Wed Dec 23 14:08:39 UTC 2009 Johnny Willemsen - - * ciao/Containers/Servant_Activator.cpp: - Fixed fuzz errors - -Wed Dec 23 14:05:39 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp: - * ciao/ComponentServer/Client_init.cpp: - Fixed fuzz errors - -Wed Dec 23 12:39:39 UTC 2009 Johnny Willemsen - - * CIAO_TAO_DAnCE.mwc: - Config handlers got moved - - * CIAO_DAnCE.mwc: - Config handlers got moved, don't generate DAnCE/tests - -Wed Dec 23 12:32:39 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - UnkeyedWriter test should be ok now. - -Wed Dec 23 12:23:03 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - Reworked this test. DDS does not return an error when max_samples is - reached. Now a large block of data is send. - - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - Removed this file. - -Wed Dec 23 10:44:14 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp - Set 'OK' in debug message when catching the expected InternalError - -Wed Dec 23 09:17:14 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Resolved fuzz errors regarding trace. - -Wed Dec 23 09:04:04 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: - Using %C instead of %s for char*. Also added ERROR for error logging. - -Wed Dec 23 08:44:50 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: - Removed some commented out logging. - -Wed Dec 23 08:40:22 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - Using ACE_ERROR and ACE_DEBUG instead of printf. - -Wed Dec 23 08:27:11 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - Using ACE_ERROR and ACE_DEBUG instead of printf. - -Wed Dec 23 08:06:34 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Reverted last changes. - -Wed Dec 23 08:02:27 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: - Using ACE_ERROR and ACE_DEBUG instead of printf. - -Tue Dec 22 17:14:22 UTC 2009 Jeff Parsons - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - Uncommented template module construct that was producing a bug, and - added an instantiation of that template module. - -Tue Dec 22 15:41:04 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base/Hello.idl - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.cpp - * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h - Introduced CCM_AMI::ExceptionHolder which is just a local interface - where the executor will contain the AMI exception holder, but - this is hidden for the component developer. The example will now - fail because there is a problem in TAO related to attributes - and AMI, see bugzilla 3801 - -Tue Dec 22 14:34:04 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Connector/AMI.mpc - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc - Added missing afters - - * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl - No need to derive from ReplyHandler - -Tue Dec 22 14:36:11 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Resolved runtime error. - -Tue Dec 22 14:21:32 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h: - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp: - Renamed setter data_writer to set_impl (to be consistent). - -Tue Dec 22 13:34:45 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition.h: - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - Implemented setter and getter for DDSQueryCondition. - -Tue Dec 22 13:01:04 UTC 2009 Johnny Willemsen - - * DAnCE/Starter - * DAnCE/Starter/Starter.cpp - * DAnCE/Starter/Starter.h - * DAnCE/Starter/Starter.mpc - * DAnCE/StaticConfigurator - * DAnCE/StaticConfigurator/README - * DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl - * DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp - * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc - Removed, really old stuff and not maintained - -Tue Dec 22 13:02:31 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/Getter_T.h: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - To be consistent, renamed data_reader () methods to set_impl. - -Tue Dec 22 12:47:04 UTC 2009 Johnny Willemsen - - * DAnCE/Config_Handlers/Config_Handlers.mpc - * DAnCE/Config_Handlers/DynAny_Handler.mpc - * DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc - * DAnCE/Config_Handlers/test.cdp - * DAnCE/Config_Handlers/test.cpp - * DAnCE/Config_Handlers/Utils/Functors.h - * DAnCE/Config_Handlers/XML_File_Intf.h - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp - * DAnCE/tests/Config_Handlers/Config_Handlers.mpc - * DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp - * DAnCE/tests/Config_Handlers/test.cdp - * DAnCE/tests/Config_Handlers/test.cpp - * DAnCE/tests/DeploymentPlanDump/test.cpp - * DAnCE/tests/DeploymentPlanTestReferences/test.cpp - * DAnCE/tests/DeploymentTest1/test.cpp - Moved more tests to DAnCE/tests and make sure DANCE_ROOT/docs/schema - is also used - -Tue Dec 22 09:39:04 UTC 2009 Johnny Willemsen - - * DAnCE/Config_Handlers/DynAny_Handler/dynany_test.idl - * DAnCE/Config_Handlers/DynAny_Handler/test.cpp - * DAnCE/Config_Handlers/DynAny_Handler/test.mpc - * DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * DAnCE/Config_Handlers/Package_Handlers/test.cpp - * DAnCE/tests/Config_Handlers - * DAnCE/tests/Config_Handlers/DynAny_Handler - * DAnCE/tests/Config_Handlers/DynAny_Handler/dynany_test.idl - * DAnCE/tests/Config_Handlers/DynAny_Handler/test.cpp - * DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc - * DAnCE/tests/Config_Handlers/Package_Handlers - * DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * DAnCE/tests/Config_Handlers/Package_Handlers/test.cpp - Moved tests to the test directory - - * tools/tools.mwc: - Removed, not needed - -Tue Dec 22 09:32:04 UTC 2009 Johnny Willemsen - - * ciao/Logger/File_Logger_Backend.h - * DAnCE/Config_Handlers - * DAnCE/Config_Handlers/ADD_Handler.cpp - * DAnCE/Config_Handlers/Any_Handler.cpp - * DAnCE/Config_Handlers/CCD_Handler.cpp - * DAnCE/Config_Handlers/CEPE_Handler.cpp - * DAnCE/Config_Handlers/ComponentPropertyDescription_Handler.cpp - * DAnCE/Config_Handlers/Config_Handlers.mpc - * DAnCE/Config_Handlers/CPD_Handler.cpp - * DAnCE/Config_Handlers/CRDD_Handler.cpp - * DAnCE/Config_Handlers/DataType_Handler.cpp - * DAnCE/Config_Handlers/DD_Handler.cpp - * DAnCE/Config_Handlers/DP_Handler.cpp - * DAnCE/Config_Handlers/DP_PCD_Handler.cpp - * DAnCE/Config_Handlers/ERE_Handler.cpp - * DAnCE/Config_Handlers/ESD_Handler.cpp - * DAnCE/Config_Handlers/ID_Handler.cpp - * DAnCE/Config_Handlers/IDD_Handler.cpp - * DAnCE/Config_Handlers/IDREF_Base.cpp - * DAnCE/Config_Handlers/IRDD_Handler.cpp - * DAnCE/Config_Handlers/IRDD_Handler.h - * DAnCE/Config_Handlers/MDD_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/CAD_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/CID_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/IAD_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/PC_Intf.cpp - * DAnCE/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * DAnCE/Config_Handlers/Package_Handlers/SID_Handler.cpp - * DAnCE/Config_Handlers/PCD_Handler.cpp - * DAnCE/Config_Handlers/PL_Handler.cpp - * DAnCE/Config_Handlers/Property_Handler.cpp - * DAnCE/Config_Handlers/PSPE_Handler.cpp - * DAnCE/Config_Handlers/RDD_Handler.cpp - * DAnCE/Config_Handlers/Req_Handler.cpp - * DAnCE/Config_Handlers/SatisfierProperty_Handler.cpp - * DAnCE/Config_Handlers/STD_PC_Intf.cpp - * DAnCE/Config_Handlers/XML_File_Intf.cpp - * DAnCE/docs/schema - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/MPC/config/ciao_config_handlers.mpb - * DAnCE/MPC/config/ciao_config_handlers_base.mpb - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/DomainDataManager.cpp - * DAnCE/TargetManager/TargetManager_exec.cpp - * DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp - * DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp - * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp - * DAnCE/tests/DeploymentPlanDump/test.cpp - * DAnCE/tests/DeploymentPlanTestReferences/test.cpp - * DAnCE/tests/DeploymentTest1/test.cpp - * docs/schema - * docs/schema/06-04-02.xsd - * docs/schema/Basic_Deployment_Data.xsd - * docs/schema/ccd.xsd - * docs/schema/cdd.xsd - * docs/schema/cdp.xsd - * docs/schema/CIAOEvents.xsd - * docs/schema/ciaopolicy.xsd - * docs/schema/CIAOServerResources.xsd - * docs/schema/cid.xsd - * docs/schema/cpd.xsd - * docs/schema/Deployment.xsd - * docs/schema/iad.xsd - * docs/schema/Modified_Deployment.xsd - * docs/schema/pcd.xsd - * docs/schema/README.html - * docs/schema/SANet_Network.xsd - * docs/schema/ServerResourceUsage.txt - * docs/schema/Spec_Defined_Deployment.xsd - * docs/schema/Spec_Defined_XMI.xsd - * docs/schema/Task_Map.xsd - * docs/schema/toplevel.xsd - * docs/schema/unused_06-04-02.xsd - * docs/schema/unused_elements.xsd - * docs/schema/XMI.xsd - * docs/schema/xsc-banner.cpp - * docs/schema/xsc-banner.h - * MPC/config/ciao_config_handlers.mpb - * MPC/config/ciao_config_handlers_base.mpb - * tools/Config_Handlers - * tools/Config_Handlers/ADD_Handler.cpp - * tools/Config_Handlers/ADD_Handler.h - * tools/Config_Handlers/Any_Handler.cpp - * tools/Config_Handlers/Any_Handler.h - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/ccd.cpp - * tools/Config_Handlers/ccd.hpp - * tools/Config_Handlers/CCD_Handler.cpp - * tools/Config_Handlers/CCD_Handler.h - * tools/Config_Handlers/cdd.cpp - * tools/Config_Handlers/cdd.hpp - * tools/Config_Handlers/cdp.cpp - * tools/Config_Handlers/cdp.hpp - * tools/Config_Handlers/CEPE_Handler.cpp - * tools/Config_Handlers/CEPE_Handler.h - * tools/Config_Handlers/cid.cpp - * tools/Config_Handlers/cid.hpp - * tools/Config_Handlers/Common.h - * tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp - * tools/Config_Handlers/ComponentPropertyDescription_Handler.h - * tools/Config_Handlers/Config_Handlers.mpc - * tools/Config_Handlers/Config_Handlers_Common_Export.h - * tools/Config_Handlers/Config_Handlers_Export.h - * tools/Config_Handlers/cpd.cpp - * tools/Config_Handlers/cpd.hpp - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/CPD_Handler.h - * tools/Config_Handlers/CRDD_Handler.cpp - * tools/Config_Handlers/CRDD_Handler.h - * tools/Config_Handlers/DataType_Handler.cpp - * tools/Config_Handlers/DataType_Handler.h - * tools/Config_Handlers/DD_Handler.cpp - * tools/Config_Handlers/DD_Handler.h - * tools/Config_Handlers/Deployment.cpp - * tools/Config_Handlers/Deployment.hpp - * tools/Config_Handlers/DnC_Dump.cpp - * tools/Config_Handlers/DnC_Dump.h - * tools/Config_Handlers/DnC_Dump_T.cpp - * tools/Config_Handlers/DnC_Dump_T.h - * tools/Config_Handlers/DP_Handler.cpp - * tools/Config_Handlers/DP_Handler.h - * tools/Config_Handlers/DP_PCD_Handler.cpp - * tools/Config_Handlers/DP_PCD_Handler.h - * tools/Config_Handlers/Dump_Obj.cpp - * tools/Config_Handlers/Dump_Obj.h - * tools/Config_Handlers/DynAny_Handler - * tools/Config_Handlers/DynAny_Handler.mpc - * tools/Config_Handlers/DynAny_Handler/DataType_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DataType_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynAlias_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler_Export.h - * tools/Config_Handlers/DynAny_Handler/dynany_test.idl - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynSequence_Handler.h - * tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.cpp - * tools/Config_Handlers/DynAny_Handler/DynStruct_Handler.h - * tools/Config_Handlers/DynAny_Handler/test.cpp - * tools/Config_Handlers/DynAny_Handler/test.mpc - * tools/Config_Handlers/ERE_Handler.cpp - * tools/Config_Handlers/ERE_Handler.h - * tools/Config_Handlers/ESD_Handler.cpp - * tools/Config_Handlers/ESD_Handler.h - * tools/Config_Handlers/iad.cpp - * tools/Config_Handlers/iad.hpp - * tools/Config_Handlers/ID_Handler.cpp - * tools/Config_Handlers/ID_Handler.h - * tools/Config_Handlers/IDD_Handler.cpp - * tools/Config_Handlers/IDD_Handler.h - * tools/Config_Handlers/IDREF_Base.cpp - * tools/Config_Handlers/IDREF_Base.h - * tools/Config_Handlers/IRDD_Handler.cpp - * tools/Config_Handlers/IRDD_Handler.h - * tools/Config_Handlers/MDD_Handler.cpp - * tools/Config_Handlers/MDD_Handler.h - * tools/Config_Handlers/Package_Handlers - * tools/Config_Handlers/Package_Handlers/CAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CAD_Handler.h - * tools/Config_Handlers/Package_Handlers/CID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CID_Handler.h - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.cpp - * tools/Config_Handlers/Package_Handlers/Comp_Intf_Descr_Handler.h - * tools/Config_Handlers/Package_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/CPD_Handler.h - * tools/Config_Handlers/Package_Handlers/IAD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/IAD_Handler.h - * tools/Config_Handlers/Package_Handlers/NIA_Handler.h - * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc - * tools/Config_Handlers/Package_Handlers/Packaging_Handlers_Export.h - * tools/Config_Handlers/Package_Handlers/PC_Intf.cpp - * tools/Config_Handlers/Package_Handlers/PC_Intf.h - * tools/Config_Handlers/Package_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/Package_Handlers/PCD_Handler.h - * tools/Config_Handlers/Package_Handlers/SID_Handler.cpp - * tools/Config_Handlers/Package_Handlers/SID_Handler.h - * tools/Config_Handlers/Package_Handlers/test.cpp - * tools/Config_Handlers/pcd.cpp - * tools/Config_Handlers/pcd.hpp - * tools/Config_Handlers/PCD_Handler.cpp - * tools/Config_Handlers/PCD_Handler.h - * tools/Config_Handlers/PL_Handler.cpp - * tools/Config_Handlers/PL_Handler.h - * tools/Config_Handlers/Property_Handler.cpp - * tools/Config_Handlers/Property_Handler.h - * tools/Config_Handlers/PSPE_Handler.cpp - * tools/Config_Handlers/PSPE_Handler.h - * tools/Config_Handlers/RDD_Handler.cpp - * tools/Config_Handlers/RDD_Handler.h - * tools/Config_Handlers/Req_Handler.cpp - * tools/Config_Handlers/Req_Handler.h - * tools/Config_Handlers/SatisfierProperty_Handler.cpp - * tools/Config_Handlers/SatisfierProperty_Handler.h - * tools/Config_Handlers/STD_CID_Handler.cpp - * tools/Config_Handlers/STD_CID_Handler.h - * tools/Config_Handlers/STD_CPD_Handler.cpp - * tools/Config_Handlers/STD_CPD_Handler.h - * tools/Config_Handlers/STD_IAD_Handler.cpp - * tools/Config_Handlers/STD_IAD_Handler.h - * tools/Config_Handlers/STD_PC_Intf.cpp - * tools/Config_Handlers/STD_PC_Intf.h - * tools/Config_Handlers/STD_PCD_Handler.cpp - * tools/Config_Handlers/STD_PCD_Handler.h - * tools/Config_Handlers/test.cdp - * tools/Config_Handlers/test.cpp - * tools/Config_Handlers/toplevel.cpp - * tools/Config_Handlers/toplevel.hpp - * tools/Config_Handlers/Utils - * tools/Config_Handlers/Utils/Exceptions.h - * tools/Config_Handlers/Utils/Functors.h - * tools/Config_Handlers/XMI.cpp - * tools/Config_Handlers/XMI.hpp - * tools/Config_Handlers/XML_File_Intf.cpp - * tools/Config_Handlers/XML_File_Intf.h - * tools/Config_Handlers/XML_Typedefs.cpp - * tools/Config_Handlers/XML_Typedefs.h - * tools/Config_Handlers/XMLSchema - * tools/Config_Handlers/XMLSchema/id_map.hpp - * tools/Config_Handlers/XMLSchema/Traversal.hpp - * tools/Config_Handlers/XMLSchema/Traversal.ipp - * tools/Config_Handlers/XMLSchema/Traversal.tpp - * tools/Config_Handlers/XMLSchema/TypeInfo.hpp - * tools/Config_Handlers/XMLSchema/TypeInfo.ipp - * tools/Config_Handlers/XMLSchema/TypeInfo.tpp - * tools/Config_Handlers/XMLSchema/Types.hpp - * tools/Config_Handlers/XMLSchema/Types.ipp - * tools/Config_Handlers/XMLSchema/Types.tpp - * tools/Config_Handlers/XMLSchema/Writer.hpp - * tools/Config_Handlers/XMLSchema/Writer.ipp - * tools/Config_Handlers/XMLSchema/Writer.tpp - * tools/Config_Handlers/XSC_XML_Handlers_Export.h - * tools/Config_Handlers/XSCRT - * tools/Config_Handlers/XSCRT/Elements.hpp - * tools/Config_Handlers/XSCRT/Elements.ipp - * tools/Config_Handlers/XSCRT/Elements.tpp - * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.hpp - * tools/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp - * tools/Config_Handlers/XSCRT/Parser.hpp - * tools/Config_Handlers/XSCRT/Parser.ipp - * tools/Config_Handlers/XSCRT/Parser.tpp - * tools/Config_Handlers/XSCRT/Traversal.hpp - * tools/Config_Handlers/XSCRT/Traversal.ipp - * tools/Config_Handlers/XSCRT/Traversal.tpp - * tools/Config_Handlers/XSCRT/Writer.hpp - * tools/Config_Handlers/XSCRT/Writer.ipp - * tools/Config_Handlers/XSCRT/Writer.tpp - * tools/Config_Handlers/XSCRT/XML.hpp - * tools/Config_Handlers/XSCRT/XML.ipp - * tools/Config_Handlers/XSCRT/XML.tpp - * tools/Config_Handlers/XSCRT/XMLSchema.hpp - Moved Config_Handlers and schema to DAnCE - -Mon Dec 21 18:26:04 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp - * ciao/ComponentServer/CIAO_ComponentServer.cpp - * ciao/ComponentServer/CIAO_ComponentServer.mpc - * ciao/ComponentServer/CIAO_ComponentServer_Impl.cpp - * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp - * ciao/ComponentServer/CIAO_Container_Impl.cpp - * ciao/ComponentServer/CIAO_RTComponentServer.cpp - * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp - * ciao/ComponentServer/Client_init.cpp - * ciao/Containers/CIAO_Servant_Activator.mpc - * ciao/Containers/Servant_Activator.cpp - * ciao/Containers/Session/Session_Container.cpp - * ciao/Logger/File_Logger_Backend.cpp - * ciao/Logger/File_Logger_Backend.h - * ciao/Logger/Log_Macros.cpp - * ciao/Logger/Log_Macros.h - * ciao/Logger/Logger.mpc - * ciao/Logger/Logger_Service.cpp - * ciao/Logger/Logger_Service.h - * ciao/Servants/Home_Servant_Impl_T.cpp - * ciao/Servants/Servant_Impl_Base.cpp - * ciao/Servants/Servant_Impl_T.cpp - * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp - * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc - * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/Getter_T.cpp - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - * connectors/dds4ccm/impl/ndds/Writer_T.cpp - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp - * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc - * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc - * DAnCE/Deployment/Module_Main.h - * DAnCE/DomainApplication/Domain_Application_Impl.cpp - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp - * DAnCE/DomainApplicationManager/Node_Locator.cpp - * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp - * DAnCE/Logger/File_Logger_Backend.cpp - * DAnCE/Logger/Log_Macros.cpp - * DAnCE/Logger/Log_Macros.h - * DAnCE/Logger/Logger.mpc - * DAnCE/Logger/Logger_Service.cpp - * DAnCE/Logger/Logger_Service.h - * DAnCE/MPC/config/dance_cdmw_idl.mpb - * DAnCE/MPC/config/dance_mocks.mpb - * DAnCE/MPC/config/dance_plan_generator.mpb - * DAnCE/MPC/config/dance_plan_launcher.mpb - * DAnCE/MPC/config/dance_plan_launcher_base.mpb - * DAnCE/MPC/config/dance_repositorymanager.mpb - * DAnCE/MPC/config/dance_targetmanager.mpb - * DAnCE/MPC/config/dance_utils.mpb - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp - * DAnCE/NodeApplication/Name_Utilities.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/ServerActivator_Impl.cpp - * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp - * DAnCE/NodeManager/Node_Manager_Module.cpp - * DAnCE/NodeManager/NodeManager_Impl.cpp - * DAnCE/Plan_Generator/PCVisitor.cpp - * DAnCE/Plan_Generator/Plan_Generator.mpc - * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.cpp - * DAnCE/Plan_Launcher/Plan_Launcher.mpc - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp - * DAnCE/RedirectionService/CCMObjectLocator.cpp - * DAnCE/RedirectionService/NameServiceRedirection.cpp - * DAnCE/RedirectionService/RedirectionService.cpp - * DAnCE/RepositoryManager/PC_Updater.cpp - * DAnCE/RepositoryManager/repository_manager_admin.cpp - * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp - * DAnCE/RepositoryManager/RepositoryManager.cpp - * DAnCE/RepositoryManager/RepositoryManager.mpc - * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp - * DAnCE/RepositoryManager/RM_Helper.cpp - * DAnCE/RepositoryManager/URL_Parser.cpp - * DAnCE/RepositoryManager/ZIP_Wrapper.cpp - * DAnCE/Starter/Starter.cpp - * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp - * DAnCE/TargetManager/CmpClient.cpp - * DAnCE/TargetManager/DomainDataManager.cpp - * DAnCE/TargetManager/Target_Manager_Module.cpp - * DAnCE/TargetManager/TargetManager.mpc - * DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage_exec.cpp - * DAnCE/tests/CIAO/Components/ProcessColocation_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleNull_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp - * DAnCE/tests/CIAO/Components/SimpleUser_exec.cpp - * DAnCE/tests/CIAO/ExecutionManager-Deployments/simple_em_launcher.cpp - * DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp - * DAnCE/tests/DeploymentPlanDump/test.cpp - * DAnCE/tests/DeploymentPlanTestReferences/test.cpp - * DAnCE/tests/DeploymentTest1/test.cpp - * DAnCE/tests/NameServiceTest/clt_main.cpp - * DAnCE/tests/NameServiceTest/srv_main.cpp - * DAnCE/tests/NodeApplicationManager-NodeApplication/test.cpp - * DAnCE/tests/NodeManager-NodeApplicationManager/test.cpp - * DAnCE/tests/ObjectLocatorTest/clt_main.cpp - * DAnCE/tests/ObjectLocatorTest/srv_main.cpp - * DAnCE/tests/RedirectionServiceTest/clt_main.cpp - * DAnCE/tests/RedirectionServiceTest/srv_main.cpp - * DAnCE/Utils/DAnCE_Utils.mpc - * DAnCE/Utils/Plan_Handler.cpp - * MPC/config/ciao_cs_client.mpb - * MPC/config/ciao_servant_activator.mpb - * MPC/config/dds4ccm_impl.mpb - * performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp - * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp - * performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp - * tools/Config_Handlers/XML_File_Intf.cpp - CIAO_DEBUG/CIAO_ERROR/DANCE_DEBUG/DANCE_ERROR now have a level - as first argument. This controls at which level (and higher) the - message is printed. DDS4CCM will get its own level very soon. - All example/test code should use ACE_ERROR/ACE_DEBUG, these - are always printed. - Also cleaned up several base projects and various global search - and replace on layout, typos, and more - -Mon Dec 21 14:56:04 UTC 2009 Johnny Willemsen - - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.cpp - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.cpp - * tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.cpp - Use ACE_ERROR/ACE_DEBUG - -Mon Dec 21 12:52:38 UTC 2009 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Updated. - -Mon Dec 21 12:20:04 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Added some more test idl - -Mon Dec 21 11:02:04 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - Removed empty templated module, that is illegal - -Mon Dec 21 10:59:04 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.h: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: - Using set_impl and get_impl on DomainParticipant. - -Mon Dec 21 10:25:22 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/StatusCondition.h: - * connectors/dds4ccm/impl/ndds/StatusCondition.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Using set_impl and get_impl on StatusCondition. - -Fri Dec 18 20:11:00 UTC 2009 Johnny Willemsen - - * testsIDL_Test/IDL3_Plus/KitchenSink.idl: - Extended test idl - -Fri Dec 18 18:58:00 UTC 2009 Johnny Willemsen - - Merge changes from Jeff Parsons related to templated modules - - Thu Dec 17 21:37:10 UTC 2009 Jeff Parsons - - * tests/IDL_Test/Cornucopia/README: - - Updated this file with info about the non-template - IDL3+ constructs added to the test IDL. - - * tests/IDL_Test/IDL3_Plus/README: - - New file, containing info about the new test in this - directory. - - Thu Dec 17 21:15:05 UTC 2009 Jeff Parsons - - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h: - * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp: - * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: - * tools/IDL3_to_XMI/IR_Simulator_visitor.h: - - Changes needed to this back end required by front end - changes made to support IDL3+ grammar changes. - - Thu Dec 17 19:52:18 UTC 2009 Jeff Parsons - - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - - Changes needed to this back end required by front end - changes made to support IDL template parameters as - base interfaces/valuetypes, supported interfaces, and - primary keys. - - Thu Dec 17 19:37:41 UTC 2009 Jeff Parsons - - * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc: - * tests/IDL_Test/IDL3_Plus/KitchenSink.idl: - - New test in new directory (IDL3_Plus) to test IDL3+ - constructs, specifically template-related ones. - TAO_IDL supports IDL3+ only in the front - end currently, this test will be more meaningful as - back end support is added. - - Mon Nov 23 20:39:24 UTC 2009 Jeff Parsons - - * tools/IDL3_to_IDL2/checking_visitor.h: - * tools/IDL3_to_IDL2/basic_visitor.cpp: - * tools/IDL3_to_IDL2/basic_visitor.h: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: - * tools/IDL3_to_IDL2/checking_visitor.cpp: - * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h: - - Updated visit_* methods. New visit_* methods corresponding - to the revised IDL3+ grammar types, have not yet been - implemented. - -Fri Dec 18 15:28:49 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/ReadCondition.h: - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp: - * connectors/dds4ccm/impl/ndds/TopicDescription.h: - * connectors/dds4ccm/impl/ndds/TopicDescription.cpp: - Two other classes converted. Implemented getter and - setter for variable impl_. - -Fri Dec 18 14:49:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp - Solve bug in test on_deletion - -Fri Dec 18 14:17:47 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - Resolved compiler errors on linux. - -Fri Dec 18 10:48:14 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - Continued working on separating dds lifecycle from - ccm lifecycle. The DDS entities are now created at - connection time. - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - Logging time difference of get_one. - - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp: - Some debug statements were logged as error messages. - -Fri Dec 18 08:36:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp - Change cdp for test. - -Fri Dec 18 08:32:09 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp: - Added a datareader/writer in order to separate the - dds lifecycle from the ccm lifecycle. - - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/SampleInfo.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - Don't call impl () recursive. Use impl_ to check - for nil. - - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - Turned off CIAO en DAnCE trace. - -Thu Dec 17 20:43:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp - Change cdp for test. - -Thu Dec 17 18:42:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp - Add profile to connectorFour. - -Thu Dec 17 13:08:14 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - Reworked Topic in order to separate the DDS lifecycle - from the ccm lifecycle. - - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Removed unnecessary comments. - -Thu Dec 17 12:56:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml - Forgotten profile Hello example. - -Thu Dec 17 12:35:32 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/Publisher.h: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.h: - Made impl (void) private. Resolved runtime errors. - -Thu Dec 17 12:29:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp - add '\n' in debug and error messages - -Thu Dec 17 12:21:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h - Change DURABILITY from VOLATILE to TRANSIENT through QoS file. - Add ConectorStatusListener to check on PUBLICATION_MATCHED status. - -Thu Dec 17 09:13:11 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Base - * connectors/ami4ccm/examples/Hello/Base/Hello.mpc - * connectors/ami4ccm/examples/Hello/Base/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Base/Hello_Base.mpc - * connectors/ami4ccm/examples/Hello/Connector/AMI.idl - * connectors/ami4ccm/examples/Hello/Connector/AMI.mpc - * connectors/ami4ccm/examples/Hello/Connector/AMI_MyFoo_i.h - * connectors/ami4ccm/examples/Hello/Connector/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Hello_Base - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello.idl - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.mpc - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h - Moved all connector idl into the connector directory - -Thu Dec 17 08:11:11 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Resolved compiler issues. - -Wed Dec 16 20:05:42 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/Topic.h: - * connectors/dds4ccm/impl/ndds/Topic.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener.cpp: - Reworked Topic in order to separate the DDS lifecycle - from the ccm lifecycle. - -Wed Dec 16 19:42:36 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReader.h: - * connectors/dds4ccm/impl/ndds/DataReader.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/QueryCondition.cpp: - * connectors/dds4ccm/impl/ndds/ReadCondition.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - Reworked this in order to separate the dds lifecycle from - the ccm lifecycle. The DDS entity is not passed in the - constructor but can be passed using the set_impl method. - Reworked the DataReader. - -Wed Dec 16 19:16:59 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataWriter.h: - * connectors/dds4ccm/impl/ndds/DataWriter.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp: - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.h: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp: - * connectors/dds4ccm/impl/ndds/Subscriber.h: - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - Reworked this in order to separate the dds lifecycle from - the ccm lifecycle. The DDS entity is not passed in the - constructor but can be passed using the set_impl method. - -Wed Dec 16 12:26:24 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - Only invoke the listeners when there are valid samples. - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Made the waitset a class variable again. - -Wed Dec 16 11:12:46 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - Simplified receiver - -Wed Dec 16 11:02:46 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/AMI: - Renamed directory to connector - -Wed Dec 16 10:36:31 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.h: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: - Cleanup tests, check returned readers, data, info and status. - -Wed Dec 16 09:32:33 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: - Resolved errors due to renaming namespaces. - -Wed Dec 16 09:04:31 UTC 2009 Marijke Hengstmengel - - *connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp: - *connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h: - *connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - *connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - *connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - *connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: - *connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp: - *connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h: - *connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - *connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - *connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - *connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: - Cleanup tests, check returned reader and status. - -Wed Dec 16 08:55:31 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Using this when using members. - - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: - Added newline. - -Wed Dec 16 08:27:46 UTC 2009 Johnny Willemsen - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Unicode fix - -Wed Dec 16 08:09:46 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/AMI/AMI.idl - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.cpp - * connectors/ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.h - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h - Improved naming, everything is now in the Hello module and - everything related to AMI has a AMI_ prefix - -Tue Dec 15 18:12:46 UTC 2009 Johnny Willemsen - - * ami4ccm/examples/Hello/AMI/AMI_exec.cpp: - * ami4ccm/examples/Hello/AMI/AMI_exec.h: - Made code more consistent and error safe - -Tue Dec 15 15:59:46 UTC 2009 Johnny Willemsen - - * ami4ccm/examples/Hello/AMI/AMI.idl - * ami4ccm/examples/Hello/AMI/AMI_exec.cpp - * ami4ccm/examples/Hello/AMI/AMI_exec.h - * ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.cpp - * ami4ccm/examples/Hello/AMI/AMI_MyFoo_i.h - * ami4ccm/examples/Hello/descriptors/run_test.pl - * ami4ccm/examples/Hello/Receiver/Hello_Receiver.idl - * ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp - * ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h - * ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - * ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h - Simplified this example - -Tue Dec 15 15:59:57 UTC 2009 Marcel Smit - - * connectors/dds4ccm/docs/TestCoverage.ods: - Spreadsheet to keep track of test coverage. - -Tue Dec 15 15:21:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h - Cleanup test. Check DDS_entity. - -Tue Dec 15 15:04:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp - Cleanup test. - -Tue Dec 15 14:58:21 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - Optimized code. Removed unused header files, indentation, removed empty lines. - -Tue Dec 15 14:32:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h: - Cleanup test. - -Tue Dec 15 13:39:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - Cleanup test. - -Tue Dec 15 13:38:44 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Extended tests with checks on the received ReadInfo struct. - -Tue Dec 15 12:46:02 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl: - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl: - * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: - Extended tests with checks on the received ReadInfo struct. - - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - Sleep for 30 (instead of 60) seconds. - -Tue Dec 15 10:31:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp - Solved compile errors. - -Tue Dec 15 10:23:23 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Optimized for loop (++i in stead of i++). - - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - Catching exceptions as const. - - * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp: - Catching exceptions as const. - Extended tests on the listener callback. - -Tue Dec 15 09:01:46 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/SLManyByMany: - * connectors/dds4ccm/tests/SLManyByMany/Base: - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl: - * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Connector: - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.idl: - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/descriptors: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLManyByMany/Receiver: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.idl: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h: - * connectors/dds4ccm/tests/SLManyByMany/Sender: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.idl: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.h: - Add test StateListyener operations with MANY_BY_MANY option. - -Tue Dec 15 08:25:46 UTC 2009 Johnny Willemsen - - * DAnCE/DomainApplicationManager/Node_Locator.cpp: - * DAnCE/DomainApplicationManager/Node_Locator.h: - Use char* instead of tchar - - * ciao/Contexts/Context_Impl_Base.h: - Made constructor private - -Mon Dec 14 20:35:46 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - Removed virtual methods that where added by accident and which broke - the psl - -Mon Dec 14 20:31:46 UTC 2009 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - Use false and extended debug statements - - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - Extended debug info - - * DAnCE/NodeManager/NodeManager_Impl.cpp: - Removed not needed debug info - - * ciao/Servants/Servant_Impl_T.cpp: - Layout change - -Mon Dec 14 20:07:46 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - Report which port has the real problem - -Mon Dec 14 19:23:21 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - * connectors/dds4ccm/impl/ndds/Publisher.cpp: - Resolved fuzz errors/warnings. - -Mon Dec 14 19:06:43 UTC 2009 Marcel Smit - - * examples/Hello/descriptors/run_NodeDaemons.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - Resolved fuzz errors/warnings. - -Mon Dec 14 14:53:13 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h: - * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Cleaned up code. Removed unused headers, made exception variables const - and outlined code. - -Mon Dec 14 14:36:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc: - * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc: - Solve duplicate project names - -Mon Dec 14 14:25:09 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tests/CIAO_ComponentServer/Local_Facet/run_test.pl: - Resolved fuzz erros/warnings. - -Mon Dec 14 14:15:46 UTC 2009 Johnny Willemsen - - * DAnCE/tests/MocksTest/* - Removed, not compiled, not tested - -Mon Dec 14 14:10:11 UTC 2009 Marcel Smit - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - Resolved fuzz erros/warnings. - -Mon Dec 14 13:59:46 UTC 2009 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - Print debug statement when we don't get a facet - - * ciao/Contexts/Context_Impl_T.cpp: - * ciao/Contexts/Context_Impl_T.h: - * ciao/Servants/Servant_Impl_T.cpp: - * ciao/Servants/Servant_Impl_T.h: - Create the context in the base instead of in the generated - code - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - Layout change - - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - Don't clear tracing flags - - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - Layout changes - -Mon Dec 14 13:42:56 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp: - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp: - Resolved errors in deployment plans related to local interfaces. - -Mon Dec 14 13:16:16 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - The deleted samples may be invalid. Therefore don't check - on valid_data flag. Implemented this for many_by_many. - -Mon Dec 14 12:56:16 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - The deleted samples may be invalid. Therefore don't check - on valid_data flag. - -Mon Dec 14 12:18:31 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added many_by_many listener test to test framework. - -Mon Dec 14 11:37:46 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp - Solve minor bug in test - -Mon Dec 14 11:18:46 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Removed generated header - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h: - Use ACE_CString for subplan names - - * DAnCE/ExecutionManager/ExecutionManager_Module.cpp: - Removed commented out code - - * DAnCE/NodeApplication/NodeApplication_Impl.h: - Removed not needed include - - * DAnCE/NodeManager/NodeManager_Impl.h - Added missing include - -Mon Dec 14 10:58:46 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/SLDisabled: - * connectors/dds4ccm/tests/SLDisabled/Base: - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl: - * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc: - * connectors/dds4ccm/tests/SLDisabled/Connector: - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.idl: - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc: - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h: - * connectors/dds4ccm/tests/SLDisabled/descriptors: - * connectors/dds4ccm/tests/SLDisabled/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SLDisabled/Receiver: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.idl: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: - * connectors/dds4ccm/tests/SLDisabled/Sender: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.idl: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp: - * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.h: - Added test StateListener: NOT_ENABLED . - -Mon Dec 14 10:46:46 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - Don't override use trace levels - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Initialise all members to zero - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Improved logging - -Mon Dec 14 10:44:44 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/ListenManyByMany/*: - Added test in order to test many_by_many on the listener. - -Mon Dec 14 09:12:46 UTC 2009 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Improved error reporting back to the end user - -Mon Dec 14 08:16:32 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * performance-tests/Benchmark/RoundTripClient/run_test.pl: - * performance-tests/Benchmark/RoundTripClient/run_test_ior_cad.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tests/IDL3/Events/Any/run_test.pl: - * tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: - Resolved fuzz errors/warnings. - -Mon Dec 14 07:39:46 UTC 2009 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp - * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp - * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp - * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp - * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp - * connectors/dds4ccm/examples/Quoter/descriptors/Plan.cdp - * connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp - * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h - * connectors/dds4ccm/idl/ccm_dds.idl - * connectors/dds4ccm/idl/dds4ccm_ConnectorStatusListener.idl - * connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl - * connectors/dds4ccm/idl/dds4ccm_PortStatusListener.idl - * connectors/dds4ccm/idl/dds4ccm_StateListenerControl.idl - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h - * connectors/dds4ccm/impl/ndds/Getter_T.cpp - * connectors/dds4ccm/impl/ndds/Getter_T.h - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp - * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h - * connectors/dds4ccm/impl/ndds/Reader_T.cpp - * connectors/dds4ccm/impl/ndds/Reader_T.h - * connectors/dds4ccm/impl/ndds/SampleInfo.h - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h - * connectors/dds4ccm/impl/ndds/Updater_T.cpp - * connectors/dds4ccm/impl/ndds/Updater_T.h - * connectors/dds4ccm/impl/ndds/Writer_T.cpp - * connectors/dds4ccm/impl/ndds/Writer_T.h - * connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl - * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp - * connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp - * connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/Plan.cdp - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/Plan.cdp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp - * connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp - * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp - * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h - * DAnCE/Deployment/Deployment_DeploymentPlan.idl - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - * docs/schema/Basic_Deployment_Data.xsd - * tests/IDL_Test/Cornucopia/Cornucopia.idl - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/DnC_Dump.cpp - * tools/Config_Handlers/PSPE_Handler.cpp - Removed LocalFacet again as connection kind, we now use a - deployRequirement in order to let D&C know we have a local connection. - Use local interfaces for everything in dds4ccm and updated - all deployment plans for this. This does mean the connector - needs to create all executors as construction time, the - lifecycle of the connector is now that all executors - are created at construction, at the moment we do a - ccm_activate we need to create the real dds entities. - When we get an invocation before ccm_activate we do a - BAD_INVORDER exception. - - In the cdp we now use the following with a connection to - indicate that it has to be deployed as a local connection: - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - -Fri Dec 11 14:03:46 UTC 2009 Marcel Smit - - * examples/Display/descriptors/run_NodeDaemons.pl: - * examples/Display/descriptors/run_test_without_ns.pl: - Resolved fuzz errors/warnings/ - -Fri Dec 11 13:19:30 UTC 2009 Marcel Smit - - * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl: - * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: - * examples/Display/descriptors/basicNodeDaemon.pl: - Resolved fuzz errors/warnings/ - -Fri Dec 11 12:00:05 UTC 2009 Marcel Smit - - * examples/BasicSP/descriptors/run_test.pl: - Resolved script errors - -Fri Dec 11 11:50:16 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/Cornucopia/Cornucopia.idl: - Extended tests - -Fri Dec 11 11:07:13 UTC 2009 Marcel Smit - - * performance-tests/Benchmark/RoundTripClient/run_test.pl: - Resolved fuzz errors/warnings - - * performance-tests/Protocols/descriptors/run_test.pl: - Resolved fuzz warnings - -Fri Dec 11 10:52:33 UTC 2009 Marcel Smit - - * performance-tests/Benchmark/Multi_Threaded/run_test.pl: - * performance-tests/Benchmark/RoundTrip/run_test.pl: - Resolved fuzz errors/warnings - -Fri Dec 11 10:27:57 UTC 2009 Marcel Smit - - * tests/Bug_2130_Regression/descriptors/run_test.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - Resolved fuzz errors/warnings - -Fri Dec 11 09:44:14 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - Resolved fuzz errors/warnings - -Fri Dec 11 09:30:29 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test.pl: - Resolved script errors. - -Fri Dec 11 08:20:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp - Resolved warnings. - -Fri Dec 11 08:09:25 UTC 2009 Marcel Smit - - * performance-tests/Protocols/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Fri Dec 11 07:44:10 UTC 2009 Marcel Smit - - * examples/Display/descriptors/run_NodeDaemons.pl: - * examples/Hello/descriptors/run_NodeDaemons.pl: - Resolved fuzz errors/warnings. - -Thu Dec 10 20:23:15 UTC 2009 Marcel Smit - - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - * examples/BasicSP/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test.pl: - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - Removed add_lib_path in order to resolve fuzz error. - -Thu Dec 10 20:05:00 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_test_dds.pl: - * tests/Bug_2130_Regression/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Thu Dec 10 19:40:19 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Thu Dec 10 19:31:15 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test_dds.pl: - * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl: - Resolved fuzz errors/warnings. - -Thu Dec 10 19:26:16 UTC 2009 Johnny Willemsen - - * ciao/Servants/Home_Servant_Impl_T.cpp: - Check return value sprintf and use is_nil - -Thu Dec 10 19:15:15 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_alias.pl: - Resolved some fuzz errors/warnings. - -Thu Dec 10 19:03:16 UTC 2009 Johnny Willemsen - - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h: - * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - Removed generated headers - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - const changes and improved debug messages - - * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp: - Const change - - * DAnCE/RepositoryManager/Repository_Manager_Module.cpp: - Fixed typo in debug statement - -Thu Dec 109 17:02:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp - Resolved warning. - -Thu Dec 10 16:20:37 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl: - Resolved some fuzz errors/warnings. - -Thu Dec 10 15:56:13 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl: - Resolved some fuzz errors/warnings. - -Thu Dec 10 15:42:58 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - Resolved some fuzz errors/warnings. - -Thu Dec 10 15:35:51 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl: - Resolved some fuzz errors/warnings. - -Thu Dec 10 15:29:00 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Thu Dec 10 14:41:13 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - Wait a few seconds before the actual writing starts. - - * connectors/dds4ccm/tests/ListenOneByOne/*: - Added one_by_one listener test. - - * bin/ciao_tests.lst: - Added one_by_one test to the test framework. - -Thu Dec 109 14:31:57 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl: - * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc: - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl: - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc: - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.cpp: - * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h: - * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/Updater/Receiver: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: - * connectors/dds4ccm/tests/Updater/Sender: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp: - * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h: - Implement test for Updater functions - -Thu Dec 10 13:30:01 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added !FIXED_BUGS_ONLY for the connection tests since - there's a known issue in the connector. - -Thu Dec 10 12:44:31 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added ListenNotEnabled test to the test framework. - -Thu Dec 10 12:42:08 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Renamed get_many into write_many. - - * connectors/dds4ccm/tests/ListenNotEnabled/*: - * connectors/dds4ccm/tests/Listener/*: - Split the listener into three separate tests. Added - listener test where mode is NOT_ENABLED as starter. - -Thu Dec 10 11:01:16 UTC 2009 Johnny Willemsen - - * ciao/Containers/Servant_Activator.cpp: - Extended logging - -Thu Dec 10 10:11:56 UTC 2009 Marcel Smit - - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Null_Component/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Thu Dec 10 10:00:16 UTC 2009 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Fixed compiler warnings about arguments not used - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Fixed invalid string comparison and const improvements - -Thu Dec 10 09:41:12 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc: - Removed some unnecessary defines. - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - Removed unused class variable. - - * connectors/dds4ccm/tests/Listener/*: - Empty test framework for the listener test. - -Thu Dec 10 08:37:49 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/README: - * connectors/dds4ccm/tests/Reader/README: - Described the tests. - -Thu Dec 10 08:21:16 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Updater_T.cpp: - * connectors/dds4ccm/impl/ndds/Updater_T.h: - Fixed bugs in the updater - - * connectors/ami4ccm/examples/Hello/AMI/AMI.idl - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.mpc - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h - Merged a revised ami4ccm example that has local interfaces for the - reply handler, which reduces the footprint of ami4ccm and also - simplifies the code - -Thu Dec 10 08:06:08 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc: - * connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp: - Shorten the names of the projects in order to solve some fuzz warnings. - -Wed Dec 9 19:52:16 UTC 2009 Johnny Willemsen - - * DAnCE/Deployment/Deployment_DeploymentPlan.idl - * DAnCE/NodeApplication/NodeApplication_Impl.cpp - * DAnCE/NodeApplication/NodeApplication_Impl.h - * docs/schema/Basic_Deployment_Data.xsd - * tools/Config_Handlers/Basic_Deployment_Data.cpp - * tools/Config_Handlers/Basic_Deployment_Data.hpp - * tools/Config_Handlers/CPD_Handler.cpp - * tools/Config_Handlers/DnC_Dump.cpp - * tools/Config_Handlers/PSPE_Handler.cpp - Merged changes from local_facets branch from Will Otte to svn head. - This is going to be used by at least ami4ccm. We are looking if there - is a different way to determine whether we need to connect a local - facet. - -Wed Dec 9 15:53:16 UTC 2009 Marcel Smit - - * examples/BasicSP/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Wed Dec 9 15:01:48 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Resolved unicode compiler errors. - -Wed Dec 9 14:29:33 UTC 2009 Johnny Willemsen - - * ciao/Containers/Container_Base.cpp: - * ciao/Containers/Container_Base.h: - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Container_Base.inl: - Get rid of the receptacle policy map, this doesn't do a thing - -Wed Dec 9 14:26:17 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Extended tests with a timeout test on get_many. - -Wed Dec 9 13:58:44 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: - Don't need the ConnectorStatusListener anymore. - - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Print debug message in stead of an error message. - -Wed Dec 9 13:54:33 UTC 2009 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.cpp (lookup_facet): - Log an error when we can't find a facet - -Wed Dec 9 13:53:47 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - On get_many should at least return 1 sample. - - * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp: - Return _nil rather than 0. - -Wed Dec 9 13:11:33 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Updater_T.cpp: - Check whether instance_handle and instance match - -Wed Dec 9 12:55:23 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp: - Changed project names in order to resolve fuzz warnings. - -Wed Dec 9 12:48:35 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc: - Shorten the shared name of DDS_ConnectorStatusListener_TestSec_Connector_lem_stub. - -Wed Dec 9 12:40:33 UTC 2009 Johnny Willemsen - - * bin/ciao_tests.lst: - Added Local_Facet test - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - Resolved a bug whereby connection endpoints in the original plan - would be copied into two separate connections in a child plan. - -Wed Dec 9 12:37:33 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/Local_Facet: - Removed - - * tests/CIAO_ComponentServer/Local_Facet: - New test for testing local facets - - * ciao/ComponentServer/CIAO_ComponentServer.idl - * ciao/ComponentServer/CIAO_Container_Impl.cpp - * ciao/ComponentServer/CIAO_Container_Impl.h - * ciao/Containers/Container_Base.idl - * ciao/Containers/Session/Session_Container.cpp - * ciao/Containers/Session/Session_Container.h - Added support to connect local facets by William Otte - - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Base.h: - Made several methods pure virtual instead of not implemented - -Wed Dec 9 11:24:58 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Resolved compiler warnings. - -Wed Dec 9 11:13:44 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added State_Connection_Test. - - * connectors/dds4ccm/tests/Event_Connection_Test/README: - Changed to meet the latest code updates. - - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.idl: - Removed comments. - - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp: - Logging debug messages (in stead of error messages). - - * connectors/dds4ccm/tests/State_Connection_Test/*: - Added this test in order to test all the connections a state connector - needs. - -Wed Dec 9 08:56:42 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.idl: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/Plan.cdp: - Support only the DDS_Event connector. Removed DDS_State connector stuff. - -Wed Dec 9 08:25:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp - Add newline at end of file - -Wed Dec 9 08:17:27 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Get_Connection_Test/*: - Renamed to Event_Connection_Test. - -Wed Dec 9 08:14:57 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/Event_Connection_Test/*: - Renamed Get_Connection_Test to Event_Connection_Test. - -Wed Dec 9 07:47:33 UTC 2009 Johnny Willemsen - - * etc/ciao_dds4ccm.doxygen: - Also exclude the tests directory - -Wed Dec 9 07:17:32 UTC 2009 Marcel Smit - - * examples/BasicSP/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - Resolved some fuzz errors/warnings. - -Tue Dec 8 16:36:33 UTC 2009 Johnny Willemsen - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - Fixes to debug statements - -Tue Dec 8 16:31:33 UTC 2009 Marcel Smit - - * examples/Hello/descriptors/run_test.pl: - Adapted to the new test framework. - -Tue Dec 8 15:54:33 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Updater_T.cpp: - * connectors/dds4ccm/impl/ndds/Updater_T.h: - Added existence checks as mandated by the spec - -Tue Dec 8 15:29:40 UTC 2009 Marcel Smit - - * examples/BasicSP/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test.pl: - Resolved fuzz warnings. - -Tue Dec 8 15:20:33 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h - Cache dds executors - -Tue Dec 8 15:17:44 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Resolved compiler warnings. - -Tue Dec 8 15:11:22 UTC 2009 Marcel Smit - - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - Resolved fuzz errors. - -Tue Dec 8 15:01:58 UTC 2009 Marcel Smit - - * examples/BasicSP/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Null_Component/descriptors/run_test.pl: - Resolved fuzz errors. - -Tue Dec 8 14:56:33 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h: - Provide access to the DDS entities - -Tue Dec 8 12:51:33 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.h: - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Using a local waitset in stead of a global one. - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - Optimized get_many. - -Tue Dec 8 10:48:04 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added Getter test to the test framework. - - * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Implemented get_many. - -Tue Dec 8 09:05:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: - Change QoS settings of test to generate a on_sample_lost callback. - -Tue Dec 8 08:56:42 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - RETCODE_NO_DATA should throw an exception since - there always must be data after when the timeout does - not occur. - - * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp: - Removed qos_profile config property. - -Tue Dec 8 08:47:23 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: - Resolved some timing issues between sender and receiver. - -Tue Dec 8 08:17:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - Solved errors duplicate projectnames - - -Tue Dec 8 07:21:52 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Minor changes in order to meet the spec. - - * connectors/dds4ccm/tests/Getter/*: - Added test for the getter. - -Mon Dec 7 15:37:57 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst - * connectors/dds4ccm/tests/PSLSampleLost: - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Connector: - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLSampleLost/Sender: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.idl: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h: - Add test PortStatusListener:on_sample_lost - -Mon Dec 7 14:53:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h: - Implement get_dds_entity methods - - * NEWS - Added DDS4CCM_NDDS_LOG_VERBOSITY - -Mon Dec 7 13:28:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - Fixed runtime problems and refactored statelistener - -Mon Dec 7 13:25:55 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Getter_T.cpp: - Reads according to DDS4CCM spec. - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - NO_DATA shouldn't throw an exception but just return - an empty sequence. - - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Optimized test. Don't need to sleep prior to writing samples to DDS. - -Mon Dec 7 13:07:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Get_T.h - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h - * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Read_T.h - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h - * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Update_T.h - * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Write_T.h - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h - * connectors/dds4ccm/impl/ndds/Reader_T.h - * connectors/dds4ccm/impl/ndds/Updater_T.h - Introduced DDS_Get_T, DDS_Listen_T, DDS_Read_T, DDS_Update_T, and - DDS_Write_T templates which implement the dds4ccm extended ports - -Mon Dec 7 11:157:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - Add second port to test - -Mon Dec 7 11:12:49 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Instance state should be alive in all cases. - -Mon Dec 7 10:54:16 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Implemented max_delivered_data. - -Mon Dec 7 10:30:38 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - Rewritten test due to timing issues. Also added a 'no data' test. - -Mon Dec 7 10:07:57 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/PSLDeadline: - * connectors/dds4ccm/tests/PSLDeadline/Base: - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl: - * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Connector: - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.idl: - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h: - * connectors/dds4ccm/tests/PSLDeadline/descriptors: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/PSLDeadline/Receiver: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h - * connectors/dds4ccm/tests/PSLDeadline/Sender: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.idl: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: - Add test PortStatusListener:on_requested_deadline_missed for DDS_Listen port - -Mon Dec 7 06:52:05 UTC 2009 Abdullah Sowayan - - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - - Extended this test to test a struct attribute of a component. - The descriptor file needs to be extended as well. - -Mon Dec 7 06:08:31 UTC 2009 Abdullah Sowayan - - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - - Extended this test to test a sequence attribute of a component. - The descriptor file needs to be extended to capture data - for the sequence attribute(s). - -Mon Dec 7 03:02:18 UTC 2009 Abdullah Sowayan - - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - - Fixed a small bug in a switch statement where one of the - cases did not have a 'break' statement. - -Sun Dec 6 19:22:45 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - Changed layout debug message - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - Implement more portstatus listner functionality - -Sun Dec 6 18:49:47 UTC 2009 William R. Otte - - * tests/Bug_3769_Regression/Foo_exec.cpp: - - Fixed the comparison for float to ensure the numeric literal isn't - converted to a double. - - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - - Float configproperty was incorrectly typed as a double. - - * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: - - Fixed bug whereby floats/doubles weren't properly dereferences. - -Sat Dec 5 01:06:06 UTC 2009 Abdullah Sowayan - - * bin/ciao_tests.lst: - - Add bugzilla 3769 to the list of test to run. - -Sat Dec 5 00:59:20 UTC 2009 Abdullah Sowayan - - * tests/Bug_3769_Regression: - * tests/Bug_3769_Regression/Foo.idl: - * tests/Bug_3769_Regression/Foo.mpc: - * tests/Bug_3769_Regression/Foo_exec.h: - * tests/Bug_3769_Regression/Foo_exec.cpp: - * tests/Bug_3769_Regression/descriptors: - * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp: - * tests/Bug_3769_Regression/descriptors/NodeMap.dat: - * tests/Bug_3769_Regression/descriptors/run_test.pl: - * tests/Bug_3769_Regression/model: - - Added bugzilla 3769. Component attributes of type double and float - do not get set properly by DAnCE. - -Fri Dec 4 20:41:45 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - Introduced a PortStatusListener which is than the base of - the DataReaderListener - -Fri Dec 4 14:31:45 UTC 2009 Marcel Smit - - * tests/CIAO_ComponentServer/SimpleComponent/run_test.pl: - Resolved fuzz error. - -Fri Dec 4 14:28:18 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Enabled some more test for fuzz. - -Fri Dec 4 14:15:24 UTC 2009 Marcel Smit - - * tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: - Adapted to the new test framework. Fuzz - errors/warnings should be resolved - -Fri Dec 4 13:53:04 UTC 2009 Marcel Smit - - * tests/IDL3_to_XMI/Bug_3607_Regression/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Array/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Included_File/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Module_Reopen/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Native/run_test.pl: - * tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: - Resolved some minor fuzz errors/warnings. - -Fri Dec 4 13:49:58 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h: - Add more infrastructure for the 5 extended ports this connector - provides - -Fri Dec 4 13:23:46 UTC 2009 Marcel Smit - - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * tests/CIAO_ComponentServer/Basic/run_test.pl: - Resolved runtime errors in script. - -Fri Dec 4 13:14:10 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Fixed many_by_many. The last updates should be send to - the listener. - -Fri Dec 4 13:04:58 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/idl/dds4ccm.mpc - * connectors/dds4ccm/impl/ndds/DataListenerControl.cpp - * connectors/dds4ccm/impl/ndds/DataListenerControl.h - * connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp - * connectors/dds4ccm/impl/ndds/DataListenerControl_T.h - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp - * connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/StateListenerControl.cpp - * connectors/dds4ccm/impl/ndds/StateListenerControl.h - * connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp - * connectors/dds4ccm/impl/ndds/StateListenerControl_T.h - Refactored data/state listener controls - -Fri Dec 4 12:56:58 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Refactored MANY_BY_MANY. - -Fri Dec 4 11:24:25 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Implemented MANY_BY_MANY. First all new samples are handled. - After that the updated ones, by invoking on_many_updates on - the listener. The last step is to inform the listener - about the deleted samples. - -Fri Dec 4 10:38:26 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Resolved compiler errors. - -Fri Dec 4 10:21:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Extended logging - -Fri Dec 4 10:11:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h: - Removed listener callbacks that are handled by the subscriber - -Fri Dec 4 09:49:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/tests/Updater/* - Use the stateconnector as starting point - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - First compile fixes - - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - Handle data_on_readers - -Fri Dec 4 09:34:09 UTC 2009 Marcel Smit - - * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: - * tests/CIAO_ComponentServer/Activator/run_test.pl: - * tests/IDL_Test/Double_Inherited_Component/run_test.pl: - Resolved fuzz errors/warnings. - -Fri Dec 4 09:04:34 UTC 2009 Marcel Smit - - * tests/CIAO_ComponentServer/Activator/run_test.pl: - * tests/CIAO_ComponentServer/Basic/run_test.pl: - Resolved fuzz errors/warnings. - -Fri Dec 4 08:32:42 UTC 2009 Marcel Smit - - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - Resolved fuzz errors/warnings. - -Thu Dec 3 20:12:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp - Layout changes - -Thu Dec 3 20:08:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - Added a lot of logging and made the subscriberlistener - working again - -Thu Dec 3 20:08:39 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - Only returning valid data. - -Thu Dec 3 18:46:35 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp: - Using a take in stead of take_next_sample. Also created - Created difference between ONE_BY_ONE and MANY_BY_MANY by - invoking on_one_update and on_many_updates on the listener. - -Thu Dec 3 15:13:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp: - Resolved warning unused parameter. - -Thu Dec 3 14:06:14 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - Removed the context switch. - Created difference between ONE_BY_ONE and MANY_BY_MANY by - introducing a take (in stead of take_next_sample). - -Thu Dec 3 13:57:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - Handle everything related to the CSL at subscriber/publisher - level - - * DAnCE/RepositoryManager/RepositoryManager.mpc: - Corrected base project - -Thu Dec 3 13:52:57 UTC 2009 Marijke Hengstmengel - - *bin/ciao_tests.lst: - * connectors/dds4ccm/tests/CSLUnexpStat: - * connectors/dds4ccm/tests/CSLUnexpStat/Base: - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: - Test ConnectorStatusListener:on_unexpected_status implemented - - -Thu Dec 3 12:56:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp: - Let each layer initialise itself - -Thu Dec 3 12:06:32 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - Added keys and max_dds_samples to idl. - -Thu Dec 3 11:07:49 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - UnkeyedWriter test may fail since DDS allows more - samples than configured in the QoS file. - -Thu Dec 3 11:06:37 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Resolved compiler warnings on Windows. - -Thu Dec 3 11:03:34 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp: - Resolved some runtime errors. Expected_samples and name are not - used in Sender. - -Thu Dec 3 10:51:20 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - Disabled the listener for now. No takes should be performed. - - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - Rewritten in order to test exceptions from the connector. - -Thu Dec 3 10:14:28 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - Build in checks on received data. - - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - Write more samples - -Wed Dec 3 08:56:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - Solved initialize warnings. - -Thu Dec 3 08:55:27 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - Reduced log level. - -Thu Dec 3 08:47:23 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl: - Adapted to the update Reader port. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Minor code optimization. - -Thu Dec 3 08:28:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - Don't handle data_on_readers, if we install this listener, - the data reader listener will not get any on_data_available - -Wed Dec 2 14:57:57 UTC 2009 Johnny Willemsen - - * DAnCE/NodeApplication/ComponentAttributesSetter.cpp: - Use the word error to trigger the scoreboard parser - -Wed Dec 2 14:19:49 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Used operators to file readinfo sequences. - - * connectors/dds4ccm/impl/ndds/SampleInfo.h: - Removed <== operator for readinfo_seq. Also added - instance handle when copying sample_info. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Added handle tests and test exceptions related to handles. - - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Changed timing. - -Wed Dec 2 13:58:57 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst: - Add test to test list. - -Wed Dec 2 13:49:57 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/impl/ndds/Utils.cpp: - * connectors/dds4ccm/impl/ndds/Utils.h: - * connectors/dds4ccm/tests/CSLSampleRejected: - * connectors/dds4ccm/tests/CSLSampleRejected/Base: - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: - Created test ConnectorStatusListener:on_sample_rejected - -Wed Dec 2 13:35:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - Handle data_on_readers - -Wed Dec 2 13:12:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener.h - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp - * connectors/dds4ccm/impl/ndds/TopicListener_T.h - Added a get_mask to all listeners, this should return the - mask the listener needs, this is then used by the connector - templates. This way a listener can listen for more callbacks - and update his mask without any connector to be updated - -Wed Dec 2 13:10:40 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Implemented read_last. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Optimized tests. - -Wed Dec 2 11:52:26 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Cleaned up code by removing double code. Implemented - read_all. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Enabled read_all test. - -Wed Dec 2 11:33:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Utils.cpp: - * connectors/dds4ccm/impl/ndds/Utils.h: - Added translate_statuskind - -Wed Dec 2 11:16:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp: - * connectors/dds4ccm/impl/ndds/SubscriberListener.h: - Implemented more CSL callbacks - -Wed Dec 2 10:57:20 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.h: - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Implemented read_one_last and read_one_all according to - spec. - - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - Enabled read_one_last and read_one_all to test. - - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - Sleep between writing samples to DDS. - - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - Optimized logging. - -Wed Dec 2 10:26:57 UTC 2009 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Containers/Session/Session_Container.h: - Improved failure reporting in case we can't get the needed - entities - -Wed Dec 2 09:05:57 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h: - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h: - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h: - Moved publisher and subscriber to the DDS_TopicBase - -Wed Dec 2 08:33:57 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added reader test to the test framework. - -Wed Dec 2 08:28:44 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Started with read_one_last. - - * connectors/dds4ccm/tests/Reader: - * connectors/dds4ccm/tests/Reader/Base: - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl: - * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc: - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl: - * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc: - * connectors/dds4ccm/tests/Reader/Connector: - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.idl: - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc: - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h: - * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.cpp: - * connectors/dds4ccm/tests/Reader/README: - * connectors/dds4ccm/tests/Reader/Receiver: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Reader/Sender: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.idl: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h: - * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/Reader/descriptors: - * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: - Added test to test the Reader. - -Tue Dec 01 12:39:37 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/Reader_T.cpp: - Implemented read_one_all - -Tue Dec 01 11:50:37 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h - * connectors/dds4ccm/impl/ndds/ndds_impl.mpc - * connectors/dds4ccm/impl/ndds/StateListenerControl.cpp - * connectors/dds4ccm/impl/ndds/StateListenerControl.h - StateListenerControl - -Tue Dec 01 10:59:37 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - StateListener - -Tue Dec 01 09:42:37 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h - * connectors/dds4ccm/impl/ndds/DataReaderListener.h - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h - * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp - * connectors/dds4ccm/impl/ndds/PublisherListener_T.h - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp - * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h - * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp - * connectors/dds4ccm/impl/ndds/TopicListener_T.h - * connectors/dds4ccm/impl/ndds/Updater_T.cpp - * connectors/dds4ccm/impl/ndds/Updater_T.h - Implemented empty listeners for each dds entity and first - part of DDS_State - -Tue Dec 01 08:33:37 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc - Corrected mpc file for connector_stub - -Mon Nov 30 13:00:37 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - Corrected warnings for unused parameters - - -Mon Nov 30 13:00:37 UTC 2009 Marijke Hengstmengel - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc: - Corrected long project names and add tests to test list. - -Mon Nov 30 12:27:37 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h: - Empty state connector so that we can start with creating tests - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h: - Corrected ifdef guards - -Mon Nov 30 11:32:37 UTC 2009 Marijke Hengstmengel - - * connectors/dds4ccm/tests/CSLDeadline: - * connectors/dds4ccm/tests/CSLDeadline/Base: - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl: - * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Connector: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/descriptors: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLDeadline/Receiver: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLDeadline/Sender: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h: - Test ConnectorStatusListener on_offered_deadline_missed. - - * connectors/dds4ccm/tests/CSLQoS: - * connectors/dds4ccm/tests/CSLQoS/Base: - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl: - * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc: - * connectors/dds4ccm/tests/CSLQoS/Connector: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h: - * connectors/dds4ccm/tests/CSLQoS/descriptors: - * connectors/dds4ccm/tests/CSLQoS/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: - * connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/CSLQoS/Receiver: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h: - * connectors/dds4ccm/tests/CSLQoS/Sender: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.idl: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp: - * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h: - Test ConnectorStatusListener on_requested- and on_offered_incompatible_QoS. - -Mon Nov 30 09:21:37 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: - * ciao/Servants/Port_Activator_T.h: - * DAnCE/TargetManager/DomainDataManager.h: - * DAnCE/TargetManager/ResourceCommitmentManager.h: - Doxygen fixes - -Sun Nov 29 13:06:02 CST 2009 Johnny Willemsen - - * CIAO version 0.7.5 released. - -Thu Nov 26 20:18:37 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp: - Layout changes - - * ciao/ComponentServer/CIAO_RTComponentServer.cpp: - * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp: - Latest changes for rt component server to have server declared priorities - -Thu Nov 26 19:30:37 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - When creating the process options, calculate the size of the - commandline, the default of 1024 can be too small if the - system has multiple network interfaces - -Thu Nov 26 19:03:37 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - Check if we successfully constructed the commandline - -Thu Nov 26 18:52:37 UTC 2009 Johnny Willemsen - - * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp: - If the narrow of the callback IOR fails, print the IOR - - * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: - Const change - -Thu Nov 26 15:32:37 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedWriter/README: - * connectors/dds4ccm/tests/UnkeyedSamples/README: - Added test description - - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: - Removed keys. - - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - Removed keys. Added qos_profile. - - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - Started with configuring DDS in order to test the unkeyed - writer. - -Thu Nov 26 13:59:39 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - KeyedWriter is not fixed, yet. - -Thu Nov 26 13:48:39 UTC 2009 Johnny Willemsen - - * ciao/Servants/Servant_Impl_Base.cpp: - * ciao/Servants/Servant_Impl_Base.h: - Removed some methods or made them pure virtual, no need to let - them throw no_implement, the derived template does implement it - -Thu Nov 26 13:29:51 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Removed CLINFO from log message in order to consistent with other - log messages. - -Thu Nov 26 13:11:06 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Resolved runtime errors. - - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp: - Resolved test error: test took longer than 60 seconds. - -Thu Nov 26 12:56:39 UTC 2009 Johnny Willemsen - - * ciao/Containers/Session/Session_Container.h: - Removed not needed forward declaration - - * ciao/Servants/Servant_Impl_Base.cpp: - Keep a reference to the home servant so that it doesn't get deleted - when we have a reference to it - - * ciao/Servants/Servant_Impl_T.cpp: - Only print the refcount of the executor when it is > 1, than we have - a leak - -Thu Nov 26 12:54:39 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp: - Resolved some test errors when using write_many. - -Thu Nov 26 12:40:18 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Resolved test errors. Expected samples should always be in the - deployment plan. - - * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp: - Added expected samples. - - * connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml: - Resolved test error by adding qos_profile to the deployment plan. - -Thu Nov 26 12:18:07 UTC 2009 Marcel Smit - - - * connectors/dds4ccm/examples/Quoter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/examples/Shapes/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/Get_Connection_Test/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/KeyedSamples/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - Removed these files since the default qos is coded. - -Thu Nov 26 12:12:36 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - Resolved compiler warnings on linux. - -Thu Nov 26 11:43:12 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp: - Also reported messages when things go as planned. - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Resolved some compiler error. - -Thu Nov 26 11:37:12 UTC 2009 Johnny Willemsen - - * examples/Hello/descriptors_RTCCM/*: - Deleted, not used - - * examples/Hello/Sender/Sender_exec.cpp: - Return the correct string - - * examples/Hello/descriptors/DeploymentPlan.cdp: - Removed rate attribute - -Thu Nov 26 10:50:12 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp: - Give more feedback on the test itself - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - Layout changes, create topic with profile, and fixed key_fields set/get methods - -Thu Nov 26 10:42:12 UTC 2009 Marcel Smit - - * examples/Hello/Receiver/Receiver.idl: - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Receiver/Receiver_exec.cpp: - Reverted some of my last changes. - Removed timer functionality. - - * examples/Hello/Sender/Sender.idl: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - * examples/Hello/descriptors/DeploymentPlan.cdp: - Removed log_time attribute. - - * examples/Hello/descriptors/run_test.pl: - No sleep necessary anymore. - -Thu Nov 26 10:19:55 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Changed logging on exit. Reporting an error only when received < expected. - -Thu Nov 26 09:28:25 UTC 2009 Marcel Smit - - * examples/Hello/Receiver/Receiver.idl: - * examples/Hello/Receiver/Receiver_exec.h: - * examples/Hello/Receiver/Receiver_exec.cpp: - Reviced this example a bit. The receiver now uses the - orb reator thread to call the sender periodically. Therefore - the receiver is not blocked in the receiving CCM event method. - Also introduced a rate in the deployment plan; no hard coded - sleep of 200 seconds anymore. - - * examples/Hello/Sender/Sender.idl: - * examples/Hello/Sender/Sender_exec.h: - * examples/Hello/Sender/Sender_exec.cpp: - Removed attribute Hertz since it was not used - - * examples/Hello/descriptors/DeploymentPlan.cdp: - Introduced rate for the receiver (see above). - - * examples/Hello/descriptors/run_test.pl: - Added a sleep of 60 seconds. - -Thu Nov 26 08:09:39 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Optimized logging for ConnectorStatusListener. - - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc: - Resolved fuzz warning (project names too long). - -Thu Nov 26 07:32:26 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl: - Since the connector is now cleaning up the DDS environment, shutting - down takes considerably longer. Therefore extended the shutdown times. - -Wed Nov 25 16:22:26 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h: - * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - Using the orb reactor thread in order to handle application specific - logic. - - * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp: - Optimized logging. - -Wed Nov 25 15:50:57 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: - Logged errors instead of warnings when received!=expected. - - * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp: - Nothing is received when this deployment plan is ran. - -Wed Nov 25 15:40:59 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp: - Resolved minor typos. - -Wed Nov 25 15:30:14 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/KeyedSamples/README: - * connectors/dds4ccm/tests/SetConnectorAttributes/README: - Added test description. - -Wed Nov 25 15:15:43 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/Get_Connection_Test/README: - * connectors/dds4ccm/tests/NonChangeableAttribute/README: - Added test description. - -Wed Nov 25 14:26:21 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/idl/dds_rtf2_dcps.idl - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipant.h - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp - * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h - * connectors/dds4ccm/impl/ndds/Publisher.cpp - * connectors/dds4ccm/impl/ndds/Publisher.h - * connectors/dds4ccm/impl/ndds/Subscriber.cpp - * connectors/dds4ccm/impl/ndds/Subscriber.h - Implemented all with_profile methods - -Wed Nov 25 14:12:21 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/UnkeyedWriter: - * connectors/dds4ccm/tests/UnkeyedWriter/Base: - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h: - * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl: - Added an unkeyed writer test. - -Wed Nov 25 13:45:05 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - * connectors/dds4ccm/tests/SetConnectorAttributes: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl: - * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h: - * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/Plan.cdp: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/USER_QOS_PROFILES.xml: - * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl: - Added this test in order to test whether the connector attributes are set properly. - -Wed Nov 25 13:15:25 UTC 2009 Marcel Smit - - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - Resolved typo in setting key_fields. - -Wed Nov 25 13:05:24 UTC 2009 Johnny Willemsen - - * ciao/Containers/Servant_Activator.cpp: - Fix typo in debug statement - - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp: - * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: - Removed updater functionality - - * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp: - Added missing \n to debug messages - - * tests/CIAO_ComponentServer/Activator/run_test.pl: - * tests/CIAO_ComponentServer/Basic/run_test.pl: - * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl: - Shortened timeouts - - * ciao/ComponentServer/CIAO_ComponentServer.cpp: - For x.7.5, don't wait for worker threads - - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h: - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp: - Some cleanup and destroy dds entities at ccm_remove - -Wed Nov 25 10:54:24 UTC 2009 Marcel Smit - - * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp: - Resolved some errors. - - * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl: - * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl: - No need to wait 60 seconds. - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Optimized logging. - -Wed Nov 25 09:39:17 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - Optimized logging. - -Wed Nov 25 09:37:22 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector_exec.h: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector_exec.cpp: - Renamed ConnectorStatusListener_TestSec_Connecto in order to resolve fuzz errors. - -Wed Nov 25 09:28:44 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - Some code outlining. - - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h: - * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp: - Added connector status listener. - - * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp: - Optimized logging. - -Wed Nov 25 09:21:31 UTC 2009 Johnny Willemsen - - * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp: - layout change - - * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp: - Added missing trace - - * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp: - Fixed trace and layout change - - * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: - Don't use the qos because the conversions are not fully implemented - - * connectors/dds4ccm/impl/ndds/Subscriber.cpp: - Use default qos - -Wed Nov 25 08:47:31 UTC 2009 Johnny Willemsen - - * tests/Bug_2130_Regression/descriptors/run_test.pl: - * examples/Null_Component/descriptors/run_test.pl: - * examples/Hello/descriptors_RTCCM/rt_run_test.pl: - * examples/Hello/descriptors/run_test_without_ns.pl: - * examples/Hello/descriptors/run_test_alias.pl: - * examples/Display/descriptors/run_test_without_ns.pl: - * examples/BasicSP/descriptors/run_test.pl: - * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: - * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: - Use more realistic timeouts, this will shorten the test runs - a lot at the moment a test or example is broken - - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp - * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp - * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h - * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h - * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h - * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h - * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h - * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.h - * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.h - * DAnCE/tests/CIAO/Components/SimpleNull_exec.h - * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h - * DAnCE/tests/CIAO/Components/SimplePublisher_exec.h - * DAnCE/tests/CIAO/Components/SimpleUser_exec.h - Removed generated headers from these files - -Wed Nov 25 08:31:31 UTC 2009 Johnny Willemsen - - * examples/Hello/Receiver/Receiver_exec.cpp - * examples/Hello/Receiver/Receiver_exec.h - * examples/Hello/Sender/Sender_exec.cpp - * examples/Hello/Sender/Sender_exec.h - * examples/Null_Component/Null_Component_exec.cpp - * examples/Null_Component/Null_Component_exec.h - * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent_exec.h - * tests/Minimum/Receiver/Receiver_exec.cpp - * tests/Minimum/Receiver/Receiver_exec.h - * tests/Minimum/Sender/Sender_exec.cpp - * tests/inimum/Sender/Sender_exec.h - Removed generated headers from these files - -Wed Nov 25 08:19:31 UTC 2009 Marcel Smit - - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc: - Fixed order error on Windows. - -Wed Nov 25 07:52:16 UTC 2009 Marcel Smit - - * bin/ciao_tests.lst: - Added !FIXED_BUGS_ONLY to Get_Connection_Test since the updater - is not working, yet. - - * connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp: - No need to write samples to activate the listener. - - * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: - * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp: - * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp: - Resolved compiler warnings. - -Tue Nov 24 19:34:00 UTC 2009 Johnny Willemsen - - * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: - - Resolved a bug whereby connection endpoints in the original plan - would be copied into two separate connections in a child plan. - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Bugfix with connection logic. - - * connectors/ami4ccm/examples/Hello/AMI/AMI.idl: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.h: - * connectors/ami4ccm/examples/Hello/AMI/AMI_exec.cpp: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.idl: - * connectors/ami4ccm/examples/Hello/Hello_Base/Hello_Base.mpc: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h: - * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: - * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp: - * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: - - Ported to new local interface support. - -Mon Dec 7 18:21:43 UTC 2009 William R. Otte - - * docs/schema/Basic_Deployment_Data.xsd: - * tools/Config_Handlers/Basic_Deployment_Data.cpp: - * tools/Config_Handlers/Basic_Deployment_Data.hpp: - * tools/Config_Handlers/CPD_Handler.cpp: - * tools/Config_Handlers/DnC_Dump.cpp: - * tools/Config_Handlers/PSPE_Handler.cpp: - - Config handler updates. - -Mon Dec 7 17:51:30 UTC 2009 William R. Otte - - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.idl: - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc: - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.h: - * tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.cpp: - * tests/CIAO_ComponentServer/Local_Facet/client.cpp: - * tests/CIAO_ComponentServer/Local_Facet/run_test.pl: - - Added simple test for local facet connection logic. - -Mon Dec 7 17:04:43 UTC 2009 William R. Otte - - * tests/CIAO_ComponentServer/Local_Facet: - - Moved local facet test under ComponentServer. - - * tests/IDL_Test/Local_Facet: - - Removed these files. - -Mon Dec 7 14:52:43 UTC 2009 William R. Otte - - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/Containers/Session/Session_Container.cpp: - - Integration. - -Mon Dec 7 14:11:14 UTC 2009 William R. Otte - - * ciao/ComponentServer/CIAO_ComponentServer.idl: - * ciao/ComponentServer/CIAO_Container_Impl.h: - * ciao/ComponentServer/CIAO_Container_Impl.cpp: - * ciao/Containers/Container_Base.idl: - * ciao/Containers/Session/Session_Container.h: - * ciao/Containers/Session/Session_Container.cpp: - * ciao/Servants/Servant_Impl_Base.h: - - Container code. - -Sat Dec 5 05:33:43 UTC 2009 William R. Otte - - * DAnCE/Deployment/Deployment_DeploymentPlan.idl: - * DAnCE/NodeApplication/NodeApplication_Impl.h: - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: - - Infrastructure to connect local interfaces. - - * tests/IDL_Test/Local_Facet/Local_Facet.mpc: - - Enabled test. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/CIAO/DAnCE/MPC/config/dance_split_plan.mpb b/CIAO/DAnCE/MPC/config/dance_split_plan.mpb index 7dca6a02e25..5ef5536636a 100644 --- a/CIAO/DAnCE/MPC/config/dance_split_plan.mpb +++ b/CIAO/DAnCE/MPC/config/dance_split_plan.mpb @@ -1,5 +1,4 @@ // $Id$ - project : dance, dance_deployment_stub, dance_tools { after += DAnCE_Split_Plan_Impl libs += DAnCE_Split_Plan_Impl diff --git a/CIAO/DAnCE/Plan_Launcher/Deployment_Failure.h b/CIAO/DAnCE/Plan_Launcher/Deployment_Failure.h deleted file mode 100644 index bc073921794..00000000000 --- a/CIAO/DAnCE/Plan_Launcher/Deployment_Failure.h +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @file Deployment_Failure.h - * @author William R. Otte - * - * $Id$ - * - * Defines exceptions used internally to the Plan Launcher - */ - -#ifndef DANCE_DEPLOYMENT_FAILURE -#define DANCE_DEPLOYMENT_FAILURE - -#include "ace/SString.h" - -namespace DAnCE -{ - struct Deployment_Failure - { - Deployment_Failure (const ACE_CString &ex) : ex_ (ex) {} - - ACE_CString ex_; - }; -} - -#endif diff --git a/CIAO/DAnCE/Plan_Launcher/EM_Launcher.cpp b/CIAO/DAnCE/Plan_Launcher/EM_Launcher.cpp deleted file mode 100644 index 3d683f42c2d..00000000000 --- a/CIAO/DAnCE/Plan_Launcher/EM_Launcher.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// $Id$ - -#include "EM_Launcher.h" - -namespace DAnCE -{ - EM_Launcher::EM_Launcher (CORBA::ORB_ptr orb, - __Base::Manager_ptr manager) - : __Base (orb, manager) - { - } - - - - EM_Launcher::~EM_Launcher (void) - { - - } - - bool - EM_Launcher::lookup_by_uuid (const char *uuid, - CORBA::Object_out am, - CORBA::Object_out app) - { - DANCE_TRACE ("EM_Launcher::lookup_by_uuid"); - - try - { - ::Deployment::DomainApplicationManagers_var managers = this->manager_->getManagers (); - - for (CORBA::ULong i = 0; i < managers->length (); ++i) - { - ::Deployment::DeploymentPlan_var plan (managers[i]->getPlan ()); - ACE_CString plan_uuid (plan->UUID.in ()); - if (plan_uuid == uuid) - { - am = CORBA::Object::_duplicate (managers[i]); - - ::Deployment::Applications_var apps = managers[i]->getApplications (); - - if (apps->length () != 0) - { - app = CORBA::Object::_duplicate (apps[0]); - return true; - } - else return false; - } - } - } - catch (const CORBA::Exception &ex) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("EM_Launcher::lookup_by_uuid - ") - ACE_TEXT ("Caught CORBA Exception: %C\n"), - ex._info ().c_str ())); - throw Deployment_Failure (ex._info ()); - } - catch (...) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("EM_Launcher::lookup_by_uuid - ") - ACE_TEXT ("Unknown C++ exception\n"))); - throw Deployment_Failure ("Unknown C++ exception in lookup_by_uuid\n"); - } - - return false; - } - -} diff --git a/CIAO/DAnCE/Plan_Launcher/EM_Launcher.h b/CIAO/DAnCE/Plan_Launcher/EM_Launcher.h deleted file mode 100644 index 06f70fa46be..00000000000 --- a/CIAO/DAnCE/Plan_Launcher/EM_Launcher.h +++ /dev/null @@ -1,44 +0,0 @@ -/** - * @file EM_Launcher.h - * @author William R. Otte - * - * $Id$ - * - * Plan Launcher bridge for the Execution Manager. - */ - -#ifndef DANCE_PLAN_LAUNCHER_EM -#define DANCE_PLAN_LAUNCHER_EM - -#include "Plan_Launcher_Base_Impl_T.h" - -#include "DAnCE/Deployment/Deployment_DomainApplicationC.h" -#include "DAnCE/Deployment/Deployment_DomainApplicationManagerC.h" -#include "DAnCE/Deployment/Deployment_ExecutionManagerC.h" - -namespace DAnCE -{ - class EM_Launcher : - public virtual Plan_Launcher_Base_Impl< ::Deployment::ExecutionManager, - ::Deployment::DomainApplicationManager, - ::Deployment::DomainApplication > - { - typedef Plan_Launcher_Base_Impl< ::Deployment::ExecutionManager, - ::Deployment::DomainApplicationManager, - ::Deployment::DomainApplication > __Base; - - public: - EM_Launcher (CORBA::ORB_ptr orb, - __Base::Manager_ptr managerw); - - ~EM_Launcher (void); - - - bool lookup_by_uuid (const char *uuid, - CORBA::Object_out am, - CORBA::Object_out app); - - }; -} - -#endif diff --git a/CIAO/DAnCE/Plan_Launcher/NM_Launcher.cpp b/CIAO/DAnCE/Plan_Launcher/NM_Launcher.cpp deleted file mode 100644 index d95477b7c9f..00000000000 --- a/CIAO/DAnCE/Plan_Launcher/NM_Launcher.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ - -#include "NM_Launcher.h" - -namespace DAnCE -{ - NM_Launcher::NM_Launcher (CORBA::ORB_ptr orb, - __Base::Manager_ptr manager) - : __Base (orb, manager) - { - } - - - - NM_Launcher::~NM_Launcher (void) - { - - } -} diff --git a/CIAO/DAnCE/Plan_Launcher/NM_Launcher.h b/CIAO/DAnCE/Plan_Launcher/NM_Launcher.h deleted file mode 100644 index c089c37c7bb..00000000000 --- a/CIAO/DAnCE/Plan_Launcher/NM_Launcher.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @file NM_Launcher.h - * @author William R. Otte - * - * $Id$ - * - * Plan Launcher bridge for the Node Manager. - */ - -#ifndef DANCE_PLAN_LAUNCHER_NM -#define DANCE_PLAN_LAUNCHER_NM - -#include "Plan_Launcher_Base_Impl_T.h" - -#include "DAnCE/Deployment/Deployment_NodeApplicationC.h" -#include "DAnCE/Deployment/Deployment_NodeApplicationManagerC.h" -#include "DAnCE/Deployment/Deployment_NodeManagerC.h" - -namespace DAnCE -{ - class NM_Launcher : - public virtual Plan_Launcher_Base_Impl< ::Deployment::NodeManager, - ::Deployment::NodeApplicationManager, - ::Deployment::NodeApplication > - { - typedef Plan_Launcher_Base_Impl< ::Deployment::NodeManager, - ::Deployment::NodeApplicationManager, - ::Deployment::NodeApplication > __Base; - - public: - NM_Launcher (CORBA::ORB_ptr orb, - __Base::Manager_ptr managerw); - - ~NM_Launcher (void); - - - }; -} - -#endif diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp index 4f2aefeb8e9..d784f689507 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp @@ -1,442 +1,11 @@ // $Id$ #include "ace/Dynamic_Service.h" -#include "ace/Env_Value_T.h" -#include "ace/Get_Opt.h" #include "tao/ORB.h" #include "tao/Object.h" #include "DAnCE/Logger/Log_Macros.h" #include "DAnCE/Logger/Logger_Service.h" -#include "DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h" - -#include "EM_Launcher.h" -#include "NM_Launcher.h" - -//#include "Plan_Launcher_Impl.h" - -namespace -{ - struct Options - { - enum MODE - { - LAUNCH, - STARTLAUNCH, - FINISHLAUNCH, - START, - TEARDOWN, - INVALID - }; - - Options (void) - : em_ior_ (0), - nm_ior_ (0), - xml_plan_ (0), - cdr_plan_ (0), - uuid_ (0), - am_ior_ (0), - app_ior_ (0), - output_ (false), - output_prefix_ (0), - mode_ (LAUNCH) - {} - - const ACE_TCHAR *em_ior_; - const ACE_TCHAR *nm_ior_; - const ACE_TCHAR *xml_plan_; - const ACE_TCHAR *cdr_plan_; - const ACE_TCHAR *uuid_; - const ACE_TCHAR *am_ior_; - const ACE_TCHAR *app_ior_; - bool output_; - const ACE_TCHAR *output_prefix_; - MODE mode_; - }; -} - - -void -usage(const ACE_TCHAR*) -{ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Plan Launcher Options :\n") - - ACE_TEXT ("\t-k|--em-ior \t\t") - ACE_TEXT ("ExecutionManager IOR for EM based deployment.\n") - ACE_TEXT ("\t-n|--nm-ior \t") - ACE_TEXT ("NodeManager IOR for NM based deployment.\n") - /* - ACE_TEXT ("\nName Service Options\n") - ACE_TEXT ("\t--domain-nc [NC]\t\tDomain Naming Context (default will rir NameService)\n") - ACE_TEXT ("\t--instance-nc [NC]\t\tInstance Naming Context (default will rir NameService)\n") - */ - ACE_TEXT ("\nPlan Identification Options:\n") - ACE_TEXT ("\t-c|--cdr-plan \n") - ACE_TEXT ("\t-x|--xml-plan \n") - ACE_TEXT ("\t-u|--plan-uuid \tOnly supported for EM-based deployments\n") - ACE_TEXT ("\t-a|--app-ior \t\tIOR for ApplicationManager entity (Domain or Node)\n") - ACE_TEXT ("\t-m|--am-ior \t\tIOR For Application entity (Domain or Node)\n") - - ACE_TEXT ("\nPlan Control Options:\n") - ACE_TEXT ("The default action is to fully launch a plan. The following options may be used\n") - ACE_TEXT ("to arrive at a different state\n") - ACE_TEXT ("\t-l|--launch-plan\t\tLaunch the plan (Requires CDR/XML plan)\n") - ACE_TEXT ("\t-s|--stop-plan\t\t\tStop the plan (Requires Plan, UUID, or APP/AM references") - - ACE_TEXT ("\nOther Options\n") - ACE_TEXT ("\t-o|--output[prefix]\t\tOutput IOR files that result from plan control action,") - ACE_TEXT ("if any. Optional prefix to filename defaults to plan UUID if plan is provided." - "Default is on for NM-based deployments.\n") - - ACE_TEXT ("\t-h|--help\t\t\tShow this usage information\n") - )); -} - -bool -parse_args(int argc, ACE_TCHAR *argv[], Options &options) -{ - DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("PL options : \""))); - - for (int i = 0; i < argc; ++i) - { - DANCE_DEBUG (9, (LM_TRACE, "\t%s\n", argv[i])); - } - - ACE_Get_Opt get_opt(argc, argv, - ACE_TEXT ("k:n:c:x:u:m:a:lso::h")); - get_opt.long_option(ACE_TEXT("em-ior"), 'k', ACE_Get_Opt::ARG_REQUIRED); - get_opt.long_option(ACE_TEXT("nm-ior"), 'n', ACE_Get_Opt::ARG_REQUIRED); - get_opt.long_option(ACE_TEXT("xml-plan"), 'x', ACE_Get_Opt::ARG_REQUIRED); - get_opt.long_option(ACE_TEXT("cdr-plan"), 'c', ACE_Get_Opt::ARG_REQUIRED); - get_opt.long_option(ACE_TEXT("plan-uuid"), 'u', ACE_Get_Opt::ARG_REQUIRED); - get_opt.long_option(ACE_TEXT("am-ior"), 'm', ACE_Get_Opt::ARG_REQUIRED); - get_opt.long_option(ACE_TEXT("app-ior"), 'a', ACE_Get_Opt::ARG_REQUIRED); - get_opt.long_option(ACE_TEXT("launch-plan"), 'l', ACE_Get_Opt::NO_ARG); - get_opt.long_option(ACE_TEXT("stop-plan"), 's', ACE_Get_Opt::NO_ARG); - get_opt.long_option(ACE_TEXT("output"), 'o', ACE_Get_Opt::ARG_OPTIONAL); - get_opt.long_option(ACE_TEXT("help"), 'h', ACE_Get_Opt::NO_ARG); - - int c; - ACE_CString s; - while ( (c = get_opt ()) != EOF) - { - switch (c) - { - case 'k': - if (get_opt.opt_arg () == 0) - { - options.em_ior_ = "corbaname:rir:/NameService#ExecutionManager"; - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::parse_args - Defaulting to ") - ACE_TEXT ("NameService lookup of ExecutionManager\n"))); - } - else - { - options.em_ior_ = get_opt.opt_arg (); - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::parse_args -") - ACE_TEXT ("Using ExecutionManager IOR: %s\n"), - options.em_ior_)); - } - break; - - case 'n': - options.nm_ior_ = get_opt.opt_arg (); - options.output_ = true; - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::parse_args -") - ACE_TEXT ("Using NodeManager IOR: %s\n"), - options.nm_ior_)); - break; - - case 'x': - options.xml_plan_ = get_opt.opt_arg (); - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::parse_args -") - ACE_TEXT ("Using XML plan: %s\n"), - options.xml_plan_)); - break; - - case 'c': - options.cdr_plan_ = get_opt.opt_arg (); - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::parse_args -") - ACE_TEXT ("Using CDR plan: %s\n"), - options.cdr_plan_)); - break; - - case 'u': - options.uuid_ = get_opt.opt_arg (); - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::parse_args -") - ACE_TEXT ("Using UUID: %s\n"), - options.uuid_)); - break; - - case 'm': - options.am_ior_ = get_opt.opt_arg (); - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::parse_args -") - ACE_TEXT ("Using ApplicationManager IOR %s\n"), - options.am_ior_)); - break; - - case 'a': - options.app_ior_ = get_opt.opt_arg (); - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::parse_args -") - ACE_TEXT ("Application IOR: %s\n"), - options.app_ior_)); - break; - - case 'l': - options.mode_ = Options::LAUNCH; - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::parse_args -") - ACE_TEXT ("Launching nominated plan\n"))); - break; - - case 's': - options.mode_ = Options::TEARDOWN; - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::parse_args -") - ACE_TEXT ("Tearing down nominated plan\n"))); - break; - - case 'o': - options.output_ = true; - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::parse_args - ") - ACE_TEXT ("IOR files will be output to the current working directory\n"))); - - if (get_opt.opt_arg () != 0) - { - options.output_prefix_ = get_opt.opt_arg (); - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::parse_args - ") - ACE_TEXT ("Storing user-provided output postfix <%s>\n"), - options.output_prefix_)); - } - - break; - - case 'h': - usage (argv[0]); - return false; - default: - usage (argv[0]); - return false; - } - } - - /// Sanity checking on the options. - - // In all cases, we need to have a EM/NM IOR specified, but only one. - if ((!options.em_ior_ && !options.nm_ior_) || - (options.em_ior_ && options.nm_ior_)) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_launcher::parse_args - ") - ACE_TEXT ("Error: Must specify either EM IOR or NM IOR\n"))); - return false; - } - - // Launching plans requires a plan (duh), and only one plan - if ((options.mode_ == Options::LAUNCH) && - ((!options.xml_plan_ && !options.cdr_plan_) || - (options.xml_plan_ && options.cdr_plan_))) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::parse_args - ") - ACE_TEXT ("Error: Launching plans requires exactly one type of plan (CDR/XML) be ") - ACE_TEXT ("specified.\n"))); - return false; - } - - // tearing down plans requires a bit more complex set of options: - if ((options.mode_ == Options::TEARDOWN) - // Either way (EM/NM), we ca use a combination of a AM and a APP. - && !( - (options.am_ior_ && options.app_ior_) || - // If we are tearing down from EM, we have more options, namely: - // A plan of some kind - (options.em_ior_ && - ( - ((!options.xml_plan_ && !options.cdr_plan_) || - (options.xml_plan_ && options.cdr_plan_)) || - // A UUID - (!options.uuid_) - ) - ) - ) - ) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::parse_args - ") - ACE_TEXT ("Invalid set of plan identification as required for teardown\n"))); - return false; - } - - - return true; -} - -bool -write_IOR (const ACE_TCHAR * ior_file_name, const char* ior) -{ - FILE* ior_output_file_ = ACE_OS::fopen (ior_file_name, ACE_TEXT("w")); - - if (ior_output_file_) - { - ACE_OS::fprintf (ior_output_file_, "%s", ior); - ACE_OS::fclose (ior_output_file_); - return true; - } - return false; -} - -int launch_plan (const Options &opts, - DAnCE::Plan_Launcher_Base *pl_base, - const ::Deployment::DeploymentPlan *plan, - CORBA::ORB_ptr orb) -{ - DANCE_TRACE ("Plan_Launcher::launch_plan"); - - try - { - CORBA::Object_var app_mgr, app; - - ACE_CString uuid (pl_base->launch_plan (*plan, app_mgr.out () , app.out ())); - - DANCE_DEBUG (2, (LM_NOTICE, DLINFO ACE_TEXT ("Plan_Launcher::launch_plan - ") - ACE_TEXT ("Successfully deployed plan with UUID: <%C>\n"), - uuid.c_str ())); - - if (!opts.output_) - return 0; - - ACE_TString am_output, app_output; - - if (opts.output_prefix_) - am_output = app_output = opts.output_prefix_; - else - am_output = app_output = ACE_TEXT_CHAR_TO_TCHAR (uuid.c_str ()); - - am_output += ACE_TEXT ("_AM.ior"); - app_output += ACE_TEXT ("_APP.ior"); - - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::launch_plan - ") - ACE_TEXT ("Writing Application Manager IOR to <%s>\n"), - am_output.c_str ())); - write_IOR (am_output.c_str (), - orb->object_to_string (app_mgr.in ())); - - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::launch_plan - ") - ACE_TEXT ("Writing Application IOR to <%s>\n"), - am_output.c_str ())); - write_IOR (app_output.c_str (), - orb->object_to_string (app.in ())); - - } - catch (const DAnCE::Deployment_Failure &ex) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::launch_plan - ") - ACE_TEXT ("Deployment failed, exception: %C\n"), - ex.ex_.c_str ())); - return -1; - } - catch (const CORBA::Exception &ex) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::launch_plan - ") - ACE_TEXT ("Deployment failed, caught CORBA exception %C\n"), - ex._info ().c_str ())); - return -1; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::launch_plan - ") - ACE_TEXT ("Deployment failed, caught unknown C++ exception\n"))); - return -1; - } - - return 0; -} - -int teardown_plan (const Options &opts, - DAnCE::Plan_Launcher_Base *pl_base, - const ::Deployment::DeploymentPlan *plan, - CORBA::ORB_ptr orb) -{ - DANCE_TRACE ("Plan_Launcher::teardown_plan"); - - try - { - if (opts.am_ior_ && opts.app_ior_) - { - DANCE_DEBUG (3, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::teardown_plan - ") - ACE_TEXT ("Tearing down plan with explicitly nominated App and AM IORs.\n"))); - CORBA::Object_var am (orb->string_to_object (opts.am_ior_)); - CORBA::Object_var app (orb->string_to_object (opts.app_ior_)); - - pl_base->teardown_application (am, app); - } - else - { - // Need to perform lookup by uuid, either explicitly provided or in plan. - ACE_CString uuid; - if (plan) - uuid = plan->UUID.in (); - else - uuid = opts.uuid_; - - DAnCE::EM_Launcher *em_launcher = dynamic_cast (pl_base); - - if (!em_launcher) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::teardown_plan - ") - ACE_TEXT ("Error: Attempting UUID lookup on non-EM managed plan not supported\n"))); - return -1; - } - - CORBA::Object_var am, app; - if (em_launcher->lookup_by_uuid (uuid.c_str (), - am.out (), - app.out ())) - { - DANCE_DEBUG (3, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher::teardown_plan - ") - ACE_TEXT ("Tearing down plan with UUID %C\n"), - uuid.c_str ())); - pl_base->teardown_application (am, app); - } - else - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::teardown_plan - ") - ACE_TEXT ("Error: Lookup by UUID failed\n"))); - return -1; - } - } - } - catch (const DAnCE::Deployment_Failure &ex) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::teardown_plan - ") - ACE_TEXT ("Teardown failed, exception: %C\n"), - ex.ex_.c_str ())); - return -1; - } - catch (const CORBA::Exception &ex) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::teardown_plan - ") - ACE_TEXT ("Teardown failed, caught CORBA exception %C\n"), - ex._info ().c_str ())); - return -1; - } - catch (...) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher::teardown_plan - ") - ACE_TEXT ("Teardown failed, caught unknown C++ exception\n"))); - return -1; - } - - return 0; -} - -struct ORB_Destroyer -{ - ORB_Destroyer (CORBA::ORB_var &orb) : - orb_ (orb) - { - } - - ~ORB_Destroyer (void) - { - orb_->destroy (); - } - CORBA::ORB_var &orb_; -}; +#include "Plan_Launcher_Impl.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) @@ -456,126 +25,34 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } DANCE_DEBUG (6, (LM_TRACE, DLINFO - ACE_TEXT("PlanLauncher - initializing ORB\n"))); + ACE_TEXT("PlanLauncher - initializing ORB\n"))); CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - - ORB_Destroyer safe_orb (orb); - - Options options; - if (!parse_args (argc, argv, options)) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher - ") - ACE_TEXT ("Failed to parse command line arguments, exiting.\n"))); - return -1; - } - - - auto_ptr pl_base (0); - - if (options.em_ior_) - { - // Resolve ExecutionManager IOR for EM base deployment. - DAnCE::EM_Launcher *em_pl (0); - - CORBA::Object_var obj = orb->string_to_object (options.em_ior_); - Deployment::ExecutionManager_var tmp_em = Deployment::ExecutionManager::_narrow (obj); - - if (CORBA::is_nil (tmp_em.in ())) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher - ") - ACE_TEXT ("Unable to resolve ExecutionManager reference <%s>\n"), - options.em_ior_)); - return -1; - } - - ACE_NEW_THROW_EX (em_pl, - DAnCE::EM_Launcher (orb.in (), - tmp_em.in ()), - CORBA::NO_MEMORY ()); - - pl_base.reset (em_pl); - } - else - { - // Resolve NM IOR for NM based deployment. - DAnCE::NM_Launcher *nm_pl (0); - CORBA::Object_var obj = orb->string_to_object (options.nm_ior_); - Deployment::NodeManager_var tmp_em = Deployment::NodeManager::_narrow (obj); - - if (CORBA::is_nil (tmp_em.in ())) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher - ") - ACE_TEXT ("Unable to resolve NodeManager reference <%s>\n"), - options.em_ior_)); - return -1; - } - - ACE_NEW_THROW_EX (nm_pl, - DAnCE::NM_Launcher (orb.in (), - tmp_em.in ()), - CORBA::NO_MEMORY ()); - - pl_base.reset (nm_pl); - } + DANCE_DEBUG (6, (LM_TRACE, DLINFO + ACE_TEXT("PlanLauncher - initializing module instance\n"))); - - Deployment::DeploymentPlan_var dp; - - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Plan_Launcher - ") - ACE_TEXT ("Parsing deployment plan\n"))); - if (options.cdr_plan_) - { - dp = DAnCE::Convert_Plan::read_cdr_plan (options.cdr_plan_); - if (!dp.ptr ()) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("PlanLauncher - Error: Unable to read in XML plan\n"))); - return -1; - } - } - else if (options.xml_plan_) - { - dp = DAnCE::Convert_Plan::read_xml_plan (options.xml_plan_); - - if (!dp.ptr ()) - { - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("PlanLauncher - Error: Unable to read in CDR plan\n"))); - return -1; - } - } - - switch (options.mode_) - { - case Options::LAUNCH: - retval = launch_plan (options, pl_base.get (), dp, orb.in ()); - - break; - - case Options::TEARDOWN: - retval = teardown_plan (options, pl_base.get (), dp, orb.in ()); - break; + Plan_Launcher_Impl pl (orb.in (), argc, argv); + pl.execute(); + + DANCE_DEBUG (6, (LM_TRACE, DLINFO + ACE_TEXT("PlanLauncher - destroying ORB\n"))); - default: - ACE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher -") - ACE_TEXT ("Mode not yet supported\n"))); - break; - - }; + orb->destroy (); } - catch (const DAnCE::Deployment_Failure& e) + catch (const Plan_Launcher_Impl::Deployment_Failure& e) { - ACE_ERROR ((LM_ERROR, DLINFO "PlanLauncher - Error: %C.\n", e.ex_.c_str())); + DANCE_ERROR (1, (LM_ERROR, DLINFO "PlanLauncher - Error: %C.\n", e.error_.c_str())); retval = -1; } catch (const CORBA::Exception& ex) { - ACE_ERROR ((LM_ERROR, DLINFO "PlanLauncher - Error: %C\n", ex._info ().c_str ())); + ex._tao_print_exception ("PlanLauncher"); retval = -1; } catch (...) { - ACE_ERROR ((LM_ERROR, "PlanLauncher - Error: Unknown exception.\n")); + DANCE_ERROR (1, (LM_ERROR, "PlanLauncher - Error: Unknown exception.\n")); retval = -1; } diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc index 00f939a7541..a838f6e2d68 100644 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc @@ -1,22 +1,11 @@ // -*- MPC -*- // $Id$ -project(DAnCE_Plan_Launcher_Impl) : dance_lib, dance_logger, dance_convert_plan, \ - dance_executionmanager_stub, \ - dance_nodemanager_stub { - Source_Files { - EM_Launcher.cpp - NM_Launcher.cpp - } - - Template_Files { - Plan_Launcher_Base_Impl_T.cpp - } -} - -project(Plan_Launcher_Exec) : dance_exe, dance_plan_launcher { +project(Plan_Launcher_Exec) : dance_exe, dance_logger, xerces, dance_executionmanager_stub, dance_config_handlers { exename = dance_plan_launcher Source_Files { Plan_Launcher.cpp + Plan_Launcher_Base_Impl.cpp + Plan_Launcher_Impl.cpp } } diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base.h deleted file mode 100644 index 3afb773e928..00000000000 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base.h +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @file Plan_Launcher_Base.h - * @author William R. Otte - * - * $Id$ - * - * ABC for the EM/NM bridges. - */ - -#ifndef DANCE_PLAN_LAUNCHER_BASE -#define DANCE_PLAN_LAUNCHER_BASE - -#include "Deployment/Deployment_DeploymentPlanC.h" -#include "Deployment/Deployment_ConnectionC.h" - -namespace DAnCE -{ - class Plan_Launcher_Base - { - public: - virtual const char * launch_plan (const ::Deployment::DeploymentPlan &plan, - CORBA::Object_out am, - CORBA::Object_out app) = 0; - - virtual CORBA::Object_ptr prepare_plan (const ::Deployment::DeploymentPlan &plan) = 0; - - virtual CORBA::Object_ptr start_launch (CORBA::Object_ptr app_mgr, - const ::Deployment::Properties &properties, - ::Deployment::Connections_out connections) = 0; - - virtual void finish_launch (CORBA::Object_ptr application, - const ::Deployment::Connections &provided_connections, - bool start) = 0; - - virtual void start (CORBA::Object_ptr application) = 0; - - /// Tears down a plan given the UUID - virtual void teardown_application (CORBA::Object_ptr app_mgr, - CORBA::Object_ptr app) = 0; - - virtual void destroy_app_manager (CORBA::Object_ptr app_mgr) = 0; - - virtual void create_external_connections(const ::Deployment::DeploymentPlan &plan, - Deployment::Connections &conn) = 0; - }; -} - -#endif diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp new file mode 100644 index 00000000000..10fcf4083b6 --- /dev/null +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp @@ -0,0 +1,774 @@ +// $Id$ + +#include "Plan_Launcher_Base_Impl.h" +#include "DAnCE/Logger/Log_Macros.h" +#include "ace/Env_Value_T.h" +#include "ace/OS_NS_stdio.h" +#include "ace/Get_Opt.h" + +Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl(CORBA::ORB_ptr orb, int argc, + ACE_TCHAR *argv[]) : + orb_(CORBA::ORB::_duplicate (orb)), + em_(Deployment::ExecutionManager::_nil()), em_ior_("file://em.ior") //default + , mode_(0x0) +{ + DANCE_TRACE ("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl"); + if (CORBA::is_nil (this->orb_)) + { + DANCE_DEBUG (8, (LM_INFO, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - ") + ACE_TEXT("Creating internal ORB.\n"))); + this->orb_ = CORBA::ORB_init (argc, argv); + } + + this->parse_args(argc, argv); + + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_i::init - em_ior = \"%C\"\n") + , this->em_ior_.c_str())); + + if (this->mode_ & (MODE_START_PLAN | MODE_STOP_PLAN)) + { + CORBA::Object_var obj; + if (this->em_ior_.length() > 0) + { + obj = this->orb_->string_to_object(this->em_ior_.c_str()); + if (CORBA::is_nil(obj)) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - ") + ACE_TEXT("Failed to retrieve EM object from \"%C\"\n"), this->em_ior_.c_str())); + throw Deployment_Failure ("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " + "failed to retrieve EM object"); + } + } + try + { + this->em_ = ::Deployment::ExecutionManager::_narrow (obj.in()); + } + catch(const CORBA::Exception&) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - ") + ACE_TEXT("Failed to retrieve EM object from \"%C\"\n"), this->em_ior_.c_str())); + throw Deployment_Failure ("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " + "failed to retrieve EM object"); + } + + if (CORBA::is_nil (this->em_.in())) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - ") + ACE_TEXT("failed to get an execution manager.\n"))); + throw Deployment_Failure ("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " + "failed to get an execution manager"); + } + } + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - ") + ACE_TEXT("Obtained Execution Manager ref\n"))); +} + +Plan_Launcher_Base_Impl::~Plan_Launcher_Base_Impl() +{ +} + +void Plan_Launcher_Base_Impl::execute() +{ + DANCE_TRACE ("Plan_Launcher_Base_Impl::execute - "); + + if (this->mode_ & MODE_START_PLAN) + { + size_t sz = this->cdr_plan_urls_.size(); + for (size_t i= 0; i < sz; ++i) + { + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::execute - ") + ACE_TEXT("launching plan \"<%s>\"...\n"), this->cdr_plan_urls_[i].c_str())); + ::Deployment::DeploymentPlan_var plan = this->read_cdr_plan_file(this->cdr_plan_urls_[i].c_str()); + try + { + CORBA::String_var uuid = this->launch_plan (plan.in()); + if (0 == uuid.in ()) + { + throw Deployment_Failure ("Plan_Launcher_Base_Impl::execute - " + "Error launching plan\n"); + } + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::execute - ") + ACE_TEXT("returned plan UUID is \"%C\"\n"), uuid.in ())); + } + catch (...) + { + this->teardown_plan (plan->UUID.in()); + throw; + } + } + } + else if (this->mode_ & MODE_STOP_PLAN) + { + this->stop_plan(); + } +} + +const char * +Plan_Launcher_Base_Impl::launch_plan (const ::Deployment::DeploymentPlan &plan) +{ + DANCE_TRACE ("Plan_Launcher_Base_Impl::launch_plan"); + + try + { + DANCE_DEBUG (6, (LM_DEBUG, DLINFO + ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - Starting...\n"))); + if (CORBA::is_nil (this->em_.in ())) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT ("launch_plan called witn an uninitialized EM.\n"))); + return 0; + } + + DANCE_DEBUG (6, (LM_DEBUG, DLINFO + ACE_TEXT ("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT ("about to call this->em_->preparePlan\n"))); + + ::Deployment::DomainApplicationManager_var dam; + try + { + dam = this->em_->preparePlan (plan, 0); + } + catch(...) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("An exception was thrown during EM->preparePlan.\n"))); + throw; + } + + DANCE_DEBUG (6, (LM_DEBUG, DLINFO + ACE_TEXT ("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT ("after to call this->em_->preparePlan\n"))); + + if (CORBA::is_nil (dam.in ())) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("CIAO_PlanLauncher:preparePlan call failed: ") + ACE_TEXT("nil DomainApplicationManager reference\n"))); + return 0; + } + else + { + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("DAM was received from preparePlan.\n"))); + } + + this->write_dam_ior (dam.in()); + + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("Obtained DAM ref\n"))); + + ::Deployment::Properties_var properties; + ACE_NEW_RETURN (properties, + Deployment::Properties, + 0); + + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("before startLaunch...\n"))); + + ::Deployment::Connections_var conns; + Deployment::Application_var da; + try + { + da = dam->startLaunch (properties.in (), conns.out()); + } + catch(...) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("An exception was thrown during DAM->startLaunch.\n"))); + throw; + } + + if (CORBA::is_nil (da.in())) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("CIAO_PlanLauncher:startLaunch call failed: ") + ACE_TEXT("nil DomainApplication reference\n"))); + return 0; + } + else + { + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("DomainApplication was received from startLaunch\n"))); + } + + this->create_external_connections (plan, conns.inout()); + + // Call finish Launch to complete the connections + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("before finishLaunch\n"))); + try + { + da->finishLaunch (conns.in(), false); // is_ReDAC by default is + } + catch(...) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("An exception was thrown during DA->finishLaunch.\n"))); + throw; + } + + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("after finishLaunch\n"))); + + // Call start to activate components + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("before start activating components...\n"))); + + try + { + da->start (); + } + catch(...) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT("An exception was thrown during DA->start.\n"))); + throw; + } + + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - [success]\n"))); + DANCE_DEBUG (6, (LM_DEBUG, DLINFO + ACE_TEXT ("Plan_Launcher_Base_Impl::launch_plan - ") + ACE_TEXT ("Application Deployed successfully\n"))); + + } + catch (const Deployment::ResourceNotAvailable& ex) + { + char buf[1024]; + ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: ResourceNotAvaiable exception caught: <%s>,\n" + "Type: <%s>\n" + "Property: <%s>\n" + "Element: <%s>\n" + "Resource: <%s>\n", + ex.name.in (), + ex.resourceType.in (), + ex.propertyName.in (), + ex.elementName.in (), + ex.resourceName.in ()); + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); + throw Deployment_Failure (buf); + } + catch (const Deployment::StartError& ex) + { + char buf[1024]; + ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: StartError exception caught: <%s>, <%s>\n", + ex.name.in (), + ex.reason.in ()); + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); + throw Deployment_Failure (buf); + } + catch (const Deployment::InvalidProperty& ex) + { + char buf[1024]; + ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: InvalidProperty exception caught: <%s>, <%s>\n", + ex.name.in (), + ex.reason.in ()); + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); + throw Deployment_Failure (buf); + } + catch (const Deployment::InvalidConnection& ex) + { + char buf[1024]; + ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: InvalidConnection exception caught: <%s>, <%s>\n", + ex.name.in (), + ex.reason.in ()); + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); + throw Deployment_Failure (buf); + } + catch (const CORBA::Exception& ex) + { + char buf[1024]; + ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - CORBA EXCEPTION: <%s>\n", + ex._info().fast_rep()); + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); + throw Deployment_Failure (buf); + } + catch (...) + { + char buf[1024]; + ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: non-CORBA exception\n"); + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); + throw Deployment_Failure (buf); + } + + return CORBA::string_dup (plan.UUID.in()); +} + +bool Plan_Launcher_Base_Impl::teardown_plan(const char *uuid) +{ + DANCE_TRACE ("Plan_Launcher_Base_Impl::teardown_plan"); + + try + { + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - looking for uuid=\"%C\"\n"), uuid)); + ::Deployment::DomainApplicationManagers_var mgrs = this->em_->getManagers(); + ::Deployment::DomainApplicationManager_var dapp_mgr; + for (size_t i = 0; i < mgrs->length(); ++i) + { + ACE_CString s = (*mgrs) [i]->getPlan()->UUID.in(); + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - ") + ACE_TEXT("comparing with existing uuid=\"%C\"\n"), s.c_str())); + if (s == uuid) + { + dapp_mgr = ::Deployment::DomainApplicationManager::_duplicate ( (*mgrs) [i].in()); + break; + } + } + + if (!::CORBA::is_nil (dapp_mgr.in())) + { + this->teardown_plan (dapp_mgr.in()); + } + else + { + throw Deployment_Failure ("Failed to find DAM by UUID"); + } + } + catch (const CORBA::Exception&) + { + // @todo the destroy_dam_by_plan could give a stoperror exception + // we should handle + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - ") + ACE_TEXT("Unable to find DomainApplicationManager ") + ACE_TEXT("for plan with uuid: %C\n"), uuid)); + throw; + } + + return true; +} + +void +Plan_Launcher_Base_Impl::teardown_plan(::Deployment::DomainApplicationManager_ptr dam) +{ + DANCE_DEBUG (6, (LM_DEBUG, DLINFO + ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - destroy the application.....\n"))); + ::Deployment::Applications_var apps = dam->getApplications(); + if (0 == apps->length()) + { + DANCE_DEBUG (6, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - ") + ACE_TEXT("DAM has no application.\n"))); + } + for (CORBA::ULong i = 0; i < apps->length(); ++i) + { + dam->destroyApplication(apps[i]); + } + this->destroy_dam(dam); + + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - [success]\n"))); +} + +void +Plan_Launcher_Base_Impl::destroy_dam( + ::Deployment::DomainApplicationManager_ptr dam) +{ + DANCE_DEBUG (6, (LM_DEBUG, DLINFO + ACE_TEXT("Plan_Launcher_Base_Impl::destroy_dam - destroy the manager.....\n"))); + this->em_->destroyManager(dam); + + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::destroy_dam - [success]\n"))); +} + +void +Plan_Launcher_Base_Impl::usage(const ACE_TCHAR*) +{ + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Plan Launcher Options :\n") + ACE_TEXT ("-k|--em-ior ") + ACE_TEXT (" : Default file://em.ior\n") + ACE_TEXT ("-d|--read-cdr-plan \n") + ACE_TEXT ("-w|--write-cdr-plan \n") + ACE_TEXT ("-t|--plan-uuid \n") + // ACE_TEXT ("-a|dam-ior \n") + ACE_TEXT ("-q|--stop-plan : Stop the plan\n") + ACE_TEXT ("-h|--help : Show this usage information\n") + ACE_TEXT ("-x|--read-plan \n\n"))); +} + +void +Plan_Launcher_Base_Impl::parse_args(int argc, ACE_TCHAR *argv[]) +{ + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("PL options : \""))); + + for (int i = 0; i < argc; ++i) + { + DANCE_DEBUG (9, (LM_TRACE, "\t%s\n", argv[i])); + } + + ACE_Get_Opt get_opt(argc, argv, + ACE_TEXT ("k:d:w:t:a:qx:h"), 0); + get_opt.long_option(ACE_TEXT("em-ior"), 'k', ACE_Get_Opt::ARG_REQUIRED); + get_opt.long_option(ACE_TEXT("read-cdr-plan"), 'd', ACE_Get_Opt::ARG_REQUIRED); + get_opt.long_option(ACE_TEXT("write-cdr-plan"), 'w', ACE_Get_Opt::ARG_REQUIRED); + get_opt.long_option(ACE_TEXT("plan-uuid"), 't', ACE_Get_Opt::ARG_REQUIRED); + get_opt.long_option(ACE_TEXT("dam-ior"), 'a', ACE_Get_Opt::ARG_REQUIRED); + get_opt.long_option(ACE_TEXT("stop-plan"), 'q', ACE_Get_Opt::NO_ARG); + get_opt.long_option(ACE_TEXT("read-plan"), 'x', ACE_Get_Opt::ARG_REQUIRED); + get_opt.long_option(ACE_TEXT("help"), 'h', ACE_Get_Opt::NO_ARG); + + int c; + ACE_CString s; + while ( (c = get_opt ()) != EOF) + { + switch (c) + { + case 'k': + this->em_ior_ = expand_env_vars (get_opt.opt_arg()); + break; + case 'd': + s = expand_env_vars (get_opt.opt_arg()); + // trim leading file:// + if (0 < s.length()) + { + ssize_t const pos = s.find("file://"); + if (0 == pos) + { + s = s.substring(7); + } + this->cdr_plan_urls_.push_back(s); + } + break; + case 'w': + if (0 < this->cdr_dest_url_.length()) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Ambiguity: more then one --write-cdr-plan option.\n"))); + throw Deployment_Failure("Ambiguity: more then one --write-cdr-plan option."); + } + this->cdr_dest_url_ = expand_env_vars (get_opt.opt_arg()); + this->mode_ |= MODE_WRITE_CDR; + // trim leading file:// + if (0 < this->cdr_dest_url_.length()) + { + ssize_t pos = this->cdr_dest_url_.find("file://"); + if (0 == pos) + { + this->cdr_dest_url_= this->cdr_dest_url_.substring(7); + } + } + break; + case 't': + this->plan_uuid_ = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg()); + break; + case 'a': + this->dam_ior_ = expand_env_vars (get_opt.opt_arg()); + DANCE_DEBUG (9, (LM_TRACE, "Parsed DAM IOR : %s\n", this->dam_ior_.c_str())); + break; + case 'q': + this->mode_ |= MODE_STOP_PLAN; + break; + case 'x': + this->xml_plan_urls_.push_back(expand_env_vars (get_opt.opt_arg())); + break; + case 'h': + usage (argv[0]); + throw Help_Issued (); + break; + default: + usage (argv[0]); + throw Deployment_Failure ("parse_args : invalid arguments"); + } + } + if (0 == (this->mode_ & (MODE_STOP_PLAN | MODE_WRITE_CDR))) + { + this->mode_ |= MODE_START_PLAN; + } + // Post-check + this->check_mode_consistentness(); +} + +void +Plan_Launcher_Base_Impl::write_dam_ior( + ::Deployment::DomainApplicationManager_ptr dam) +{ + if (this->dam_ior_.length () == 0) + return; + + CORBA::String_var ior = this->orb_->object_to_string(dam); + + FILE* ior_output_file = ACE_OS::fopen (this->dam_ior_.c_str(), "w"); + + if (ior_output_file) + { + ACE_OS::fprintf (ior_output_file, "%s", ior.in()); + ACE_OS::fclose (ior_output_file); + } + else + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("PlanLauncher.cpp::write_dap_ior - Error in opening file <%s> to write DAM IOR: %m"), + this->dam_ior_.c_str())); + throw Deployment_Failure (ACE_CString ("write_dap_ior - Error in opening file <%s> to write DAM IOR: %m") + + this->dam_ior_); + } +} + +void +Plan_Launcher_Base_Impl::stop_plan(void) +{ + bool stopped = false; + if (!is_empty (this->plan_uuid_)) + { + stopped = true; + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("Stopping plan \"%C\"\n"), this->plan_uuid_.c_str ())); + + if (!this->teardown_plan(this->plan_uuid_.c_str ())) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("tear down assembly failed: unknown plan uuid.\n"))); + } + } + + if (!is_empty (this->dam_ior_)) + { + stopped = true; + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("Stopping plan by DAM IOR.\n"))); + CORBA::Object_var + obj = this->orb_->string_to_object(this->dam_ior_.c_str()); + if (CORBA::is_nil (obj.in ())) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO + ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("tear down assembly failed: DAM IOR is invalid.\n"))); + } + else + { + Deployment::DomainApplicationManager_var + dam = Deployment::DomainApplicationManager::_narrow (obj.in()); + this->teardown_plan(dam.in()); + } + } + + if (0 < this->cdr_plan_urls_.size()) + { + stopped = true; + size_t const sz = this->cdr_plan_urls_.size(); + for (size_t i = 0; i < sz; ++i) + { + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("Stopping plan by plan file : <%s>\n"), this->cdr_plan_urls_[i].c_str())); + ::Deployment::DeploymentPlan_var plan = this->read_cdr_plan_file(this->cdr_plan_urls_[i].c_str()); + if (!this->teardown_plan(plan->UUID.in())) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("tear down assembly failed: unknown plan uuid.\n"))); + } + } + } + + if (!stopped && 0 == this->xml_plan_urls_.size()) + { + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ") + ACE_TEXT("Stopping plan all running plans.\n"))); + ::Deployment::DomainApplicationManagers_var + mgrs = this->em_->getManagers(); + ::Deployment::DomainApplicationManager_var dapp_mgr; + for (size_t i = 0; i < mgrs->length(); ++i) + { + this->teardown_plan((*mgrs) [i]); + } + } +} + +void +Plan_Launcher_Base_Impl::create_external_connections( + const ::Deployment::DeploymentPlan &plan, Deployment::Connections& conn) +{ + DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("create_external_connections - start\n"))); + for (CORBA::ULong i = 0; i < plan.connection.length(); i++) + { + if (plan.connection[i].externalReference.length() > 0 + && plan.connection[i].externalReference[0].provider) + { + DANCE_DEBUG (6, (LM_DEBUG, + "Plan_Launcher_i::create_external_connections - create connection %C from IOR %C\n", + plan.connection[i].name.in(), + plan.connection[i].externalReference[0].location.in())); + CORBA::ULong const indx = conn.length(); + conn.length(indx + 1); + conn[indx].name= CORBA::string_dup (plan.connection[i].name.in()); + conn[indx].endpoint.length(1L); + CORBA::Object_ptr + obj = this->orb_->string_to_object(plan.connection[i].externalReference[0].location.in()); + if (!CORBA::is_nil (obj)) + { + //Components::CCMObject_ptr ccmobj = Components::CCMObject::_narrow (obj); + conn[indx].endpoint[0] = obj; + } + else + { + DANCE_DEBUG (6, (LM_DEBUG, + ACE_TEXT("Plan_Launcher_i::create_external_connections - can't create object for IOR %C\n"), + plan.connection[i].externalReference[0].location.in())); + throw 0; + } + } + } +} + +Deployment::DeploymentPlan* +Plan_Launcher_Base_Impl::read_cdr_plan_file(const char *cdr_plan_uri) +{ + Deployment::DeploymentPlan* res = 0; + try + { + FILE* file = ACE_OS::fopen (cdr_plan_uri, "r"); + if (0 == file) + { + ACE_CString s = "read_cdr_plan_file : failed to open file \""; + s += cdr_plan_uri; + s += "\""; + throw Deployment_Failure (s.c_str()); + } + + size_t buf_size = 0; + ACE_OS::fread (&buf_size, sizeof (buf_size), 1, file); + + char * buf = new char[buf_size]; + ACE_OS::fread (buf, 1, buf_size, file); + { + TAO_InputCDR cdr (buf, buf_size); + ACE_NEW_THROW_EX (res, + Deployment::DeploymentPlan (), + CORBA::NO_MEMORY ()); + cdr >> *res; + } + delete [] buf; + ACE_OS::fclose (file); + } + catch(...) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Failed to read CDR plan file.\n"))); + throw Deployment_Failure("Failed to read CDR plan file."); + } + return res; +} + +void +Plan_Launcher_Base_Impl::write_cdr_plan_file(const char * filename, + const Deployment::DeploymentPlan & plan) +{ + try + { + FILE * file = ACE_OS::fopen (filename, "w"); + if (0 == file) + { + throw Deployment_Failure ("write_cdr_plan_file : failed to open file."); + } + TAO_OutputCDR cdr; + if (cdr << plan) + { + size_t buf_size = cdr.total_length(); + ACE_OS::fwrite (&buf_size, sizeof (buf_size), 1, file); + for (const ACE_Message_Block *i = cdr.begin (); + i != 0; + i = i->cont ()) + { + ACE_OS::fwrite (i->rd_ptr (), 1, i->length (), file); + } + ACE_OS::fclose (file); + } + else + { + throw Deployment_Failure ("write_cdr_plan_file : failed marshal plan."); + } + } + catch(...) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::write_cdr_plan_file - ") + ACE_TEXT("Failed to write CDR plan file.\n"))); + throw Deployment_Failure("Failed to write CDR plan file."); + } +} + +void +Plan_Launcher_Base_Impl::check_mode_consistentness() +{ + if (this->mode_ & MODE_START_PLAN) + { + if (0 == this->cdr_plan_urls_.size() && 0 == this->xml_plan_urls_.size()) + { + throw Deployment_Failure ("check_mode_consistentness : no plan to start"); + } + } + else if (this->mode_ & MODE_STOP_PLAN) + { + // if (is_empty (this->cdr_plan_url_) + // && is_empty (this->xml_plan_url_) + // && is_empty (this->plan_uuid_) + // && is_empty (this->dam_ior_)) + // { + // throw Deployment_Failure ("check_mode_consistentness : no plan to stop"); + // } + } + else if (this->mode_ & MODE_WRITE_CDR) + { + if (is_empty (this->cdr_dest_url_)) + { + throw Deployment_Failure ("check_mode_consistentness : no cdr url for writing plan."); + } + if (1 != this->xml_plan_urls_.size()) + { + throw Deployment_Failure ("check_mode_consistentness : not one source url for writing plan."); + } + } + else + { + throw Deployment_Failure ("check_mode_consistentness : no action specified"); + } + } + +ACE_CString +Plan_Launcher_Base_Impl::expand_env_vars (const ACE_TCHAR * s) + { + ACE_TString src(s); + ACE_TString res; + size_t pos_done = 0; + while (pos_done < (size_t) src.length()) + { + size_t pos_start = src.find ('$', pos_done); + if (ACE_TString::npos == pos_start) + { + res += src.substring (pos_done); + pos_done = src.length(); + } + else // take the substring before '$' and append value + { + if (pos_start > pos_done) + { + res += src.substring (pos_done, pos_start - pos_done); + pos_done = pos_start; + } + + size_t pos_end = src.length(); + + size_t p; + + p = src.find (ACE_TEXT(' '), pos_start + 1); + if (ACE_TString::npos != p && pos_end > p) pos_end = p; + + p = src.find (ACE_TEXT('/'), pos_start + 1); + if (ACE_TString::npos != p && pos_end > p) pos_end = p; + + p = src.find (ACE_TEXT('\\'), pos_start + 1); + if (ACE_TString::npos != p && pos_end > p) pos_end = p; + + p = src.find (ACE_TEXT('$'), pos_start + 1); + if (ACE_TString::npos != p && pos_end > p) pos_end = p; + + if (pos_end - pos_start > 1) + { + ACE_Env_Value val (src.substring (pos_start + 1, pos_end - pos_start - 1).c_str(), 0); + res += val; + pos_done = pos_end; + } + else + { + DANCE_DEBUG (6, (LM_WARNING, DLINFO + ACE_TEXT("Plan_Launcher_Base_Impl::expand_env_vars - ") + ACE_TEXT("Envvar can not be parsed out at %i in \"<%s>\""), + pos_start, + src.c_str())); + } + } + } + return res; + } + diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h new file mode 100644 index 00000000000..e48fdb3997b --- /dev/null +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h @@ -0,0 +1,106 @@ +/** + * $Id$ + * @file Plan_Launcher_Base_Impl.h + * @author Will Otte + * + * Contains the Plan_Launcher_i class, which can be used by + * applications to launch component assemblies. + */ +#ifndef PLAN_LAUNCHER_BASE_IMPL_H +#define PLAN_LAUNCHER_BASE_IMPL_H + +#include "DAnCE/Deployment/Deployment_DomainApplicationManagerC.h" +#include "DAnCE/Deployment/Deployment_ExecutionManagerC.h" +#include "DAnCE/Deployment/Deployment_ConnectionC.h" +#include "ace/Map_Manager.h" +#include "DAnCE/Deployment/Deployment_DeploymentPlanC.h" +#include "ace/Vector_T.h" + +/** + * @class Plan_Launcher_Impl + * @brief This class launches and manages deployment plans. + */ +class Plan_Launcher_Base_Impl +{ +public: + struct Deployment_Failure + { + Deployment_Failure(const ACE_CString &error) : + error_(error) + {} + ACE_CString error_; + }; + + struct Help_Issued + { + Help_Issued() {} + }; + + Plan_Launcher_Base_Impl(CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv[]); + + virtual ~Plan_Launcher_Base_Impl(); + + void execute(); + + static Deployment::DeploymentPlan* read_cdr_plan_file( + const char *deployment_plan_uri); + static void write_cdr_plan_file(const char * filename, + const Deployment::DeploymentPlan & plan); + +protected: + /** + * @brief Launch a plan, given an IDL deployment plan + * @param plan A valid IDL deployment plan + * @returns a string containing the UUID of the plan. Null indicates failure. + */ + virtual const char * launch_plan(const ::Deployment::DeploymentPlan &plan); + + /// Returns the DAM associated with a given plan URI + ::Deployment::DomainApplicationManager_ptr get_dam(const char *uuid); + + /// Tears down a plan given the UUID + bool teardown_plan(const char *uuid); + + void teardown_plan(::Deployment::DomainApplicationManager_ptr dam); + + void destroy_dam(::Deployment::DomainApplicationManager_ptr dam); + + virtual void stop_plan(); + void usage(const ACE_TCHAR* program = 0); + void parse_args(int argc, ACE_TCHAR *argv[]); + + static bool is_empty(const ACE_CString & s) + { + return 0 == s.length(); + } + + void write_dam_ior(::Deployment::DomainApplicationManager_ptr dam); + + void create_external_connections(const ::Deployment::DeploymentPlan &plan, + Deployment::Connections& conn); + + virtual void check_mode_consistentness(); + static ACE_CString expand_env_vars(const ACE_TCHAR * src); + + /// Cached ORB pointer + CORBA::ORB_var orb_; + + /// Object reference of the ExecutionManager + ::Deployment::ExecutionManager_var em_; + + ACE_Vector cdr_plan_urls_; + ACE_CString plan_uuid_; + ACE_CString em_ior_; + ACE_CString dam_ior_; + ACE_Vector xml_plan_urls_; + ACE_CString cdr_dest_url_; + + unsigned long mode_; + static const unsigned long MODE_START_PLAN = 0x0001; + static const unsigned long MODE_STOP_PLAN = 0x0002; + static const unsigned long MODE_USE_NAMING = 0x0004; + static const unsigned long MODE_WRITE_CDR = 0x0008; + +}; // class Plan_Launcher_Impl + +#endif /* PLAN_LAUNCHER_BASE_IMPL_H */ diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp deleted file mode 100644 index 620ff1133a8..00000000000 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp +++ /dev/null @@ -1,529 +0,0 @@ -// $Id$ - -#ifndef PLAN_LAUNCHER_BASE_IMPL_CPP -#define PLAN_LAUNCHER_BASE_IMPL_CPP - -#include "Plan_Launcher_Base_Impl_T.h" - -#include "ace/Env_Value_T.h" -#include "ace/OS_NS_stdio.h" -#include "ace/Get_Opt.h" - -#include "Deployment/Deployment_ApplicationManagerC.h" -#include "DAnCE/Logger/Log_Macros.h" - -#include "Deployment_Failure.h" - -#ifdef GEN_OSTREAM_OPS -#include -#include -#endif /* GEN_OSTREAM_OPS */ - -namespace DAnCE -{ - template - Plan_Launcher_Base_Impl :: - Plan_Launcher_Base_Impl(CORBA::ORB_ptr orb, - Manager_ptr manager) - : orb_ (CORBA::ORB::_duplicate (orb)), - manager_ (Manager::_duplicate (manager)) - { - DANCE_TRACE ("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl"); - if (CORBA::is_nil (this->orb_.in ())) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " - "Plan Launcher requires a valid ORB\n")); - throw Deployment_Failure ("Plan launcher requires a valid ORB\n"); - } - - if (CORBA::is_nil (this->manager_.in ())) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO "Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - " - "Plan Launcher requires a valid Manager reference.\n")); - throw Deployment_Failure ("Plan launcher requires a valid Manager reference\n"); - } - } - - template - Plan_Launcher_Base_Impl < Manager, AppManager, Application> ::~Plan_Launcher_Base_Impl() - { - } - - template - CORBA::Object_ptr - Plan_Launcher_Base_Impl< Manager, AppManager, Application> - ::prepare_plan (const ::Deployment::DeploymentPlan &plan) - { - DANCE_TRACE ("Plan_Launcher_Base_Impl::prepare_plan"); - - -#ifdef GEN_OSTREAM_OPS - { - std::ostringstream plan_stream; - plan_stream << plan << std::endl; - DANCE_DEBUG (9, (LM_TRACE, DLINFO "Convert_Plan - Input plan: %C\n", - plan_stream.str ().c_str ())); - } -#endif /* GEN_OSTREAM_OPS */ - - AppManager_var app_manager; - try - { - app_manager = this->manager_->preparePlan (plan, 0); - } - catch(...) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") - ACE_TEXT("An exception was thrown during EM->preparePlan.\n"))); - throw; - } - - DANCE_DEBUG (6, (LM_DEBUG, DLINFO - ACE_TEXT ("Plan_Launcher_Base_Impl::launch_plan - ") - ACE_TEXT ("after to call preparePlan\n"))); - - if (CORBA::is_nil (app_manager.in ())) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") - ACE_TEXT("preparePlan call failed: ") - ACE_TEXT("nil ApplicationManager reference\n"))); - return 0; - } - else - { - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") - ACE_TEXT("ApplicationMAnager was received from preparePlan.\n"))); - } - - return app_manager._retn (); - } - - template - CORBA::Object_ptr - Plan_Launcher_Base_Impl< Manager, AppManager, Application> - ::start_launch (CORBA::Object_ptr app_mgr, - const ::Deployment::Properties &properties, - ::Deployment::Connections_out connections) - { - DANCE_TRACE ("Plan_Launcher_Base_Impl::start_launch"); - - AppManager_var app_manager (AppManager::_narrow (app_mgr)); - - if (CORBA::is_nil (app_manager.in ())) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Plan_Launcher_Base_Impl::start_launch - ") - ACE_TEXT ("Nil ApplicationManager reference\n"))); - return 0; - } - - Deployment::Application_var da; - try - { - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::start_launch - ") - ACE_TEXT("before startLaunch...\n"))); - da = app_manager->startLaunch (properties, connections); - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::start_launch - ") - ACE_TEXT("startLaunch completed...\n"))); - } - catch(...) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") - ACE_TEXT("An exception was thrown during DAM->startLaunch.\n"))); - throw; - } - - if (CORBA::is_nil (da.in())) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") - ACE_TEXT("CIAO_PlanLauncher:startLaunch call failed: ") - ACE_TEXT("nil DomainApplication reference\n"))); - return 0; - } - else - { - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") - ACE_TEXT("DomainApplication was received from startLaunch\n"))); - } - - return da._retn (); - } - - template - void - Plan_Launcher_Base_Impl< Manager, AppManager, Application> - ::finish_launch (CORBA::Object_ptr app, - const ::Deployment::Connections &provided_connections, - bool start) - { - DANCE_TRACE ("Plan_Launcher_Base_Impl::finish_launch"); - - Application_var application (Application::_narrow (app)); - - if (CORBA::is_nil (application.in ())) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") - ACE_TEXT("Nil Application reference.\n"))); - throw Deployment_Failure ("Nil Application reference"); - } - - // Call finish Launch to complete the connections - try - { - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") - ACE_TEXT("before finishLaunch\n"))); - application->finishLaunch (provided_connections, - start); - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") - ACE_TEXT("finishLaunch completed.\n"))); - } - catch(...) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ") - ACE_TEXT("An exception was thrown during DA->finishLaunch.\n"))); - throw; - } - } - - template - void - Plan_Launcher_Base_Impl< Manager, AppManager, Application> - ::start (CORBA::Object_ptr app) - { - DANCE_TRACE ("Plan_Launcher_Base_Impl::start"); - - Application_var application (Application::_narrow (app)); - - if (CORBA::is_nil (application.in ())) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::start - ") - ACE_TEXT("Nil Application reference.\n"))); - throw Deployment_Failure ("Nil Application reference"); - } - - try - { - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::start - ") - ACE_TEXT("before invoking start on application...\n"))); - application->start (); - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::start - ") - ACE_TEXT("after invoking start on application...\n"))); - } - catch(...) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::start - ") - ACE_TEXT("An exception was thrown during DA->start.\n"))); - throw; - } - } - - template - const char * - Plan_Launcher_Base_Impl< Manager, AppManager, Application> - ::launch_plan (const ::Deployment::DeploymentPlan &plan, - CORBA::Object_out am_out, - CORBA::Object_out app_out) - { - DANCE_TRACE ("Plan_Launcher_Base_Impl::launch_plan"); - - //this->create_external_connections (plan, conns.inout()); - - try - { - CORBA::Object_var app_mgr = this->prepare_plan (plan); - - ::Deployment::Connections_var conns; - - CORBA::Object_var app = this->start_launch (app_mgr.in (), - 0, - conns.out ()); - - this->create_external_connections (plan, - conns.inout ()); - - this->finish_launch (app.in (), - conns, - false); - - this->start (app.in ()); - - DANCE_DEBUG (6, (LM_DEBUG, DLINFO - ACE_TEXT ("Plan_Launcher_Base_Impl::launch_plan - ") - ACE_TEXT ("Application Deployed successfully\n"))); - - am_out = app_mgr._retn (); - app_out = app._retn (); - } - catch (const Deployment::ResourceNotAvailable& ex) - { - char buf[1024]; - ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: ResourceNotAvaiable exception caught: <%s>,\n" - "Type: <%s>\n" - "Property: <%s>\n" - "Element: <%s>\n" - "Resource: <%s>\n", - ex.name.in (), - ex.resourceType.in (), - ex.propertyName.in (), - ex.elementName.in (), - ex.resourceName.in ()); - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); - throw Deployment_Failure (buf); - } - catch (const Deployment::StartError& ex) - { - char buf[1024]; - ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: StartError exception caught: <%s>, <%s>\n", - ex.name.in (), - ex.reason.in ()); - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); - throw Deployment_Failure (buf); - } - catch (const Deployment::InvalidProperty& ex) - { - char buf[1024]; - ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: InvalidProperty exception caught: <%s>, <%s>\n", - ex.name.in (), - ex.reason.in ()); - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); - throw Deployment_Failure (buf); - } - catch (const Deployment::InvalidConnection& ex) - { - char buf[1024]; - ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: InvalidConnection exception caught: <%s>, <%s>\n", - ex.name.in (), - ex.reason.in ()); - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); - throw Deployment_Failure (buf); - } - catch (const CORBA::Exception& ex) - { - char buf[1024]; - ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - CORBA EXCEPTION: <%s>\n", - ex._info().fast_rep()); - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); - throw Deployment_Failure (buf); - } - catch (...) - { - char buf[1024]; - ACE_OS::sprintf (buf, "Plan_Launcher_Base_Impl::launch_plan - EXCEPTION: non-CORBA exception\n"); - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("%C"), buf)); - throw Deployment_Failure (buf); - } - - return CORBA::string_dup (plan.UUID.in()); - } - - template - void - Plan_Launcher_Base_Impl< Manager, AppManager, Application> - ::teardown_application (CORBA::Object_ptr am_obj, - CORBA::Object_ptr app_obj) - { - DANCE_TRACE ("Plan_Launcher_Base_Impl::teardown_application"); - - AppManager_var am (AppManager::_narrow (am_obj)); - - if (CORBA::is_nil (am.in ())) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_application - ") - ACE_TEXT("Nil ApplicationManager reference.\n"))); - throw Deployment_Failure ("Nil ApplicationManager reference"); - } - - Application_var app (Application::_narrow (app_obj)); - - if (CORBA::is_nil (app.in ())) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_appliocation - ") - ACE_TEXT("Nil Application reference.\n"))); - throw Deployment_Failure ("Nil Application reference"); - } - - try - { - am->destroyApplication (app.in ()); - } - catch (const ::Deployment::StopError &ex) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_appliocation - ") - ACE_TEXT ("Caught StopError exception\n"))); - throw Deployment_Failure ("StopError Exception\n"); - } - catch (const CORBA::Exception &ex) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_appliocation - ") - ACE_TEXT ("Caught CORBA exception: %s\n"), - ex._info ().c_str ())); - throw Deployment_Failure (ex._info ().c_str ()); - } - catch (...) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_appliocation - ") - ACE_TEXT ("Caught unknown C++ exception\n"))); - throw Deployment_Failure ("Unknown C++ exception\n"); - } - } - - template - void - Plan_Launcher_Base_Impl< Manager, AppManager, Application> - ::destroy_app_manager(CORBA::Object_ptr am_obj) - { - DANCE_TRACE ("Plan_Launcher_Base_Impl::destroy_app_manager"); - - AppManager_var am (AppManager::_narrow (am_obj)); - - if (CORBA::is_nil (am.in ())) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::destroy_app_manager - ") - ACE_TEXT("Nil ApplicationManager reference.\n"))); - throw Deployment_Failure ("Nil ApplicationManager reference"); - } - - try - { - DANCE_ERROR (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::destroy_app_manager - ") - ACE_TEXT ("Destroying ApplicationManager\n"))); - this->manager_->destroyManager (am.in ()); - DANCE_ERROR (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::destroy_app_manager - ") - ACE_TEXT ("ApplicationManager destroyed.\n"))); - } - catch (const ::Deployment::StopError &ex) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::destroy_app_manager - ") - ACE_TEXT ("Caught StopError exception\n"))); - throw Deployment_Failure ("StopError Exception\n"); - } - catch (const CORBA::Exception &ex) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::destroy_app_manager - ") - ACE_TEXT ("Caught CORBA exception: %s\n"), - ex._info ().c_str ())); - throw Deployment_Failure (ex._info ().c_str ()); - } - catch (...) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::destroy_app_manager - ") - ACE_TEXT ("Caught unknown C++ exception\n"))); - throw Deployment_Failure ("Unknown C++ exception\n"); - } - } - - - template - void - Plan_Launcher_Base_Impl< Manager, AppManager, Application> - ::create_external_connections(const ::Deployment::DeploymentPlan &plan, - Deployment::Connections &conn) - { - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("create_external_connections - start\n"))); - - for (CORBA::ULong i = 0; i < plan.connection.length(); i++) - { - if (plan.connection[i].externalReference.length() > 0 - && plan.connection[i].externalReference[0].provider) - { - DANCE_DEBUG (6, (LM_DEBUG, - "Plan_Launcher_i::create_external_connections - create connection %C from IOR %C\n", - plan.connection[i].name.in(), - plan.connection[i].externalReference[0].location.in())); - - try - { - CORBA::Object_ptr - obj = this->orb_->string_to_object(plan.connection[i].externalReference[0].location.in()); - if (!CORBA::is_nil (obj)) - { - CORBA::ULong const indx = conn.length(); - conn.length(indx + 1); - conn[indx].name= CORBA::string_dup (plan.connection[i].name.in()); - conn[indx].endpoint.length(1L); - conn[indx].endpoint[0] = obj; - } - else - { - DANCE_DEBUG (6, (LM_DEBUG, DLINFO - ACE_TEXT("Plan_Launcher_i::create_external_connections - can't create object for IOR %C\n"), - plan.connection[i].externalReference[0].location.in())); - } - } - catch (CORBA::Exception &ex) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO - ACE_TEXT("Plan_Launcher_i::create_external_connections - ") - ACE_TEXT("Caught CORBA Exception while resolving endpoint for connection %C\n"), - plan.connection[i].name.in ())); - } - catch (...) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO - ACE_TEXT("Plan_Launcher_i::create_external_connections - ") - ACE_TEXT("Caught C++ Exception while resolving endpoint for connection\n"))); - } - } - } - } - /* - - ACE_CString - Plan_Launcher_Base_Impl::expand_env_vars (const ACE_TCHAR * s) - { - ACE_TString src(s); - ACE_TString res; - size_t pos_done = 0; - while (pos_done < (size_t) src.length()) - { - size_t pos_start = src.find ('$', pos_done); - if (ACE_TString::npos == pos_start) - { - res += src.substring (pos_done); - pos_done = src.length(); - } - else // take the substring before '$' and append value - { - if (pos_start > pos_done) - { - res += src.substring (pos_done, pos_start - pos_done); - pos_done = pos_start; - } - - size_t pos_end = src.length(); - - size_t p; - - p = src.find (ACE_TEXT(' '), pos_start + 1); - if (ACE_TString::npos != p && pos_end > p) pos_end = p; - - p = src.find (ACE_TEXT('/'), pos_start + 1); - if (ACE_TString::npos != p && pos_end > p) pos_end = p; - - p = src.find (ACE_TEXT('\\'), pos_start + 1); - if (ACE_TString::npos != p && pos_end > p) pos_end = p; - - p = src.find (ACE_TEXT('$'), pos_start + 1); - if (ACE_TString::npos != p && pos_end > p) pos_end = p; - - if (pos_end - pos_start > 1) - { - ACE_Env_Value val (src.substring (pos_start + 1, pos_end - pos_start - 1).c_str(), 0); - res += val; - pos_done = pos_end; - } - else - { - DANCE_DEBUG (6, (LM_WARNING, DLINFO - ACE_TEXT("Plan_Launcher_Base_Impl::expand_env_vars - ") - ACE_TEXT("Envvar can not be parsed out at %i in \"<%s>\""), - pos_start, - src.c_str())); - } - } - } - return res; - } - - */ -} -#endif diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.h deleted file mode 100644 index f77ccd2cf0d..00000000000 --- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_T.h +++ /dev/null @@ -1,92 +0,0 @@ -/** - * $Id$ - * @file Plan_Launcher_Base_Impl.h - * @author William R. Otte - * - * Contains the generic implementation of plan launcher logic for both EM and NM deployments. - * - */ - -#ifndef PLAN_LAUNCHER_BASE_IMPL_H -#define PLAN_LAUNCHER_BASE_IMPL_H - -#include "DAnCE/Deployment/Deployment_ConnectionC.h" -#include "DAnCE/Deployment/Deployment_DeploymentPlanC.h" - -#include "Plan_Launcher_Base.h" - -namespace DAnCE -{ - /** - * @class Plan_Launcher_Base_Impl - * @brief This class launches and manages deployment plans. - */ - template - class Plan_Launcher_Base_Impl : public virtual Plan_Launcher_Base - { - protected: - - typedef typename Manager::_ptr_type Manager_ptr; - typedef typename Manager::_var_type Manager_var; - - typedef typename AppManager::_ptr_type AppManager_ptr; - typedef typename AppManager::_var_type AppManager_var; - - typedef typename Application::_ptr_type Application_ptr; - typedef typename Application::_var_type Application_var; - - public: - Plan_Launcher_Base_Impl (CORBA::ORB_ptr orb, - Manager_ptr manager); - - virtual ~Plan_Launcher_Base_Impl (); - - /** - * @brief Launch a plan, given an IDL deployment plan - * @param plan A valid IDL deployment plan - * @returns a string containing the UUID of the plan. Null indicates failure. - */ - virtual const char * launch_plan (const ::Deployment::DeploymentPlan &plan, - CORBA::Object_out am, - CORBA::Object_out app); - - virtual CORBA::Object_ptr prepare_plan (const ::Deployment::DeploymentPlan &plan); - - virtual CORBA::Object_ptr start_launch (CORBA::Object_ptr app_mgr, - const ::Deployment::Properties &properties, - ::Deployment::Connections_out connections); - - virtual void finish_launch (CORBA::Object_ptr app, - const ::Deployment::Connections &provided_connections, - bool start); - - virtual void start (CORBA::Object_ptr application); - - /// Tears down a plan given the UUID - virtual void teardown_application (CORBA::Object_ptr app_mgr, - CORBA::Object_ptr app); - - virtual void destroy_app_manager (CORBA::Object_ptr); - - virtual void create_external_connections(const ::Deployment::DeploymentPlan &plan, - Deployment::Connections &conn); - - // static ACE_CString expand_env_vars(const ACE_TCHAR * src); - protected: - /// Cached ORB pointer - CORBA::ORB_var orb_; - - /// Object reference of the Manager - Manager_var manager_; - }; // class Plan_Launcher_Impl - -} -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Plan_Launcher_Base_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif /* PLAN_LAUNCHER_BASE_IMPL_H */ diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp new file mode 100644 index 00000000000..a6835efce70 --- /dev/null +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp @@ -0,0 +1,114 @@ +// $Id$ + +#include "Plan_Launcher_Impl.h" +#include "DAnCE/Logger/Log_Macros.h" +#include "Config_Handlers/XML_File_Intf.h" +#include "Config_Handlers/DnC_Dump.h" +#include "ace/SString.h" +#include "ace/Get_Opt.h" + +Plan_Launcher_Impl::~Plan_Launcher_Impl (void) +{ +} + +::Deployment::DeploymentPlan * +Plan_Launcher_Impl::load_xml_plan(const ACE_TCHAR *deployment_plan_uri) +{ + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Impl::load_xml_plan - ") + ACE_TEXT("Parsing plan \"%C\"...\n"), deployment_plan_uri)); + + ::Deployment::DeploymentPlan * plan = 0; + try + { + CIAO::Config_Handlers::XML_File_Intf intf (deployment_plan_uri); + intf.add_search_path (ACE_TEXT("DANCE_ROOT"), ACE_TEXT("/docs/schema/")); + intf.add_search_path (ACE_TEXT("CIAO_ROOT"), ACE_TEXT("/docs/schema/")); + intf.add_search_path (ACE_TEXT("TAO_ROOT"), ACE_TEXT("/docs/schema/")); + plan = intf.release_plan (); + if (0 == plan) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Impl::load_xml_plan - ") + ACE_TEXT("Failed to parse plan \"%C\".\n"), deployment_plan_uri)); + throw Deployment_Failure("Failed to parse plan."); + } + } + catch (...) + { + ACE_TString s = ACE_TEXT ("failed to parse deployment plan \""); + s += deployment_plan_uri; + s += ACE_TEXT ("\""); + DANCE_DEBUG (6, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Impl::load_xml_plan - %s\n"), s.c_str())); + throw Deployment_Failure (ACE_TEXT_ALWAYS_CHAR (s.c_str())); + } + + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Impl::load_xml_plan - Parsing complete....\n"))); + return plan; +} + +void Plan_Launcher_Impl::execute() +{ + DANCE_TRACE ("Plan_Launcher_Impl::execute()"); + + if (this->mode_ & MODE_START_PLAN) + { + size_t const sz = this->xml_plan_urls_.size(); + for (size_t i= 0; i < sz; ++i) + { + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Impl::execute - ") + ACE_TEXT("launching plan \"%C\"...\n"), this->xml_plan_urls_[i].c_str())); + ::Deployment::DeploymentPlan_var plan = + this->load_xml_plan(ACE_TEXT_CHAR_TO_TCHAR (this->xml_plan_urls_[i].c_str())); + try + { + CORBA::String_var uuid = this->launch_plan (plan.in()); + if (0 == uuid.in ()) + { + throw Deployment_Failure ("execute - Error launching plan\n"); + } + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Impl::execute - ") + ACE_TEXT("returned plan UUID is \"%C\"\n"), uuid.in ())); + } + catch (...) + { + this->teardown_plan (plan->UUID.in()); + throw; + } + } + this->Plan_Launcher_Base_Impl::execute(); + } + + if (this->mode_ & MODE_STOP_PLAN) + { + this->stop_plan(); + } + + if (this->mode_ & MODE_WRITE_CDR) + { + ::Deployment::DeploymentPlan_var plan = this->load_xml_plan(ACE_TEXT_CHAR_TO_TCHAR (this->xml_plan_urls_[0].c_str())); + this->write_cdr_plan_file(this->cdr_dest_url_.c_str(), plan); + } +} + +void Plan_Launcher_Impl::stop_plan() +{ + DANCE_TRACE ("Plan_Launcher_Impl::stop_plan"); + + if (0 < this->xml_plan_urls_.size()) + { + size_t const sz = this->xml_plan_urls_.size(); + for (size_t i= 0; i < sz; ++i) + { + DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Impl::stop_plan - ") + ACE_TEXT("Stopping plan by plan file: %C\n"), this->xml_plan_urls_[i].c_str())); + ::Deployment::DeploymentPlan_var plan = + this->load_xml_plan(ACE_TEXT_CHAR_TO_TCHAR (this->xml_plan_urls_[i].c_str())); + if (!this->teardown_plan(plan->UUID.in())) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Impl::stop_plan - ") + ACE_TEXT("tear down assembly failed: unknown plan uuid.\n"))); + } + } + } + this->Plan_Launcher_Base_Impl::stop_plan(); +} + diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h new file mode 100644 index 00000000000..6fe7c43f027 --- /dev/null +++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h @@ -0,0 +1,35 @@ +/** + * $Id$ + * @file Plan_Launcher_Impl.h + * @author Will Otte + * + * Contains the Plan_Launcher_i class, which can be used by + * applications to launch component assemblies. + */ +#ifndef PLAN_LAUNCHER_IMPL_H +#define PLAN_LAUNCHER_IMPL_H + +#include "Plan_Launcher_Base_Impl.h" + +/** +* @class Plan_Launcher_Impl +* @brief This class launches and manages deployment plans. +*/ +class Plan_Launcher_Impl : public Plan_Launcher_Base_Impl + { + public: + Plan_Launcher_Impl (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv[]) + : Plan_Launcher_Base_Impl (orb, argc, argv) {}; + + virtual ~Plan_Launcher_Impl(void); + + void execute(void); + + static ::Deployment::DeploymentPlan* load_xml_plan ( + const ACE_TCHAR *deployment_plan_uri); + + protected: + virtual void stop_plan(); + }; // class Plan_Launcher_Impl + +#endif /* PLAN_LAUNCHER_IMPL_H */ diff --git a/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl b/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl index 42e6eb574b4..f9c967a3f99 100755 --- a/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl +++ b/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl @@ -227,7 +227,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/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp index da1836889c9..7d090ea568c 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.cpp @@ -9,8 +9,7 @@ namespace CIAO_Simple_SimpleConsumer_Impl // Component Executor Implementation Class: SimpleConsumer_exec_i //================================================================== - SimpleConsumer_exec_i::SimpleConsumer_exec_i (void) : - pushed_ (false) + SimpleConsumer_exec_i::SimpleConsumer_exec_i (void) { DANCE_TRACE ("SimpleConsumer_exec_i::SimpleConsumer_exec_i (void)"); } @@ -32,8 +31,7 @@ namespace CIAO_Simple_SimpleConsumer_Impl { DANCE_TRACE ("SimpleConsumer_exec_i::push_hello_ ()"); // Your code here. - - this->pushed_ = true; + ACE_DEBUG ((LM_EMERGENCY, "SimpleConsumer_exec_i::push_hello_ - " "Received hello event, value is %s\n", ev->hello_ ())); } @@ -80,10 +78,6 @@ namespace CIAO_Simple_SimpleConsumer_Impl SimpleConsumer_exec_i::ccm_remove () { DANCE_TRACE ("SimpleConsumer_exec_i::ccm_remove ()"); - if (!pushed_) - { - ACE_ERROR ((LM_EMERGENCY, "Error: SimpleConsumer didn't get pushed!\n")); - } // Your code here. } diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h index d2b0e816302..2069c87dbbb 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h +++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h @@ -50,7 +50,6 @@ namespace CIAO_Simple_SimpleConsumer_Impl private: ::Simple::CCM_SimpleConsumer_Context_var context_; - bool pushed_; }; class SIMPLECONSUMER_EXEC_Export SimpleConsumerHome_exec_i diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp index 0cd1ffe396b..f42c735a559 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.cpp @@ -9,8 +9,7 @@ namespace CIAO_Simple_SimpleProvider_Impl // Facet Executor Implementation Class: Trigger_exec_i //================================================================== - Trigger_exec_i::Trigger_exec_i (bool &triggered) - : triggered_ (triggered) + Trigger_exec_i::Trigger_exec_i (void) { DANCE_TRACE ("Trigger_exec_i::Trigger_exec_i (void)"); } @@ -27,7 +26,6 @@ namespace CIAO_Simple_SimpleProvider_Impl const char * hello ) { DANCE_TRACE ("Trigger_exec_i::hello ()"); - this->triggered_ = true; // Your code here. ACE_DEBUG ((LM_EMERGENCY, "Trigger_exec_i::hello - " "Got the following information from trig port: %C\n", @@ -39,7 +37,6 @@ namespace CIAO_Simple_SimpleProvider_Impl //================================================================== SimpleProvider_exec_i::SimpleProvider_exec_i (void) - : triggered_ (false) { DANCE_TRACE ("SimpleProvider_exec_i::SimpleProvider_exec_i (void)"); } @@ -59,7 +56,7 @@ namespace CIAO_Simple_SimpleProvider_Impl SimpleProvider_exec_i::get_trig () { DANCE_TRACE ("SimpleProvider_exec_i::get_trig ()"); - return new Trigger_exec_i (this->triggered_); + return new Trigger_exec_i (); } // Operations from Components::SessionComponent @@ -103,9 +100,6 @@ namespace CIAO_Simple_SimpleProvider_Impl SimpleProvider_exec_i::ccm_remove () { DANCE_TRACE ("SimpleProvider_exec_i::ccm_remove ()"); - if (!triggered_) - ACE_ERROR ((LM_EMERGENCY, "Error: My facet wasn't triggered!!\n")); - // Your code here. } diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h index 1ffa389790f..a0dda3db076 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h +++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h @@ -21,7 +21,7 @@ namespace CIAO_Simple_SimpleProvider_Impl public virtual ::CORBA::LocalObject { public: - Trigger_exec_i (bool &); + Trigger_exec_i (void); virtual ~Trigger_exec_i (void); // Operations from ::Simple::Trigger @@ -29,9 +29,6 @@ namespace CIAO_Simple_SimpleProvider_Impl virtual void hello ( const char * hello); - - private: - bool &triggered_; }; class SIMPLEPROVIDER_EXEC_Export SimpleProvider_exec_i @@ -67,7 +64,6 @@ namespace CIAO_Simple_SimpleProvider_Impl private: ::Simple::CCM_SimpleProvider_Context_var context_; - bool triggered_; }; class SIMPLEPROVIDER_EXEC_Export SimpleProviderHome_exec_i diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp b/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp index 9bbc600dd4a..a0e83b17707 100644 --- a/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp +++ b/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.cpp @@ -53,6 +53,7 @@ namespace CIAO_Simple_SimplePublisher_Impl { DANCE_TRACE ("SimplePublisher_exec_i::ccm_activate ()"); ::Simple::Hello_var hello = new OBV_Simple::Hello ("Test successful, hello from SimplePublisher_exec_i"); + this->context_->push_hello (hello._retn ()); // Your code here. } diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl index 818f6447887..8c167bdbab7 100755 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl +++ b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl @@ -198,12 +198,12 @@ foreach $file (@files) { # Invoke executor - start the application -. print "Invoking executor - launch the application -\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $file -k file://$ior_emfile -l"); + "-x $file -k file://$ior_emfile"); $E->SpawnWaitKill (120); print "Teardown the application\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $file -s"); + "-k file://$ior_emfile -x $file -q"); $E->SpawnWaitKill (120); print "Executor finished.\n"; diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl deleted file mode 100755 index 66db78dc487..00000000000 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl +++ /dev/null @@ -1,238 +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 = ( "NodeOne", "NodeTwo" ); - -# 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; -$tg_convert_plan = 0; - -$status = 0; - -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - -sub create_targets { - # naming service - $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; - $tg_naming->AddLibPath ('..'); - # 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 ('../Components'); - } - # execution manager - $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; - $tg_exe_man->AddLibPath ('..'); - # executor (plan_launcher) - $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; - $tg_executor->AddLibPath ('..'); - - $tg_convert_plan = PerlACE::TestTarget::create_target (1) || die "Could not create target for convert plan\n"; -} - -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 --instance-nc corbaloc:rir:/NameService"; - - print "Run node daemon\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; -} - -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} - -create_targets (); -init_ior_files (); - -foreach $file (@files) { - print "Starting test for deployment $file\n"; - - print STDERR "Starting Naming Service\n"; - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - $NS->Spawn (); - - 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 daemons\n"; - kill_open_processes (); - exit 1; - } - - $daemons_running = 1; - - # Invoke execution manager. - print "Invoking execution manager\n"; - $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", - "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); - $EM->Spawn (); - - 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; - - print "Converting plan to CDR representation\n"; - $cdr_planbase = "$file" . ".cdr"; - $cdr_plan = $tg_convert_plan->LocalFile ($cdr_planbase); - $convert = $tg_convert_plan->CreateProcess("$DANCE_ROOT/bin/dance_convert_plan", - "-x $file -o $cdr_plan"); - - $convert->Spawn (); - - if ($tg_convert_plan->WaitForFileTimed ($cdr_planbase, - 30) == -1) { - print STDERR "ERROR: Convert Plan failed to output $cdr_plan.\n"; - kill_open_processes (); - next; - } - - $convert->Kill (); - - # Invoke executor - start the application -. - print "Invoking executor - launch the application -\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-c $cdr_plan -k file://$ior_emfile -l"); - $E->SpawnWaitKill (120); - - print "Teardown the application\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -c $cdr_plan -s"); - $E->SpawnWaitKill (120); - print "Executor finished.\n"; - - $tg_convert_plan->DeleteFile ($cdr_planbase); - delete_ior_files (); - kill_open_processes (); -} - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc new file mode 100644 index 00000000000..1b8b1b16fbc --- /dev/null +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc @@ -0,0 +1,6 @@ +// $Id$ +project(simple_nm_launcher) : dance_config_handlers, dance_nodemanager_stub, dance_nodeapplication_stub, dance_logger { + Source_Files { + simple_nm_launcher.cpp + } +} diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl index f7c32cc1cbd..3bed5e781d3 100755 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl @@ -27,10 +27,6 @@ $ior_nsbase = "ns.ior"; $ior_nsfile = 0; $ior_embase = "EM.ior"; $ior_emfile = 0; -$ior_applicationbase = "Node_APP.ior"; -$ior_application = 0; -$ior_ambase = "Node_AM.ior"; -$ior_am = 0; # Processes $E = 0; @@ -56,14 +52,14 @@ sub create_targets { # 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 ('../Components'); + $tg_daemons[$i]->AddLibPath ('..'); } # execution manager $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; - # $tg_exe_man->AddLibPath ('..'); + $tg_exe_man->AddLibPath ('..'); # executor (plan_launcher) $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; - #$tg_executor->AddLibPath ('..'); + $tg_executor->AddLibPath ('..'); } sub init_ior_files { @@ -72,8 +68,6 @@ sub init_ior_files { for ($i = 0; $i < $nr_daemon; ++$i) { $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); } - $ior_application = $tg_executor->LocalFile ($ior_applicationbase); - $ior_am = $tg_executor->LocalFile ($ior_ambase); delete_ior_files (); } @@ -87,9 +81,6 @@ sub delete_ior_files { for ($i = 0; $i < $nr_daemon; ++$i) { $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); } - - $tg_executor->DeleteFile ($ior_applicationbase); - $tg_executor->DeleteFile ($ior_ambase); } sub kill_node_daemon { @@ -188,16 +179,28 @@ foreach $file (@files) { $daemons_running = 1; + # Invoke execution manager. + print "Invoking execution manager\n"; + $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); + $EM->Spawn (); + + 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"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $file -n file://NodeApp1.ior -l -oNode"); - $E->SpawnWaitKill (120); - - print "Teardown the application\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-n file://NodeApp1.ior -a file://$ior_application -m file://$ior_am -s"); - $E->SpawnWaitKill (120); + $E = $tg_executor->CreateProcess ("simple_em_launcher", + "file://$ior_emfile $file"); + + print "Executor finished.\n"; delete_ior_files (); diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl deleted file mode 100755 index c3fcfd77a92..00000000000 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl +++ /dev/null @@ -1,230 +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 = 1; -@ports = ( 60001 ); -@iorbases = ( "NodeApp1.ior" ); -@iorfiles = 0; -@nodenames = ( "NodeOne" ); - -# ior files other than daemon -$ior_nsbase = "ns.ior"; -$ior_nsfile = 0; -$ior_embase = "EM.ior"; -$ior_emfile = 0; -$ior_applicationbase = "Node_APP.ior"; -$ior_application = 0; -$ior_ambase = "Node_AM.ior"; -$ior_am = 0; - -# Processes -$E = 0; -$EM = 0; -$NS = 0; -@DEAMONS = 0; - -# targets -@tg_daemons = 0; -$tg_naming = 0; -$tg_exe_man = 0; -$tg_executor = 0; -$tg_convert_plan = 0; - -$status = 0; - -$ENV{"DANCE_TRACE_ENABLE"} = 0; -$ENV{"CIAO_TRACE_ENABLE"} = 0; - -sub create_targets { - # naming service - $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; - $tg_naming->AddLibPath ('..'); - # 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 ('../Components'); - } - # execution manager - $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; - # $tg_exe_man->AddLibPath ('..'); - # executor (plan_launcher) - $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; - #$tg_executor->AddLibPath ('..'); - - $tg_convert_plan = PerlACE::TestTarget::create_target (1) || die "Could not create target for convert plan\n"; -} - -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]); - } - $ior_application = $tg_executor->LocalFile ($ior_applicationbase); - $ior_am = $tg_executor->LocalFile ($ior_ambase); - - 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 --instance-nc corbaloc:rir:/NameService"; - - print "Run node daemon\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; -} - -if ($#ARGV == -1) { - opendir(DIR, "."); - @files = grep(/\.cdp$/,readdir(DIR)); - closedir(DIR); -} -else { - @files = @ARGV; -} - -create_targets (); -init_ior_files (); - -foreach $file (@files) { - print "Starting test for deployment $file\n"; - - print STDERR "Starting Naming Service\n"; - - $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); - $NS->Spawn (); - - 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 daemons\n"; - kill_open_processes (); - exit 1; - } - - $daemons_running = 1; - - print "Converting plan to CDR representation\n"; - $cdr_planbase = "$file" . ".cdr"; - $cdr_plan = $tg_convert_plan->LocalFile ($cdr_planbase); - $convert = $tg_convert_plan->CreateProcess("$DANCE_ROOT/bin/dance_convert_plan", - "-x $file -o $cdr_plan"); - - $convert->Spawn (); - - if ($tg_convert_plan->WaitForFileTimed ($cdr_planbase, - 30) == -1) { - print STDERR "ERROR: Convert Plan failed to output $cdr_plan.\n"; - kill_open_processes (); - next; - } - - $convert->Kill (); - - # Invoke executor - start the application -. - print "Invoking executor - launch the application -\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-c $file.cdr -n file://NodeApp1.ior -l -oNode"); - $E->SpawnWaitKill (120); - - print "Teardown the application\n"; - $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-n file://NodeApp1.ior -a file://Node_APP.ior -m file://Node_AM.ior -s"); - $E->SpawnWaitKill (120); - print "Executor finished.\n"; - - $tg_convert_plan->DeleteFile ($cdr_planbase); - - delete_ior_files (); - kill_open_processes (); -} - -delete_ior_files (); -kill_open_processes (); - -exit $status; diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp new file mode 100644 index 00000000000..e0731b074ed --- /dev/null +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/simple_nm_launcher.cpp @@ -0,0 +1,125 @@ +/** + * @file simple_nm_launcher.cpp + * @author William R. Otte + * $Id$ + * Launches then immediately tears down a plan. + */ + +#include "ace/OS_NS_unistd.h" +#include "tao/ORB.h" +#include "DAnCE/Logger/Logger_Service.h" +#include "DAnCE/Logger/Log_Macros.h" +#include "Deployment/Deployment_NodeApplicationC.h" +#include "Deployment/Deployment_NodeManagerC.h" +#include "Deployment/Deployment_DeploymentPlanC.h" +#include "Config_Handlers/XML_File_Intf.h" + +int usage () +{ + ACE_ERROR ((LM_ERROR, "simple_nm_launcher \n")); + return -1; +} + +#include + +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +{ + DANCE_DISABLE_TRACE (); + + DAnCE::Logger_Service + * dlf = ACE_Dynamic_Service::instance ("DAnCE_Logger"); + + if (dlf) + { + dlf->init (argc, argv); + } + + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + if (argc != 3) + return usage (); + + try + { + ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("*** simple_nm_launcher: parsing XML\n"))); + // Parse plan + CIAO::Config_Handlers::XML_File_Intf xml (argv[2]); + xml.add_search_path (ACE_TEXT ("DANCE_ROOT"), ACE_TEXT ("/docs/schema/")); + xml.add_search_path (ACE_TEXT ("CIAO_ROOT"), ACE_TEXT ("/docs/schema/")); + + auto_ptr< ::Deployment::DeploymentPlan> plan (xml.release_plan ()); + + if (plan.get () == 0) + { + ACE_ERROR ((LM_ERROR,ACE_TEXT ("*** error parsing XML document\n"))); + throw 1; + } + + + ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("*** simple_nm_launcher: resolving node manager reference.\n"))); + CORBA::Object_var obj = orb->string_to_object (argv[1]); + Deployment::NodeManager_var nm = Deployment::NodeManager::_narrow (obj.in ()); + + if (CORBA::is_nil (nm.in ())) + { + ACE_ERROR ((LM_ERROR,ACE_TEXT ("*** simple_nm_launcher: NodeManager reference is nil."))); + throw 1; + } + + ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("*** simple_nm_launcher: calling prepareplan.\n"))); + Deployment::NodeApplicationManager_var nam = nm->preparePlan (*plan, + Deployment::ResourceCommitmentManager::_nil ()); + + ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("*** simple_nm_launcher: calling startLaunch\n"))); + Deployment::Connections_var conns; + Deployment::Properties props; + Deployment::Application_var app = nam->startLaunch (props, conns.out ()); + Deployment::NodeApplication_var na = Deployment::NodeApplication::_narrow (app.in ()); + + ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("*** simple_nm_launcher: calling finishLaunch\n"))); + na->finishLaunch (conns.in (), false); + + ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("*** simple_nm_launcher: calling start\n"))); + na->start (); + + ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("*** simple_nm_launcher: start finished, sleeping 5 seconds.\n"))); + ACE_OS::sleep (5); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("*** simple_nm_launcher: waking up from sleep, calling destroyApplication\n"))); + + nam->destroyApplication (na.in ()); + + ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("*** simple_nm_launcher: calling destroyManager\n"))); + + nm->destroyManager (nam.in ()); + + ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("*** simple_nm_launcher: destroyManager completed.\n"))); + + orb->destroy (); + } + catch (Deployment::StopError &ex) + { + ACE_ERROR ((LM_ERROR,ACE_TEXT ("*** Caught StopError exception with name %C and reason %C\n"), + ex.name.in (), ex.reason.in ())); + return -1; + } + catch (Deployment::StartError &ex) + { + ACE_ERROR ((LM_ERROR,ACE_TEXT ("*** Caught StartError exception with name %C and reason %C\n"), + ex.name.in (), ex.reason.in ())); + return -1; + } + catch (CORBA::Exception &ex) + { + ACE_ERROR ((LM_ERROR,ACE_TEXT ("*** Caught CORBA exception: %C\n"), + ex._info ().c_str ())); + return -1; + + } + catch (...) + { + orb->destroy (); + ACE_ERROR ((LM_ERROR,ACE_TEXT ("*** Caught unknown exception\n"))); + return -1; + } + return 0; +} diff --git a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp index 2f36ffe88b1..7715a4b7657 100644 --- a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp +++ b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp @@ -61,11 +61,6 @@ parse_args (int argc, ACE_TCHAR *argv []) return true; } -#ifdef GEN_OSTREAM_OPS -#include -#include -#endif /* GEN_OSTREAM_OPS */ - int ACE_TMAIN (int argc, ACE_TCHAR *argv []) { @@ -109,16 +104,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) "Unable to load an XML based plan\n")); return -1; } - -#ifdef GEN_OSTREAM_OPS - { - std::ostringstream plan_stream; - plan_stream << *plan << std::endl; - DANCE_DEBUG (9, (LM_TRACE, DLINFO "Convert_Plan - Input plan: %C\n", - plan_stream.str ().c_str ())); - } -#endif /* GEN_OSTREAM_OPS */ - + if (!output_filename) { DANCE_DEBUG (2, (LM_DEBUG, DLINFO "Convert_Plan - " diff --git a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.mpc b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.mpc index ea792f7ea62..1ac40f820da 100644 --- a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.mpc +++ b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.mpc @@ -1,6 +1,7 @@ // $Id$ project (DAnCE_Convert_Plan) : dance_lib, dance_output, \ - dance_deployment_stub, dance_config_handlers { + dance_deployment_stub, dance_config_handlers, \ + avoids_ace_for_tao { dynamicflags = DANCE_CONVERT_PLAN_BUILD_DLL includes += $(DANCE_ROOT)/tools @@ -12,7 +13,7 @@ project (DAnCE_Convert_Plan) : dance_lib, dance_output, \ project (DAnCE_Convert_Plan_Exec) : dance_exe, dance_output, \ - dance_convert_plan { + avoids_ace_for_tao, dance_convert_plan { exename = dance_convert_plan Source_Files { diff --git a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp index 5969a12273e..0acfc785dca 100644 --- a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp +++ b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Convert_Plan_Impl.h" -#include "ace/OS_NS_stdio.h" +#include "ace/FILE_Connector.h" #include "tao/CDR.h" #include "Config_Handlers/XML_File_Intf.h" #include "Logger/Log_Macros.h" @@ -11,12 +11,6 @@ namespace DAnCE Deployment::DeploymentPlan * Convert_Plan::read_xml_plan (const char *filename) { - if (!filename) - { - DANCE_ERROR (2, (LM_WARNING, DLINFO ACE_TEXT ("Convert_Plan::read_xml_plan - ") - ACE_TEXT ("Passed a null pointer, returning.\n"))); - } - CIAO::Config_Handlers::XML_File_Intf xml_intf (filename); xml_intf.add_search_path ("ACE_ROOT", "/docs/schema/"); xml_intf.add_search_path ("TAO_ROOT", "/docs/schema/"); @@ -29,54 +23,42 @@ namespace DAnCE Deployment::DeploymentPlan * Convert_Plan::read_cdr_plan (const char *filename) { - if (!filename) + ACE_FILE_Addr file_addr (ACE_sap_any_cast (ACE_FILE_Addr &)); + + if (filename) + file_addr.set (filename); + else { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Convert_Plan::read_cdr_plan - ") - ACE_TEXT ("Passed a null pointer, returning.\n"))); + DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::read_cdr_plan - passed nil file name\n")); return 0; } - - FILE *file = ACE_OS::fopen (filename, "r"); - - if (!file) + + ACE_FILE_Connector conn; + ACE_FILE_IO file; + + if (conn.connect (file, + file_addr, + 0, + ACE_Addr::sap_any, + 0, + O_RDONLY, + ACE_DEFAULT_FILE_PERMS == -1)) { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Convert_Plan::read_cdr_plan - ") - ACE_TEXT ("Error: Unable to open file for reasding %C\n"), + DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::read_cdr_plan - unable to read file %p\n", filename)); return 0; } - - char byte_order; - ssize_t n = ACE_OS::fread (&byte_order, sizeof (byte_order), 1, file); - - if (n == 0) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Convert_Plan::read_cdr_plan - ") - ACE_TEXT ("Byte order not written to file\n"))); - ACE_OS::fclose (file); - return 0; - } - - ACE_UINT32 bufsize (0); - n = ACE_OS::fread (&bufsize, sizeof (bufsize), 1, file); - - if (n == 0) + + ACE_FILE_Info info; + if (file.get_info (info) == -1) { - DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("Convert_Plan::read_cdr_plan - ") - ACE_TEXT ("Plan size not written to file\n"))); - ACE_OS::fclose (file); + DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::read_cdr_plan - unable to determine file size %p\n", + filename)); return 0; } - - if (byte_order != ACE_CDR_BYTE_ORDER) - { - DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("Convert_Plan::read_cdr_plan - ") - ACE_TEXT ("Plan appears encoded in a different endian.\n"))); - ACE_CDR::swap_4 (reinterpret_cast (&bufsize), - reinterpret_cast (&bufsize)); - } - - + + ACE_OFF_T bufsize = info.size_ - 1; + char *buffer = 0; ACE_NEW_RETURN (buffer, char[bufsize], @@ -85,17 +67,25 @@ namespace DAnCE #if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE) ACE_OS::memset(buffer, 0, sizeof (buffer)); #endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */ - + // Make sure is released automagically. ACE_Auto_Basic_Array_Ptr b (buffer); - n = ACE_OS::fread (buffer, 1, bufsize, file); - ACE_OS::fclose (file); - - if (n != bufsize) + if (file.seek (0, SEEK_SET) == -1) + { + DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::read_cdr_plan - seek failed %p\n", + filename)); + return 0; + } + + char byte_order; + ssize_t size = file.recv (&byte_order, 1); + size = file.recv (buffer, bufsize); + + if (size != bufsize) { DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::read_cdr_plan - read %u bytes " - "instead of %u bytes\n", n, bufsize)); + "instead of %u bytes\n", size, bufsize)); return 0; } @@ -107,24 +97,17 @@ namespace DAnCE input_cdr.reset_byte_order ((int) byte_order); DANCE_DEBUG (9, (LM_TRACE, DLINFO "Convert_Plan_Impl::read_cdr_plan - " - "Reading file %C in %s endian format with size %u\n", - filename, - ACE_CDR_BYTE_ORDER ? ACE_TEXT("little") : ACE_TEXT("big"), - bufsize)); + "Reading file %C in %s endian format\n", + filename, ACE_CDR_BYTE_ORDER ? ACE_TEXT("little") : ACE_TEXT("big"))); Deployment::DeploymentPlan *retval; - + ACE_NEW_RETURN (retval, Deployment::DeploymentPlan (), 0); - if (!(input_cdr >> *retval)) - { - DANCE_ERROR (1, (LM_ERROR, ACE_TEXT ("Convert_Plan_Impl::read_cdr_plan - ") - ACE_TEXT ("Failed to demarshal plan\n"))); - delete retval; - return 0; - } + input_cdr >> *retval; + file.close (); return retval; } @@ -132,67 +115,54 @@ namespace DAnCE bool Convert_Plan::write_cdr_plan (const char *output_filename, Deployment::DeploymentPlan &plan) { - if (!output_filename) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::write_cdr_plan - passed nil file name\n")); - return false; - } + ACE_FILE_Addr file_addr (ACE_sap_any_cast (ACE_FILE_Addr &)); - TAO_OutputCDR output_cdr; - - if (output_cdr << plan) + if (output_filename) + file_addr.set (output_filename); + else { - FILE *file = ACE_OS::fopen (output_filename, "w"); - - if (file == 0) - { - DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::write_cdr_plan - failed to open file %C\n", - output_filename)); - return false; - } - - // First write the byte order - char byte_order = ACE_CDR_BYTE_ORDER; - size_t n = ACE_OS::fwrite (&byte_order, sizeof(byte_order), 1, file); - - // Next write the length - ACE_UINT32 cdr_length (output_cdr.total_length ()); - n += ACE_OS::fwrite (&cdr_length, sizeof (cdr_length), 1, file); - - DANCE_DEBUG (9, (LM_TRACE, DLINFO "Convert_Plan_Impl::write_cdr_plan - " - ACE_TEXT ("Writing plan to file %s in %s endian format and length %u\n"), - output_filename, - ACE_CDR_BYTE_ORDER ? ACE_TEXT("little") : ACE_TEXT("big"), - cdr_length)); - - // Now write the IDL structure. - for (const ACE_Message_Block *output_mb = output_cdr.begin (); - output_mb != 0; - output_mb = output_mb->cont ()) - { - n += ACE_OS::fwrite (output_mb->rd_ptr (), - 1, - output_mb->length (), - file); - } - - ACE_OS::fclose (file); - - size_t total_size = sizeof (byte_order) + sizeof (cdr_length) + cdr_length; - if (n != total_size) - { - DANCE_ERROR (1, (LM_ERROR, ACE_TEXT ("Convert_Plan::write_cdr_plan - ") - ACE_TEXT ("Error: Unexpected number of bytes written: %u instead of %u\n"), - n, total_size)); - } + DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::write_cdr_plan - passed nil file name\n")); + return 0; } - else + + ACE_FILE_Connector conn; + ACE_FILE_IO file; + + if (conn.connect (file, + file_addr, + 0, + ACE_Addr::sap_any, + 0, + O_RDWR | O_CREAT, + ACE_DEFAULT_FILE_PERMS == -1)) { - DANCE_ERROR (1, (LM_ERROR, ACE_TEXT ("Convert_Plan::write_cdr_plan - ") - ACE_TEXT ("Failed to mashal deployment plan\n"))); - return false; + DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::write_cdr_plan - unable to write file %p\n", + output_filename)); + return 0; } + char byte_order = ACE_CDR_BYTE_ORDER; + size_t n = file.send (&byte_order, 1); + + TAO_OutputCDR output_cdr (0, ACE_CDR_BYTE_ORDER, 0, 0, 0, + ACE_DEFAULT_CDR_MEMCPY_TRADEOFF, + ACE_CDR_GIOP_MAJOR_VERSION, + ACE_CDR_GIOP_MINOR_VERSION); + + output_cdr << plan; + + const ACE_Message_Block *output_mb = output_cdr.begin (); + + DANCE_DEBUG (9, (LM_TRACE, DLINFO "Convert_Plan_Impl::write_cdr_plan - " + ACE_TEXT ("Writing plan to file %s in %s endian format\n"), + output_filename, + ACE_CDR_BYTE_ORDER ? ACE_TEXT("little") : ACE_TEXT("big"))); + + n = file.send (output_mb->rd_ptr (), + output_mb->length ()); + + file.close (); + return true; } } diff --git a/CIAO/NEWS b/CIAO/NEWS index 175b76b3127..54952687638 100644 --- a/CIAO/NEWS +++ b/CIAO/NEWS @@ -62,9 +62,6 @@ replacement in the near term: . Implement a planner to query the TargetManager and RepositoryManager and generate deployment plans on the fly. -USER VISIBLE CHANGES BETWEEN CIAO-0.7.7 and CIAO-0.7.8 -======================================================= - USER VISIBLE CHANGES BETWEEN CIAO-0.7.6 and CIAO-0.7.7 ======================================================= diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst index 03ee0207338..a86ac4761de 100644 --- a/CIAO/bin/ciao_tests.lst +++ b/CIAO/bin/ciao_tests.lst @@ -28,9 +28,7 @@ TAO/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: !FIXED_BUGS_ONLY !STATIC !M TAO/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/tests/Bug_3832_Regression/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE -TAO/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test_cdr.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE TAO/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE -TAO/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE TAO/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/DAnCE/tests/Bug_3832_Regression/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/tests/CIAO_ComponentServer/Activator/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST @@ -78,5 +76,3 @@ TAO/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/desc TAO/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS TAO/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS -TAO/CIAO/connectors/dds4ccm/tests/Policies/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS -TAO/CIAO/connectors/dds4ccm/tests/CoherentWriter/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl index c3c356a8cea..c524dbe0525 100755 --- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl @@ -199,7 +199,7 @@ 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"); + "-x $cdp_file -k file://$ior_emfile"); $pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); @@ -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/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 #include "connectors/dds4ccm/idl/dds4ccm_DataListenerControl.idl" diff --git a/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp b/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp deleted file mode 100644 index 2a2a0597606..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// $Id$ -#include "dds4ccm/impl/dds/Coherent_Changes_Guard.h" - -CIAO::DDS4CCM::Coherent_Changes_Guard::Coherent_Changes_Guard (DDSPublisher* p, bool coherent_write) : p_ (p), coherent_write_ (coherent_write) -{ - if (this->coherent_write_) - { - p_->begin_coherent_changes (); - } -} - -CIAO::DDS4CCM::Coherent_Changes_Guard::~Coherent_Changes_Guard () -{ - if (this->coherent_write_) - { - this->p_->end_coherent_changes (); - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h b/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h deleted file mode 100644 index 77a4a55d986..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef _CIAO_COHERENT_CHANGES_GUARD -#define _CIAO_COHERENT_CHANGES_GUARD - -#include "ace/Copy_Disabled.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -# include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -# include "dds/DdsDcpsC.h" -typedef ::DDS::Publisher DDSPublisher; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export Coherent_Changes_Guard : - private ACE_Copy_Disabled - { - public: - Coherent_Changes_Guard (::DDSPublisher* p, bool coherent_write); - ~Coherent_Changes_Guard (); - private: - ::DDSPublisher* p_; - bool const coherent_write_; - }; - } -} - -#endif /* _CIAO_COHERENT_CHANGES_GUARD */ - diff --git a/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp b/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp deleted file mode 100644 index 2a17f8d2118..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp +++ /dev/null @@ -1,143 +0,0 @@ -// $Id$ - -#include "ContentFilteredTopic.h" -#include "Topic.h" - -#include "ndds/StringSeq.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_ContentFilteredTopic_i::CCM_DDS_ContentFilteredTopic_i ( - DDSContentFilteredTopic * dw) : impl_ (dw) - { - } - - CCM_DDS_ContentFilteredTopic_i::~CCM_DDS_ContentFilteredTopic_i (void) - { - } - - char * - CCM_DDS_ContentFilteredTopic_i::get_filter_expression (void) - { - DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::get_filter_expression"); - return CORBA::string_dup (this->impl ()->get_filter_expression ()); - } - - ::DDS::ReturnCode_t - CCM_DDS_ContentFilteredTopic_i::get_expression_parameters ( - ::DDS::StringSeq & expression_parameters) - { - DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::get_expression_parameters"); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_StringSeq parameters; - ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters ( - parameters); - expression_parameters <<= parameters; -#else - ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters ( - expression_parameters); -#endif - return retval; - } - - ::DDS::ReturnCode_t - CCM_DDS_ContentFilteredTopic_i::set_expression_parameters ( - const ::DDS::StringSeq & expression_parameters) - { - DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::set_expression_parameters"); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_StringSeq parameters; - parameters <<= expression_parameters; - return this->impl ()->set_expression_parameters (parameters); -#else - return this->impl ()->set_expression_parameters (expression_parameters); -#endif - } - - ::DDS::Topic_ptr - CCM_DDS_ContentFilteredTopic_i::get_related_topic (void) - { - DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::get_related_topic"); - - ::DDS::Topic_var retval = ::DDS::Topic::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSTopic *topic = this->impl ()->get_related_topic (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_Topic_i (topic), - CORBA::NO_MEMORY ()); - return retval._retn (); -#else - ::DDS::Topic_var topic = this->impl ()->get_related_topic (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_Topic_i (topic.in ()), - CORBA::NO_MEMORY ()); - return retval._retn (); -#endif - } - - char * - CCM_DDS_ContentFilteredTopic_i::get_type_name (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - return CORBA::string_dup (this->impl ()->get_type_name ()); -#else - return this->impl ()->get_type_name (); -#endif - } - - char * - CCM_DDS_ContentFilteredTopic_i::get_name (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - return CORBA::string_dup (this->impl ()->get_name ()); -#else - return this->impl ()->get_name (); -#endif - } - - ::DDS::DomainParticipant_ptr - CCM_DDS_ContentFilteredTopic_i::get_participant (void) - { - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDomainParticipant* p = this->impl ()->get_participant (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_DomainParticipant_i (p), - CORBA::NO_MEMORY ()); -#else - ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_DomainParticipant_i (p.in ()), - CORBA::NO_MEMORY ()); -#endif - return retval._retn (); - } - - DDSContentFilteredTopic * - CCM_DDS_ContentFilteredTopic_i::get_impl (void) - { - return this->impl_; - } - - void - CCM_DDS_ContentFilteredTopic_i::set_impl (DDSContentFilteredTopic * dw) - { - this->impl_ = dw; - } - - DDSContentFilteredTopic * - CCM_DDS_ContentFilteredTopic_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.h b/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.h deleted file mode 100644 index 56633f14a97..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ContentFilteredTopic.h +++ /dev/null @@ -1,71 +0,0 @@ -/** - * @author Marcel Smit - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef CIAO_NDDS_CONTENFILTEREDTOPIC_H -#define CIAO_NDDS_CONTENFILTEREDTOPIC_H - -#include "DomainParticipant.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" -#include "tao/LocalObject.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::ContentFilteredTopic DDSContentFilteredTopic; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_ContentFilteredTopic_i : - public virtual ::DDS::CCM_ContentFilteredTopic, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - CCM_DDS_ContentFilteredTopic_i (DDSContentFilteredTopic * dw); - - /// Destructor - virtual ~CCM_DDS_ContentFilteredTopic_i (void); - - virtual char * get_filter_expression (void); - - virtual - ::DDS::ReturnCode_t get_expression_parameters ( - ::DDS::StringSeq & expression_parameters); - - virtual - ::DDS::ReturnCode_t set_expression_parameters ( - const ::DDS::StringSeq & expression_parameters); - - virtual - ::DDS::Topic_ptr get_related_topic (void); - - virtual - char * get_type_name (void); - - virtual - char * get_name (void); - - virtual - ::DDS::DomainParticipant_ptr get_participant (void); - - DDSContentFilteredTopic * get_impl (void); - - void set_impl (DDSContentFilteredTopic * dw); - - private: - DDSContentFilteredTopic * impl_; - - DDSContentFilteredTopic * impl (void); - }; - } -} - -#endif /* CIAO_NDDS_CONTENFILTEREDTOPIC_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS4CCM_Traits.h b/CIAO/connectors/dds4ccm/impl/dds/DDS4CCM_Traits.h deleted file mode 100644 index 5e4fcb003a4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS4CCM_Traits.h +++ /dev/null @@ -1,69 +0,0 @@ -/** - * @file DDS4CCM_Traits.h - * @author William R. Otte - * - * $Id$ - * - * Traits necessary for various bits and pieces of the DDS4CCM infrastructure. - */ - -#ifndef DDS4CCM_TRAITS_H -#define DDS4CCM_TRAITS_H - -namespace CIAO -{ - namespace DDS4CCM - { - template - - struct Connector_Traits - { - typedef BASE_TYPE base_type; - typedef SEQ_TYPE seq_type; - typedef WRITER_TYPE writer_type; - typedef UPDATER_TYPE updater_type; - typedef GETTER_TYPE getter_type; - typedef READER_TYPE reader_type; - typedef CONTEXT_TYPE context_type; - typedef LISTENER_TYPE listener_type; - typedef STATELISTENER_TYPE statelistener_type; - typedef CONNECTORSTATUSLISTENER_TYPE connectorstatuslistener_type; - }; - - namespace RTI - { - /** - * @struct Type_Traits - * @brief Convenience traits struct. - * - * This is a convenience struct that is used by most of the - * DDS4CCM infrastructure; it is not necessary to use this exact - * struct, so long as all of the needed fields are filled in. - */ - template - struct Type_Traits - { - typedef VALUE_TYPE value_type; - typedef DDS_SEQ_TYPE dds_seq_type; - typedef TYPE_SUPPORT type_support; - typedef DATA_WRITER data_writer; - typedef DATA_READER data_reader; - }; - } - } -} -#endif /* DDS4CCM_TRAITS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp b/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp deleted file mode 100644 index e464fd0d680..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp +++ /dev/null @@ -1,263 +0,0 @@ -// $Id$ - -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/DDSCallbackStatusHandler.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -//============================================================ -// On_Unexpected_Status_Handler -//============================================================ -namespace CIAO -{ - namespace DDS4CCM - { - OnUnexpectedStatusHandler::OnUnexpectedStatusHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ::DDS::Entity_ptr entity, - ::DDS::StatusKind status_kind) : - error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)), - entity_ (::DDS::Entity::_duplicate (entity)), - status_kind_ (status_kind) - { - this->reference_counting_policy ().value - (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - } - - OnUnexpectedStatusHandler::~OnUnexpectedStatusHandler (void) - { - } - - int - OnUnexpectedStatusHandler::handle_exception (ACE_HANDLE) - { - try - { - this->error_listener_->on_unexpected_status (this->entity_, this->status_kind_); - } - catch (...) - { - } - return 0; - } - - //============================================================ - // OnRequestedOncompatibleQosHandler - //============================================================ - OnRequestedOncompatibleQosHandler::OnRequestedOncompatibleQosHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataReader_ptr dr, - const ::DDS::RequestedIncompatibleQosStatus &status) : - csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), - dr_ (::DDS::DataReader::_duplicate (dr)), - status_ (status) - { - this->reference_counting_policy ().value - (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - } - - OnRequestedOncompatibleQosHandler::~OnRequestedOncompatibleQosHandler (void) - { - } - - int - OnRequestedOncompatibleQosHandler::handle_exception (ACE_HANDLE) - { - try - { - this->csl_->on_requested_incompatible_qos (this->dr_, this->status_); - } - catch (...) - { - } - return 0; - } - - //============================================================ - // OnSampleRejectedHandler - //============================================================ - OnSampleRejectedHandler::OnSampleRejectedHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataReader_ptr dr, - const ::DDS::SampleRejectedStatus &status) : - csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), - dr_ (::DDS::DataReader::_duplicate (dr)), - status_ (status) - { - this->reference_counting_policy ().value - (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - } - - OnSampleRejectedHandler::~OnSampleRejectedHandler (void) - { - } - - int - OnSampleRejectedHandler::handle_exception (ACE_HANDLE) - { - try - { - this->csl_->on_sample_rejected (this->dr_, this->status_); - } - catch (...) - { - } - return 0; - } - - //============================================================ - // OnInconsistentTopicHandler - //============================================================ - OnInconsistentTopicHandler::OnInconsistentTopicHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::Topic_ptr tp, - const ::DDS::InconsistentTopicStatus &status) : - csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), - tp_ (::DDS::Topic::_duplicate (tp)), - status_ (status) - { - this->reference_counting_policy ().value - (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - } - - OnInconsistentTopicHandler::~OnInconsistentTopicHandler (void) - { - } - - int - OnInconsistentTopicHandler::handle_exception (ACE_HANDLE) - { - try - { - this->csl_->on_inconsistent_topic (this->tp_, this->status_); - } - catch (...) - { - } - return 0; - } - - //============================================================ - // OnOfferedDeadlineMissedHandler - //============================================================ - OnOfferedDeadlineMissedHandler::OnOfferedDeadlineMissedHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataWriter_ptr dw, - const ::DDS::OfferedDeadlineMissedStatus &status) : - csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), - dw_ (::DDS::DataWriter::_duplicate (dw)), - status_ (status) - { - this->reference_counting_policy ().value - (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - } - - OnOfferedDeadlineMissedHandler::~OnOfferedDeadlineMissedHandler (void) - { - } - - int - OnOfferedDeadlineMissedHandler::handle_exception (ACE_HANDLE) - { - try - { - this->csl_->on_offered_deadline_missed (this->dw_, this->status_); - } - catch (...) - { - } - return 0; - } - - //============================================================ - // OnOfferedIncompatibleQoSHandler - //============================================================ - OnOfferedIncompatibleQoSHandler::OnOfferedIncompatibleQoSHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataWriter_ptr dw, - const ::DDS::OfferedIncompatibleQosStatus &status) : - csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), - dw_ (::DDS::DataWriter::_duplicate (dw)), - status_ (status) - { - this->reference_counting_policy ().value - (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - } - - OnOfferedIncompatibleQoSHandler::~OnOfferedIncompatibleQoSHandler (void) - { - } - - int - OnOfferedIncompatibleQoSHandler::handle_exception (ACE_HANDLE) - { - try - { - this->csl_->on_offered_incompatible_qos (this->dw_, this->status_); - } - catch (...) - { - } - return 0; - } - - //============================================================ - // OnRequestedDeadlineMissedHandler - //============================================================ - OnRequestedDeadlineMissedHandler::OnRequestedDeadlineMissedHandler ( - ::CCM_DDS::PortStatusListener_ptr psl, - ::DDS::DataReader_ptr dr, - const ::DDS::RequestedDeadlineMissedStatus & status) : - psl_ (::CCM_DDS::PortStatusListener::_duplicate (psl)), - dr_ (::DDS::DataReader::_duplicate (dr)), - status_ (status) - { - } - - OnRequestedDeadlineMissedHandler::~OnRequestedDeadlineMissedHandler () - { - } - - int - OnRequestedDeadlineMissedHandler::handle_exception (ACE_HANDLE) - { - try - { - this->psl_->on_requested_deadline_missed (this->dr_, this->status_); - } - catch (...) - { - } - return 0; - } - - //============================================================ - // OnSampleLostHandler - //============================================================ - OnSampleLostHandler::OnSampleLostHandler ( - ::CCM_DDS::PortStatusListener_ptr psl, - ::DDS::DataReader_ptr dr, - const ::DDS::SampleLostStatus & status) : - psl_ (::CCM_DDS::PortStatusListener::_duplicate (psl)), - dr_ (::DDS::DataReader::_duplicate (dr)), - status_ (status) - { - } - - OnSampleLostHandler::~OnSampleLostHandler () - { - } - - int - OnSampleLostHandler::handle_exception (ACE_HANDLE) - { - try - { - this->psl_->on_sample_lost (this->dr_, this->status_); - } - catch (...) - { - } - return 0; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.h b/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.h deleted file mode 100644 index b2d7d525001..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.h +++ /dev/null @@ -1,155 +0,0 @@ -// $Id$ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Eventhandler on orb thread, handling the - * received data from DDS. - */ - -#ifndef CIAO_DDS_CALLBACK_STATUS_HANDLER -#define CIAO_DDS_CALLBACK_STATUS_HANDLER - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/idl/dds4ccm_ConnectorStatusListenerC.h" -#include "dds4ccm/idl/dds4ccm_PortStatusListenerC.h" -#include "ace/Event_Handler.h" -#include "dds4ccm_ndds_impl_export.h" - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export OnUnexpectedStatusHandler : - public ACE_Event_Handler - { - public: - OnUnexpectedStatusHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ::DDS::Entity_ptr entity, - ::DDS::StatusKind status_kind); - virtual ~OnUnexpectedStatusHandler (); - - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::ConnectorStatusListener_var error_listener_; - ::DDS::Entity_var entity_; - ::DDS::StatusKind status_kind_; - }; - - class DDS4CCM_NDDS_IMPL_Export OnRequestedOncompatibleQosHandler : - public ACE_Event_Handler - { - public: - OnRequestedOncompatibleQosHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataReader_ptr dr, - const ::DDS::RequestedIncompatibleQosStatus &status); - virtual ~OnRequestedOncompatibleQosHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::ConnectorStatusListener_var csl_; - ::DDS::DataReader_var dr_; - ::DDS::RequestedIncompatibleQosStatus const status_; - }; - - class DDS4CCM_NDDS_IMPL_Export OnSampleRejectedHandler : - public ACE_Event_Handler - { - public: - OnSampleRejectedHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataReader_ptr dr, - const ::DDS::SampleRejectedStatus &status); - virtual ~OnSampleRejectedHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::ConnectorStatusListener_var csl_; - ::DDS::DataReader_var dr_; - ::DDS::SampleRejectedStatus const status_; - }; - - class DDS4CCM_NDDS_IMPL_Export OnInconsistentTopicHandler : - public ACE_Event_Handler - { - public: - OnInconsistentTopicHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::Topic_ptr tp, - const ::DDS::InconsistentTopicStatus &status); - virtual ~OnInconsistentTopicHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::ConnectorStatusListener_var csl_; - ::DDS::Topic_var tp_; - ::DDS::InconsistentTopicStatus const status_; - }; - - class DDS4CCM_NDDS_IMPL_Export OnOfferedDeadlineMissedHandler : - public ACE_Event_Handler - { - public: - OnOfferedDeadlineMissedHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataWriter_ptr dw, - const ::DDS::OfferedDeadlineMissedStatus &status); - virtual ~OnOfferedDeadlineMissedHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::ConnectorStatusListener_var csl_; - ::DDS::DataWriter_var dw_; - ::DDS::OfferedDeadlineMissedStatus const status_; - }; - - class DDS4CCM_NDDS_IMPL_Export OnOfferedIncompatibleQoSHandler : - public ACE_Event_Handler - { - public: - OnOfferedIncompatibleQoSHandler ( - ::CCM_DDS::ConnectorStatusListener_ptr csl, - ::DDS::DataWriter_ptr dw, - const ::DDS::OfferedIncompatibleQosStatus &status); - virtual ~OnOfferedIncompatibleQoSHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::ConnectorStatusListener_var csl_; - ::DDS::DataWriter_var dw_; - ::DDS::OfferedIncompatibleQosStatus const status_; - }; - - class DDS4CCM_NDDS_IMPL_Export OnRequestedDeadlineMissedHandler : - public ACE_Event_Handler - { - public: - OnRequestedDeadlineMissedHandler ( - ::CCM_DDS::PortStatusListener_ptr psl, - ::DDS::DataReader_ptr dr, - const ::DDS::RequestedDeadlineMissedStatus &status); - virtual ~OnRequestedDeadlineMissedHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::PortStatusListener_var psl_; - ::DDS::DataReader_var dr_; - ::DDS::RequestedDeadlineMissedStatus const status_; - }; - - class DDS4CCM_NDDS_IMPL_Export OnSampleLostHandler : - public ACE_Event_Handler - { - public: - OnSampleLostHandler ( - ::CCM_DDS::PortStatusListener_ptr psl, - ::DDS::DataReader_ptr dr, - const ::DDS::SampleLostStatus &status); - virtual ~OnSampleLostHandler (); - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - ::CCM_DDS::PortStatusListener_var psl_; - ::DDS::DataReader_var dr_; - ::DDS::SampleLostStatus const status_; - }; - } -} - -#endif /* CIAO_DDS_CALLBACK_STATUS_HANDLER */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp deleted file mode 100644 index 9dbf4ae0eb2..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp +++ /dev/null @@ -1,228 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds/DomainParticipantFactory.h" -#include "dds4ccm/impl/dds/DomainParticipant.h" -#include "ace/Tokenizer_T.h" -#include "ace/Env_Value_T.h" - -template -DDS_Base_Connector_T::DDS_Base_Connector_T (void) - : domain_id_ (0) - , configuration_complete_ (false) - , library_name_ (0) - , profile_name_ (0) -{ - ACE_Env_Value id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), this->domain_id_); - this->domain_id_ = id; -} - -template -DDS_Base_Connector_T::~DDS_Base_Connector_T (void) -{ -} - -template -::DDS::DomainId_t -DDS_Base_Connector_T::domain_id (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::domain_id"); - - return this->domain_id_; -} - -template -void -DDS_Base_Connector_T::domain_id ( - ::DDS::DomainId_t domain_id) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::domain_id"); - - if (this->configuration_complete_) - { - throw ::CCM_DDS::NonChangeable (); - } - else - { - this->domain_id_ = domain_id; - } -} - -template -char * -DDS_Base_Connector_T::qos_profile (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::qos_profile"); - - return CORBA::string_dup (this->qos_profile_.in ()); -} - -template -void -DDS_Base_Connector_T::qos_profile ( - const char * qos_profile) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::qos_profile"); - - if (this->configuration_complete_) - { - throw ::CCM_DDS::NonChangeable (); - } - else - { - this->qos_profile_ = qos_profile; - } -} - -template -void -DDS_Base_Connector_T::init_default_domain (void) -{ - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "DDS_Base_Connector_T::init_default_domain - " - "Configuring default domain <%d>\n", - this->domain_id_)); - try - { - ACE_Env_Value verbosity (ACE_TEXT("DDS4CCM_NDDS_LOG_VERBOSITY"), - NDDS_CONFIG_LOG_VERBOSITY_SILENT); - - NDDS_Config_LogVerbosity n_verbosity = - static_cast (verbosity.operator int()); - NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity); - - // Generic code - if (this->qos_profile_.in ()) - { - char* buf = ACE_OS::strdup (this->qos_profile_.in ()); - ACE_Tokenizer_T tok (buf); - tok.delimiter_replace ('#', 0); - for (char *p = tok.next (); p; p = tok.next ()) - { - if (!this->library_name_) - { - this->library_name_ = p; - } - else if (!this->profile_name_) - { - this->profile_name_ = p; - } - } - } - if (this->library_name_ && this->profile_name_) - { - DPFACTORY->set_default_participant_qos_with_profile ( - this->library_name_, - this->profile_name_); - this->domain_participant_ = - DPFACTORY->create_participant_with_profile ( - this->domain_id_, - this->library_name_, - this->profile_name_, - ::DDS::DomainParticipantListener::_nil (), - 0); - } - else - { - ::DDS::DomainParticipantQos qos; - this->domain_participant_ = - DPFACTORY->create_participant ( - this->domain_id_, - qos, - ::DDS::DomainParticipantListener::_nil (), - 0); - } - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_Base_Connector_T::init_default_domain: " - "Caught unknown C++ exception while configuring default domain <%d>\n", - this->domain_id_)); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Base_Connector_T::set_session_context ( - ::Components::SessionContext_ptr ctx) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::set_session_context"); - - typename CCM_TYPE::context_type::_var_type lctx = - CCM_TYPE::context_type::_narrow (ctx); - - if (::CORBA::is_nil (lctx.in ())) - { - throw ::CORBA::INTERNAL (); - } - - this->context_ = lctx; -} - -template -void -DDS_Base_Connector_T::configuration_complete (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::configuration_complete"); - this->init_default_domain (); - this->configuration_complete_ = true; -} - -template -void -DDS_Base_Connector_T::ccm_activate (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::ccm_activate"); - try - { - if (CORBA::is_nil (this->domainparticipantlistener_.in ())) - { - ACE_NEW_THROW_EX (this->domainparticipantlistener_, - DomainParticipantListener( - this->context_-> - get_connection_error_listener ()), - CORBA::NO_MEMORY ()); - } - this->domain_participant_->set_listener ( - this->domainparticipantlistener_.in (), - ::CIAO::DDS4CCM::DomainParticipantListener_T::get_mask ()); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_Base_Connector_T::ccm_activate: " - "Caught unknown C++ exception while configuring default domain\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Base_Connector_T::ccm_passivate (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::ccm_passivate"); - try - { - this->domain_participant_->set_listener ( - ::DDS::DomainParticipantListener::_nil (), - 0); - this->domainparticipantlistener_ = ::DDS::DomainParticipantListener::_nil (); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_Base_Connector_T::ccm_passivate: " - "Caught unknown C++ exception while configuring default domain\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Base_Connector_T::ccm_remove (void) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::ccm_remove"); - - DPFACTORY->delete_participant ( - this->domain_participant_.in ()); - this->domain_participant_ = ::DDS::DomainParticipant::_nil (); -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h b/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h deleted file mode 100644 index 465aed09079..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h +++ /dev/null @@ -1,59 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - */ -#ifndef DDS_BASE_CONNECTOR_T_H -#define DDS_BASE_CONNECTOR_T_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" -#include "tao/LocalObject.h" -#include "dds4ccm/impl/dds/DomainParticipantListener_T.h" - -template -class DDS_Base_Connector_T - : public virtual CCM_TYPE::base_type, - public virtual ::CORBA::LocalObject, - private virtual ACE_Copy_Disabled -{ -public: - DDS_Base_Connector_T (void); - virtual ~DDS_Base_Connector_T (void); - - virtual ::DDS::DomainId_t domain_id (void); - - virtual void domain_id (::DDS::DomainId_t domain_id); - - virtual char *qos_profile (void); - - virtual void qos_profile (const char * qos_profile); - - virtual void set_session_context (::Components::SessionContext_ptr ctx); - - virtual void configuration_complete (void); - virtual void ccm_remove (void); - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - -protected: - void init_default_domain (void); - - DDS::DomainId_t domain_id_; - CORBA::String_var qos_profile_; - bool configuration_complete_; - const char* library_name_; - const char* profile_name_; - - ::DDS::DomainParticipant_var domain_participant_; - ::DDS::DomainParticipantListener_var domainparticipantlistener_; - typename CCM_TYPE::context_type::_var_type context_; - - ::CCM_DDS::ConnectorStatusListener_var error_listener_; - - typedef ::CIAO::DDS4CCM::DomainParticipantListener_T DomainParticipantListener; -}; - -#include "dds4ccm/impl/dds/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/dds/DDS_Event_Connector_T.cpp deleted file mode 100644 index beea24946bc..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp +++ /dev/null @@ -1,169 +0,0 @@ -// -*- 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/logger/Log_Macros.h" - -template -DDS_Event_Connector_T::DDS_Event_Connector_T (void) : - DDS_TopicBase_Connector_T() -{ -} - -template -DDS_Event_Connector_T::~DDS_Event_Connector_T (void) -{ -} - -template -typename CCM_TYPE::writer_type::_ptr_type -DDS_Event_Connector_T::get_supplier_data (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_supplier_data"); - - return this->supplier_.get_data (); -} - -template -::DDS::CCM_DataWriter_ptr -DDS_Event_Connector_T::get_supplier_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_supplier_dds_entity"); - - return this->supplier_.get_dds_entity (); -} - -template -typename CCM_TYPE::getter_type::_ptr_type -DDS_Event_Connector_T::get_pull_consumer_fresh_data (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_pull_consumer_fresh_data"); - - return this->pull_consumer_.get_fresh_data (); -} - -template -typename CCM_TYPE::reader_type::_ptr_type -DDS_Event_Connector_T::get_push_consumer_data (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_push_consumer_data"); - - return this->push_consumer_.get_data (); -} - -template -typename CCM_TYPE::reader_type::_ptr_type -DDS_Event_Connector_T::get_pull_consumer_data (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_pull_consumer_data"); - - return this->pull_consumer_.get_data (); -} - -template -::CCM_DDS::CCM_DataListenerControl_ptr -DDS_Event_Connector_T::get_push_consumer_data_control (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_push_consumer_data_control"); - - return this->push_consumer_.get_data_control (); -} - -template -::DDS::CCM_DataReader_ptr -DDS_Event_Connector_T::get_pull_consumer_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_pull_consumer_dds_entity"); - - return this->pull_consumer_.get_dds_entity (); -} - -template -::DDS::CCM_DataReader_ptr -DDS_Event_Connector_T::get_push_consumer_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::get_push_consumer_dds_entity"); - - return this->push_consumer_.get_dds_entity (); -} - -template -void -DDS_Event_Connector_T::configuration_complete (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::configuration_complete"); - - DDS_TopicBase_Connector_T::configuration_complete (); - - this->push_consumer_.configuration_complete ( - this->topic_.in (), - this->subscriber_.in (), - this->library_name_, - this->profile_name_); - - this->supplier_.configuration_complete( - this->topic_.in (), - this->publisher_.in (), - this->library_name_, - this->profile_name_); - - this->pull_consumer_.configuration_complete ( - this->topic_.in (), - this->subscriber_.in (), - this->library_name_, - this->profile_name_); -} - -template -void -DDS_Event_Connector_T::ccm_activate (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::ccm_activate"); - ACE_Reactor* reactor = 0; -#if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - reactor = this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor (); -#endif - DDS_TopicBase_Connector_T::ccm_activate (reactor); - - this->push_consumer_.activate ( - this->context_->get_connection_push_consumer_data_listener (), - this->context_->get_connection_push_consumer_status (), - reactor); - - this->supplier_.activate (); - - this->pull_consumer_.activate ( - this->context_->get_connection_pull_consumer_status (), - reactor); -} - -template -void -DDS_Event_Connector_T::ccm_passivate (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::ccm_passivate"); - - this->push_consumer_.passivate (); - this->supplier_.passivate (); - this->pull_consumer_.passivate (); - DDS_TopicBase_Connector_T::ccm_passivate (); -} - -template -void -DDS_Event_Connector_T::ccm_remove (void) -{ - DDS4CCM_TRACE ("DDS_Event_Connector_T::ccm_remove"); - - this->push_consumer_.remove (this->subscriber_.in ()); - this->supplier_.remove (this->publisher_.in ()); - this->pull_consumer_.remove (this->subscriber_.in ()); - DDS_TopicBase_Connector_T::ccm_remove (); -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h b/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h deleted file mode 100644 index c96a1949ee4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h +++ /dev/null @@ -1,89 +0,0 @@ -/** - * @author Marcel Smit - * - * $Id$ - * - * Wrapper facade for NDDS. - */ -#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" - -template -class DDS_Event_Connector_T - : public virtual DDS_TopicBase_Connector_T -{ -public: - DDS_Event_Connector_T (void); - virtual ~DDS_Event_Connector_T (void); - - /** - * @name DDS_Write - * DDS_Write operations - */ - //@{ - virtual typename CCM_TYPE::writer_type::_ptr_type get_supplier_data (void); - - virtual ::DDS::CCM_DataWriter_ptr get_supplier_dds_entity (void); - //@} - - /** - * @name DDS_Get - * DDS_Get operations - */ - //@{ - virtual typename CCM_TYPE::reader_type::_ptr_type get_pull_consumer_data (void); - - virtual typename CCM_TYPE::getter_type::_ptr_type get_pull_consumer_fresh_data (void); - - virtual ::DDS::CCM_DataReader_ptr get_pull_consumer_dds_entity (void); - //@} - - /** - * @name DDS_Listen - * DDS_Listen operations - */ - //@{ - virtual typename CCM_TYPE::reader_type::_ptr_type get_push_consumer_data (void); - - virtual ::CCM_DDS::CCM_DataListenerControl_ptr get_push_consumer_data_control (void); - - virtual ::DDS::CCM_DataReader_ptr get_push_consumer_dds_entity (void); - //@} - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - -private: - /** - * DDS_Write supplier - */ - //@{ - DDS_Write_T supplier_; - //@} - - /** - * DDS_Listen push_consumer - */ - //@{ - DDS_Listen_T push_consumer_; - //@} - - /** - * DDS_Get pull_consumer - */ - //@{ - DDS_Get_T pull_consumer_; - //@} -}; - -#include "dds4ccm/impl/dds/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/dds/DDS_Get_T.cpp deleted file mode 100644 index 0fa0f62cf26..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.cpp +++ /dev/null @@ -1,165 +0,0 @@ -// -*- 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/logger/Log_Macros.h" - -template -DDS_Get_T::DDS_Get_T (void) : - ccm_dds_reader_ (0) -{ -} - -template -DDS_Get_T::~DDS_Get_T (void) -{ -} - -template -void -DDS_Get_T::configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name) -{ - DDS4CCM_TRACE ("DDS_Get_T::configuration_complete"); - - try - { - if (CORBA::is_nil (this->data_reader_.in ())) - { - ::DDS::DataReader_var reader; - if (profile_name && library_name) - { - reader = subscriber->create_datareader_with_profile ( - topic, - library_name, - profile_name, - ::DDS::DataReaderListener::_nil (), - 0); - } - else - { - ::DDS::DataReaderQos drqos; - reader = subscriber->create_datareader ( - topic, - drqos, - ::DDS::DataReaderListener::_nil (), - 0); - } - ::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->data_reader_ = ::DDS::CCM_DataReader::_narrow (reader); - this->dds_get_.set_impl (reader); - this->dds_read_.set_impl (reader); - this->dds_read_.set_qos (topic, library_name, profile_name); - } - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::configuration_complete: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Get_T::activate ( - ::CCM_DDS::PortStatusListener_ptr listener, - ACE_Reactor* reactor) -{ - DDS4CCM_TRACE ("DDS_Get_T::activate"); - try - { - if (CORBA::is_nil (this->status_.in ())) - { - ACE_NEW_THROW_EX (this->status_, - PortStatusListener (listener, reactor), - CORBA::NO_MEMORY ()); - } - this->ccm_dds_reader_.set_listener ( - this->status_.in (), - ::CIAO::DDS4CCM::PortStatusListener_T::get_mask ( - listener)); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::activate: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Get_T::passivate (void) -{ - DDS4CCM_TRACE ("DDS_Get_T::passivate"); - try - { - this->dds_get_.passivate (); - this->ccm_dds_reader_.set_listener ( - ::DDS::DataReaderListener::_nil (), - 0); - this->status_ = ::DDS::DataReaderListener::_nil (); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::passivate: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Get_T::remove ( - ::DDS::Subscriber_ptr subscriber) -{ - DDS4CCM_TRACE ("DDS_Get_T::remove"); - try - { - subscriber->delete_datareader (this->data_reader_.in ()); - 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); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::remove: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -typename CCM_TYPE::getter_type::_ptr_type -DDS_Get_T::get_fresh_data (void) -{ - DDS4CCM_TRACE ("DDS_Get_T::get_fresh_data"); - - return &this->dds_get_; -} - -template -typename CCM_TYPE::reader_type::_ptr_type -DDS_Get_T::get_data (void) -{ - DDS4CCM_TRACE ("DDS_Get_T::get_data"); - - return &this->dds_read_; -} - -template -::DDS::CCM_DataReader_ptr -DDS_Get_T::get_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_Get_T::get_dds_entity"); - - return &this->ccm_dds_reader_; -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.h b/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.h deleted file mode 100644 index 9845792da54..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.h +++ /dev/null @@ -1,66 +0,0 @@ -/** - * @author Marcel Smit - * - * $Id$ - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_GET_T_H_ -#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" - -template -class DDS_Get_T -{ -public: - DDS_Get_T (void); - ~DDS_Get_T (void); - - /** - * @name DDS_Get - * DDS_Get operations - */ - //@{ - typename CCM_TYPE::reader_type::_ptr_type get_data (void); - - typename CCM_TYPE::getter_type::_ptr_type get_fresh_data (void); - - ::DDS::CCM_DataReader_ptr get_dds_entity (void); - //@} - - void configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name); - - void activate ( - ::CCM_DDS::PortStatusListener_ptr listener, - ACE_Reactor* reactor); - - void passivate (void); - - void remove (::DDS::Subscriber_ptr subscriber); - -private: - /** - * DDS_Get - */ - //@{ - ::DDS::CCM_DataReader_var data_reader_; - ::DDS::DataReaderListener_var status_; - ::CIAO::DDS4CCM::DDS_CCM::Getter_T dds_get_; - ::CIAO::DDS4CCM::DDS_CCM::Reader_T dds_read_; - ::CIAO::DDS4CCM::CCM_DDS_DataReader_i ccm_dds_reader_; - //@} - - typedef ::CIAO::DDS4CCM::PortStatusListener_T PortStatusListener; -}; - -#include "dds4ccm/impl/dds/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/dds/DDS_Listen_T.cpp deleted file mode 100644 index 034fa2d99d0..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp +++ /dev/null @@ -1,175 +0,0 @@ -// -*- 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/logger/Log_Macros.h" - -template -DDS_Listen_T::DDS_Listen_T (void) : - data_control_ (new CCM_DDS_DataListenerControl_T - < ::CCM_DDS::CCM_DataListenerControl> ()), - ccm_dds_reader_ (0) -{ -} - -template -DDS_Listen_T::~DDS_Listen_T (void) -{ -} - -template -void -DDS_Listen_T::configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name) -{ - DDS4CCM_TRACE ("DDS_Listen_T::configuration_complete"); - - try - { - if (CORBA::is_nil (this->data_reader_.in ())) - { - ::DDS::DataReader_var reader; - if (library_name && profile_name) - { - reader = subscriber->create_datareader_with_profile ( - topic, - library_name, - profile_name, - ::DDS::DataReaderListener::_nil (), - 0); - } - else - { - ::DDS::DataReaderQos drqos; - reader = subscriber->create_datareader ( - topic, - drqos, - ::DDS::DataReaderListener::_nil (), - 0); - } - ::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->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); - } - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::configuration_complete: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Listen_T::activate ( - typename CCM_TYPE::listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr status, - ACE_Reactor* reactor) -{ - DDS4CCM_TRACE ("DDS_Listen_T::activate"); - try - { - if (CORBA::is_nil (this->data_listener_.in ())) - { - ACE_NEW_THROW_EX (this->data_listener_, - DataReaderListener ( - listener, - status, - this->data_control_.in (), - reactor), - CORBA::NO_MEMORY ()); - } - this->ccm_dds_reader_.set_listener ( - this->data_listener_.in (), - ::CIAO::DDS4CCM::DataReaderListener_T::get_mask ( - listener)); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::activate: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Listen_T::passivate () -{ - DDS4CCM_TRACE ("DDS_Listen_T::passivate"); - try - { - this->ccm_dds_reader_.set_listener ( - ::DDS::DataReaderListener::_nil (), - 0); - this->data_listener_= ::DDS::DataReaderListener::_nil (); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::passivate: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Listen_T::remove ( - ::DDS::Subscriber_ptr subscriber) -{ - DDS4CCM_TRACE ("DDS_Listen_T::remove"); - try - { - subscriber->delete_datareader (this->data_reader_.in ()); - this->ccm_dds_reader_.set_impl (0); - this->data_reader_ = ::DDS::CCM_DataReader::_nil (); - this->dds_read_.set_impl (0); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::remove: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - - -template -typename CCM_TYPE::reader_type::_ptr_type -DDS_Listen_T::get_data (void) -{ - DDS4CCM_TRACE ("DDS_Listen_T::get_data"); - - return &this->dds_read_; -} - -template -::DDS::CCM_DataReader_ptr -DDS_Listen_T::get_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_Listen_T::get_dds_entity"); - - return &this->ccm_dds_reader_; -} - -template -::CCM_DDS::CCM_DataListenerControl_ptr -DDS_Listen_T::get_data_control (void) -{ - DDS4CCM_TRACE ("DDS_Listen_T::get_data_control"); - - return ::CCM_DDS::CCM_DataListenerControl::_duplicate (this->data_control_.in ()); -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.h b/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.h deleted file mode 100644 index bc1e0dd8c17..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.h +++ /dev/null @@ -1,66 +0,0 @@ -/** - * @author Marcel Smit - * - * $Id$ - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_LISTEN_T_H_ -#define DDS_LISTEN_T_H_ - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -template -class DDS_Listen_T -{ -public: - DDS_Listen_T (void); - ~DDS_Listen_T (void); - - /** - * @name DDS_Listen - * DDS_Listen operations - */ - //@{ - typename CCM_TYPE::reader_type::_ptr_type get_data (void); - - ::CCM_DDS::CCM_DataListenerControl_ptr get_data_control (void); - - ::DDS::CCM_DataReader_ptr get_dds_entity (void); - //@} - - void configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name); - - void activate ( - typename CCM_TYPE::listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr status, - ACE_Reactor* reactor); - - void passivate (void); - - void remove ( - ::DDS::Subscriber_ptr subscriber); - -private: - /** - * DDS_Listen - */ - //@{ - ::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_read_; - ::CIAO::DDS4CCM::CCM_DDS_DataReader_i ccm_dds_reader_; - //@} - typedef ::CIAO::DDS4CCM::DataReaderListener_T DataReaderListener; -}; - -#include "dds4ccm/impl/dds/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/dds/DDS_Read_T.cpp deleted file mode 100644 index 73f7a0df299..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.cpp +++ /dev/null @@ -1,156 +0,0 @@ -// -*- 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/logger/Log_Macros.h" - -template -DDS_Read_T::DDS_Read_T (void) : - ccm_dds_reader_ (0) -{ -} - -template -DDS_Read_T::~DDS_Read_T (void) -{ -} - -template -void -DDS_Read_T::configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name) -{ - DDS4CCM_TRACE ("DDS_Read_T::configuration_complete"); - - try - { - if (CORBA::is_nil (this->data_.in ())) - { - ::DDS::DataReader_var reader; - if (profile_name && library_name) - { - reader = subscriber->create_datareader_with_profile ( - topic, - library_name, - profile_name, - ::DDS::DataReaderListener::_nil (), - 0); - } - else - { - ::DDS::DataReaderQos drqos; - reader = subscriber->create_datareader ( - topic, - drqos, - ::DDS::DataReaderListener::_nil (), - 0); - } - ::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->data_ = ::DDS::CCM_DataReader::_narrow (reader); - this->dds_read_.set_impl (reader); - this->dds_read_.set_qos (topic, library_name, profile_name); - } - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::configuration_complete: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Read_T::activate ( - ::CCM_DDS::PortStatusListener_ptr listener, - ACE_Reactor* reactor) -{ - DDS4CCM_TRACE ("DDS_Read_T::activate"); - - try - { - if (CORBA::is_nil (this->status_.in ())) - { - ACE_NEW_THROW_EX (this->status_, - PortStatusListener (listener, reactor), - CORBA::NO_MEMORY ()); - } - this->ccm_dds_reader_.set_listener ( - this->status_.in (), - ::CIAO::DDS4CCM::PortStatusListener_T::get_mask ( - listener)); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::activate: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Read_T::passivate () -{ - DDS4CCM_TRACE ("DDS_Read_T::passivate"); - - try - { - this->ccm_dds_reader_.set_listener (::DDS::DataReaderListener::_nil (), 0); - this->status_ = ::DDS::DataReaderListener::_nil (); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::passivate: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Read_T::remove ( - ::DDS::Subscriber_ptr subscriber) -{ - DDS4CCM_TRACE ("DDS_Read_T::remove"); - - try - { - subscriber->delete_datareader (this->data_.in ()); - this->ccm_dds_reader_.set_impl (0); - this->data_ = ::DDS::CCM_DataReader::_nil (); - this->dds_read_.set_impl (0); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::remove: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -typename CCM_TYPE::reader_type::_ptr_type -DDS_Read_T::get_data (void) -{ - DDS4CCM_TRACE ("DDS_Read_T::get_data"); - - return &this->dds_read_; -} - -template -::DDS::CCM_DataReader_ptr -DDS_Read_T::get_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_Read_T::get_dds_entity"); - - return &this->ccm_dds_reader_; -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.h b/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.h deleted file mode 100644 index d1d39a1a68f..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.h +++ /dev/null @@ -1,60 +0,0 @@ -/** - * @author Marcel Smit - * - * $Id$ - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_READ_T_H_ -#define DDS_READ_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" - -template -class DDS_Read_T -{ -public: - DDS_Read_T (void); - ~DDS_Read_T (void); - - /** - * @name DDS_Read - * DDS_Read operations - */ - //@{ - typename CCM_TYPE::reader_type::_ptr_type get_data (void); - - ::DDS::CCM_DataReader_ptr get_dds_entity (void); - //@} - - void configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name); - - void activate ( - ::CCM_DDS::PortStatusListener_ptr listener, - ACE_Reactor* reactor); - - void passivate (void); - - void remove ( - ::DDS::Subscriber_ptr subscriber); - -private: - /** - * DDS_Read - */ - //@{ - ::DDS::CCM_DataReader_var data_; - ::DDS::DataReaderListener_var status_; - ::CIAO::DDS4CCM::DDS_CCM::Reader_T dds_read_; - ::CIAO::DDS4CCM::CCM_DDS_DataReader_i ccm_dds_reader_; - //@} - typedef ::CIAO::DDS4CCM::PortStatusListener_T PortStatusListener; -}; - -#include "dds4ccm/impl/dds/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/dds/DDS_StateListen_T.cpp deleted file mode 100644 index 0174e5f7e50..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp +++ /dev/null @@ -1,170 +0,0 @@ -// -*- 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/logger/Log_Macros.h" - -template -DDS_StateListen_T::DDS_StateListen_T (void) : - data_control_ (new CCM_DDS_StateListenerControl_T - < ::CCM_DDS::CCM_StateListenerControl> ()), - ccm_dds_reader_ (0) -{ -} - -template -DDS_StateListen_T::~DDS_StateListen_T (void) -{ -} - -template -void -DDS_StateListen_T::configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name) -{ - DDS4CCM_TRACE ("DDS_StateListen_T::configuration_complete"); - - try - { - if (CORBA::is_nil (this->data_reader_.in ())) - { - ::DDS::DataReader_var reader; - if (library_name && profile_name) - { - reader = subscriber->create_datareader_with_profile ( - topic, - library_name, - profile_name, - ::DDS::DataReaderListener::_nil (), - 0); - } - else - { - ::DDS::DataReaderQos drqos; - reader = subscriber->create_datareader ( - topic, - drqos, - ::DDS::DataReaderListener::_nil (), - 0); - } - ::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->data_reader_ = ::DDS::CCM_DataReader::_narrow (reader); - this->dds_read_.set_impl (this->data_reader_.in ()); - } - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::configuration_complete: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_StateListen_T::activate ( - typename CCM_TYPE::statelistener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr status, - ACE_Reactor* reactor) -{ - DDS4CCM_TRACE ("DDS_StateListen_T::activate"); - - try - { - if (CORBA::is_nil (this->data_listener_.in ())) - { - ACE_NEW_THROW_EX (this->data_listener_, - DataReaderStateListener ( - listener, - status, - data_control_.in (), - reactor), - CORBA::NO_MEMORY ()); - } - this->ccm_dds_reader_.set_listener ( - this->data_listener_.in (), - ::CIAO::DDS4CCM::DataReaderStateListener_T::get_mask ( - listener)); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::activate: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_StateListen_T::passivate (void) -{ - DDS4CCM_TRACE ("DDS_StateListen_T::passivate"); - try - { - this->ccm_dds_reader_.set_listener ( - ::DDS::DataReaderListener::_nil (), - 0); - this->data_listener_ = ::DDS::DataReaderListener::_nil (); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::passivate: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_StateListen_T::remove ( - ::DDS::Subscriber_ptr subscriber) -{ - DDS4CCM_TRACE ("DDS_StateListen_T::remove"); - try - { - subscriber->delete_datareader (this->data_reader_.in ()); - this->ccm_dds_reader_.set_impl (0); - this->data_reader_ = ::DDS::CCM_DataReader::_nil (); - this->dds_read_.set_impl (0); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::remove: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -typename CCM_TYPE::reader_type::_ptr_type -DDS_StateListen_T::get_data (void) -{ - DDS4CCM_TRACE ("DDS_StateListen_T::get_data"); - - return &this->dds_read_; -} - -template -::DDS::CCM_DataReader_ptr -DDS_StateListen_T::get_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_StateListen_T::get_dds_entity"); - - return &this->ccm_dds_reader_; -} - -template -::CCM_DDS::CCM_StateListenerControl_ptr -DDS_StateListen_T::get_data_control (void) -{ - DDS4CCM_TRACE ("DDS_StateListen_T::get_data_control"); - - return ::CCM_DDS::CCM_StateListenerControl::_duplicate ( - this->data_control_.in ()); -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.h b/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.h deleted file mode 100644 index b785716fba9..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.h +++ /dev/null @@ -1,63 +0,0 @@ -/** - * @author Marcel Smit - * - * $Id$ - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_STATELISTEN_T_H_ -#define DDS_STATELISTEN_T_H_ - -template -class DDS_StateListen_T -{ -public: - DDS_StateListen_T (void); - ~DDS_StateListen_T (void); - - /** - * @name DDS_Listen - * DDS_Listen operations - */ - //@{ - typename CCM_TYPE::reader_type::_ptr_type get_data (void); - - ::CCM_DDS::CCM_StateListenerControl_ptr get_data_control (void); - - ::DDS::CCM_DataReader_ptr get_dds_entity (void); - //@} - - void configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name); - - void activate ( - typename CCM_TYPE::statelistener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr status, - ACE_Reactor* reactor); - - void passivate (void); - - void remove ( - ::DDS::Subscriber_ptr subscriber); - - -private: - /** - * DDS_Listen - */ - //@{ - ::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_read_; - ::CIAO::DDS4CCM::CCM_DDS_DataReader_i ccm_dds_reader_; - //@} - typedef ::CIAO::DDS4CCM::DataReaderStateListener_T DataReaderStateListener; -}; - -#include "dds4ccm/impl/dds/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/dds/DDS_State_Connector_T.cpp deleted file mode 100644 index 76f9a1d63e5..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp +++ /dev/null @@ -1,208 +0,0 @@ -// -*- 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/logger/Log_Macros.h" - -template -DDS_State_Connector_T::DDS_State_Connector_T (void) : - DDS_TopicBase_Connector_T () -{ -} - -template -DDS_State_Connector_T::~DDS_State_Connector_T (void) -{ -} - -template -typename CCM_TYPE::updater_type::_ptr_type -DDS_State_Connector_T::get_observable_data (void) -{ - return this->observable_.get_data (); -} - -template -::DDS::CCM_DataWriter_ptr -DDS_State_Connector_T::get_observable_dds_entity (void) -{ - return this->observable_.get_dds_entity (); -} - -template -typename CCM_TYPE::reader_type::_ptr_type -DDS_State_Connector_T::get_passive_observer_data (void) -{ - return this->passive_observer_.get_data (); -} - -template -::DDS::CCM_DataReader_ptr -DDS_State_Connector_T::get_passive_observer_dds_entity (void) -{ - return this->passive_observer_.get_dds_entity (); -} - -template -typename CCM_TYPE::reader_type::_ptr_type -DDS_State_Connector_T::get_pull_observer_data (void) -{ - return this->pull_observer_.get_data (); -} - -template -typename CCM_TYPE::getter_type::_ptr_type -DDS_State_Connector_T::get_pull_observer_fresh_data (void) -{ - return this->pull_observer_.get_fresh_data (); -} - -template -::DDS::CCM_DataReader_ptr -DDS_State_Connector_T::get_pull_observer_dds_entity (void) -{ - return this->pull_observer_.get_dds_entity (); -} - -template -typename CCM_TYPE::reader_type::_ptr_type -DDS_State_Connector_T::get_push_observer_data (void) -{ - return this->push_observer_.get_data (); -} - -template -::CCM_DDS::CCM_DataListenerControl_ptr -DDS_State_Connector_T::get_push_observer_data_control (void) -{ - return this->push_observer_.get_data_control (); -} - -template -::DDS::CCM_DataReader_ptr -DDS_State_Connector_T::get_push_observer_dds_entity (void) -{ - return this->push_observer_.get_dds_entity (); -} - -template -typename CCM_TYPE::reader_type::_ptr_type -DDS_State_Connector_T::get_push_state_observer_data (void) -{ - return this->push_state_observer_.get_data (); -} - -template -::CCM_DDS::CCM_StateListenerControl_ptr -DDS_State_Connector_T::get_push_state_observer_data_control (void) -{ - return this->push_state_observer_.get_data_control (); -} - -template -::DDS::CCM_DataReader_ptr -DDS_State_Connector_T::get_push_state_observer_dds_entity (void) -{ - return this->push_state_observer_.get_dds_entity (); -} - -template -void -DDS_State_Connector_T::configuration_complete (void) -{ - DDS_TopicBase_Connector_T::configuration_complete (); - this->observable_.configuration_complete ( - this->topic_.in (), - this->publisher_.in (), - this->library_name_, - this->profile_name_); - - this->push_observer_.configuration_complete ( - this->topic_.in (), - this->subscriber_.in (), - this->library_name_, - this->profile_name_); - - this->push_state_observer_.configuration_complete ( - this->topic_.in (), - this->subscriber_.in (), - this->library_name_, - this->profile_name_); - - this->pull_observer_.configuration_complete ( - this->topic_.in (), - this->subscriber_.in (), - this->library_name_, - this->profile_name_); - - this->passive_observer_.configuration_complete ( - this->topic_.in (), - this->subscriber_.in (), - this->library_name_, - this->profile_name_); -} - -template -void -DDS_State_Connector_T::ccm_activate (void) -{ - ACE_Reactor* reactor = 0; -#if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) - reactor = this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor (); -#endif - DDS_TopicBase_Connector_T::ccm_activate (reactor); - - this->observable_.activate (); - - this->push_observer_.activate ( - this->context_->get_connection_push_observer_data_listener (), - this->context_->get_connection_push_observer_status (), - reactor); - - this->push_state_observer_.activate ( - this->context_->get_connection_push_state_observer_data_listener (), - this->context_->get_connection_push_state_observer_status (), - reactor); - - this->pull_observer_.activate ( - this->context_->get_connection_pull_observer_status (), - reactor); - - this->passive_observer_.activate ( - this->context_->get_connection_passive_observer_status (), - reactor); -} - -template -void -DDS_State_Connector_T::ccm_passivate (void) -{ - this->observable_.passivate (); - this->push_observer_.passivate (); - this->push_state_observer_.passivate (); - this->pull_observer_.passivate (); - this->passive_observer_.passivate (); - DDS_TopicBase_Connector_T::ccm_passivate (); -} - -template -void -DDS_State_Connector_T::ccm_remove (void) -{ - this->observable_.remove (this->publisher_.in ()); - this->push_observer_.remove (this->subscriber_.in ()); - this->push_state_observer_.remove (this->subscriber_.in ()); - this->pull_observer_.remove (this->subscriber_.in ()); - this->passive_observer_.remove (this->subscriber_.in ()); - DDS_TopicBase_Connector_T::ccm_remove (); -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h b/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h deleted file mode 100644 index 042dafc36e7..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h +++ /dev/null @@ -1,110 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ -#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" - -template -class DDS_State_Connector_T - : public virtual DDS_TopicBase_Connector_T -{ -public: - DDS_State_Connector_T (void); - virtual ~DDS_State_Connector_T (void); - - virtual typename CCM_TYPE::updater_type::_ptr_type - get_observable_data (void); - - virtual ::DDS::CCM_DataWriter_ptr - get_observable_dds_entity (void); - - virtual typename CCM_TYPE::reader_type::_ptr_type - get_passive_observer_data (void); - - virtual ::DDS::CCM_DataReader_ptr - get_passive_observer_dds_entity (void); - - virtual typename CCM_TYPE::reader_type::_ptr_type - get_pull_observer_data (void); - - virtual typename CCM_TYPE::getter_type::_ptr_type - get_pull_observer_fresh_data (void); - - virtual ::DDS::CCM_DataReader_ptr - get_pull_observer_dds_entity (void); - - virtual typename CCM_TYPE::reader_type::_ptr_type - get_push_observer_data (void); - - virtual ::CCM_DDS::CCM_DataListenerControl_ptr - get_push_observer_data_control (void); - - virtual ::DDS::CCM_DataReader_ptr - get_push_observer_dds_entity (void); - - virtual typename CCM_TYPE::reader_type::_ptr_type - get_push_state_observer_data (void); - - virtual ::CCM_DDS::CCM_StateListenerControl_ptr - get_push_state_observer_data_control (void); - - virtual ::DDS::CCM_DataReader_ptr - get_push_state_observer_dds_entity (void); - - virtual void configuration_complete (void); - - virtual void ccm_activate (void); - virtual void ccm_passivate (void); - virtual void ccm_remove (void); - -private: - /** - * DDS_Update observable - */ - //@{ - DDS_Update_T observable_; - //@} - - /** - * DDS_Read passive_observer - */ - //@{ - DDS_Read_T passive_observer_; - //@} - - /** - * DDS_Get pull_observer - */ - //@{ - DDS_Get_T pull_observer_; - //@} - - /** - * DDS_Listen push_observer - */ - //@{ - DDS_Listen_T push_observer_; - //@} - - /** - * DDS_StateListen push_state_observer - */ - //@{ - DDS_StateListen_T push_state_observer_; - //@} -}; - -#include "dds4ccm/impl/dds/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/dds/DDS_TopicBase_Connector_T.cpp deleted file mode 100644 index 5fb5b21411d..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp +++ /dev/null @@ -1,464 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#include "dds4ccm/impl/logger/Log_Macros.h" - -template -DDS_TopicBase_Connector_T::DDS_TopicBase_Connector_T (void) : - DDS_Base_Connector_T() -{ -} - -template -DDS_TopicBase_Connector_T::~DDS_TopicBase_Connector_T (void) -{ -} - -template -void -DDS_TopicBase_Connector_T::configuration_complete (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::configuration_complete"); - DDS_Base_Connector_T::configuration_complete (); - this->init_default_topic (); - this->init_subscriber (); - this->init_publisher (); -} - -template -void -DDS_TopicBase_Connector_T::ccm_activate (ACE_Reactor* reactor) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::ccm_activate"); - DDS_Base_Connector_T::ccm_activate (); - this->activate_default_topic (reactor); - this->activate_subscriber (reactor); - this->activate_publisher (reactor); -} - -template -void -DDS_TopicBase_Connector_T::ccm_passivate (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::ccm_passivate"); - this->passivate_default_topic (); - this->passivate_subscriber (); - this->passivate_publisher (); - DDS_Base_Connector_T::ccm_passivate (); -} - -template -void -DDS_TopicBase_Connector_T::ccm_remove (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::ccm_remove"); - this->remove_default_topic (); - this->remove_subscriber (); - this->remove_publisher (); - DDS_Base_Connector_T::ccm_remove (); -} - -template -char * -DDS_TopicBase_Connector_T::topic_name (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::topic_name"); - return CORBA::string_dup (this->topic_name_.in ()); -} - -template -void -DDS_TopicBase_Connector_T::topic_name ( - const char * topic_name) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::topic_name"); - if (this->configuration_complete_) - { - throw ::CCM_DDS::NonChangeable (); - } - else - { - this->topic_name_ = topic_name; - } -} - -template -void -DDS_TopicBase_Connector_T::key_fields ( - const ::DDS::StringSeq & key_fields) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::key_fields"); - if (this->configuration_complete_) - { - throw ::CCM_DDS::NonChangeable (); - } - else - { - this->key_fields_.length (key_fields.length ()); - for (CORBA::ULong i = 0; i < key_fields.length (); ++i) - { - this->key_fields_.operator [](i) = CORBA::string_dup (key_fields[i]); - } - } -} - -template -::DDS::StringSeq * -DDS_TopicBase_Connector_T::key_fields (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::key_fields"); -/* - For future use, DDS_TYPE doesn't have get_typecode yet - ::DDS_TypeCode* ptr = ::DDS_TYPE::type_support::get_typecode (); - DDS_ExceptionCode_t ex; - DDS_UnsignedLong const number = ptr->member_count (ex); - for (DDS_UnsignedLong i = 0; i < number; i++) - { - if (ptr->is_member_key (i, ex)) - { - const char* name = ptr->member_name (i, ex); - printf ("Name: %s\n", name); - } - } - */ - ::DDS::StringSeq_var retval = 0; - ACE_NEW_THROW_EX (retval, - ::DDS::StringSeq (this->key_fields_.length ()), - CORBA::NO_MEMORY ()); - retval->length (this->key_fields_.length ()); - - for (CORBA::ULong i = 0; i < this->key_fields_.length (); ++i) - { - (*retval)[i] = CORBA::string_dup (this->key_fields_[i]); - } - return retval._retn (); -} - -template -void -DDS_TopicBase_Connector_T::init_default_topic (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::init_default_topic"); - - if (CORBA::is_nil (this->topic_)) - { - try - { - CIAO::DDS4CCM::CCM_DDS_DomainParticipant_i *part = - dynamic_cast< CIAO::DDS4CCM::CCM_DDS_DomainParticipant_i * > ( - this->domain_participant_.in ()); - DDS_ReturnCode_t const retcode = DDS_TYPE::type_support::register_type( - part->get_impl (), DDS_TYPE::type_support::get_type_name ()); - - if (retcode == DDS_RETCODE_OK) - { - if (this->library_name_ && this->profile_name_) - { - this->topic_ = - this->domain_participant_->create_topic_with_profile ( - this->topic_name_.in (), - DDS_TYPE::type_support::get_type_name (), - this->library_name_, - this->profile_name_, - ::DDS::TopicListener::_nil (), - 0); - } - else - { - ::DDS::TopicQos tqos; - this->topic_ = - this->domain_participant_->create_topic ( - this->topic_name_.in (), - DDS_TYPE::type_support::get_type_name (), - tqos, - ::DDS::TopicListener::_nil (), - 0); - } - } - else - { - throw CCM_DDS::InternalError (retcode, 0); - } - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::init_default_topic: " - "Caught unknown C++ exception.\n")); - throw CORBA::INTERNAL (); - } - } -} - -template -void -DDS_TopicBase_Connector_T::init_subscriber (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::init_subscriber"); - - if (CORBA::is_nil (this->subscriber_.in ())) - { - try - { - if (this->library_name_ && this->profile_name_) - { - this->subscriber_ = this->domain_participant_-> - create_subscriber_with_profile ( - this->library_name_, - this->profile_name_, - ::DDS::SubscriberListener::_nil (), - 0); - } - else - { - ::DDS::SubscriberQos sqos; - this->subscriber_ = this->domain_participant_-> - create_subscriber ( - sqos, - ::DDS::SubscriberListener::_nil (), - 0); - } - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::init_subscriber: " - "Caught unknown C++ exception.\n")); - throw CORBA::INTERNAL (); - } - } -} - -template -void -DDS_TopicBase_Connector_T::init_publisher (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::init_publisher"); - - if (CORBA::is_nil (this->publisher_.in ())) - { - if (this->library_name_ && this->profile_name_) - { - this->publisher_ = this->domain_participant_-> - create_publisher_with_profile ( - this->library_name_, - this->profile_name_, - ::DDS::PublisherListener::_nil (), - 0); - } - else - { - ::DDS::PublisherQos pqos; - this->publisher_ = this->domain_participant_-> - create_publisher ( - pqos, - ::DDS::PublisherListener::_nil (), - 0); - } - } -} - -template -void -DDS_TopicBase_Connector_T::activate_default_topic (ACE_Reactor* reactor) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::activate_default_topic"); - try - { - if (CORBA::is_nil (this->topiclistener_.in ())) - { - ACE_NEW_THROW_EX (this->topiclistener_, - TopicListener ( - this->context_->get_connection_error_listener (), - reactor), - CORBA::NO_MEMORY ()); - } - this->topic_->set_listener ( - this->topiclistener_.in (), - ::CIAO::DDS4CCM::TopicListener_T::get_mask ( - this->context_->get_connection_error_listener ())); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::activate_default_topic: " - "Caught unknown C++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_TopicBase_Connector_T::activate_subscriber (ACE_Reactor* reactor) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::activate_subscriber"); - - try - { - if (CORBA::is_nil (this->subscriber_listener_.in ())) - { - ACE_NEW_THROW_EX (this->subscriber_listener_, - SubscriberListener ( - this->context_->get_connection_error_listener (), - reactor), - CORBA::NO_MEMORY ()); - } - this->subscriber_->set_listener ( - this->subscriber_listener_.in (), - ::CIAO::DDS4CCM::SubscriberListener_T::get_mask ( - this->context_->get_connection_error_listener ())); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::activate_subscriber: " - "Caught unknown C++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_TopicBase_Connector_T::activate_publisher (ACE_Reactor* reactor) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::activate_publisher"); - - try - { - if (CORBA::is_nil (this->publisher_listener_.in ())) - { - ACE_NEW_THROW_EX (this->publisher_listener_, - PublisherListener ( - this->context_->get_connection_error_listener (), - reactor), - CORBA::NO_MEMORY ()); - } - this->publisher_->set_listener ( - this->publisher_listener_.in (), - ::CIAO::DDS4CCM::PublisherListener_T::get_mask ( - this->context_->get_connection_error_listener ())); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::activate_publisher: " - "Caught unknown C++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_TopicBase_Connector_T::passivate_default_topic (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::passivate_default_topic"); - - try - { - this->topic_->set_listener ( - ::DDS::TopicListener::_nil (), - 0); - - this->topiclistener_ = ::DDS::TopicListener::_nil (); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::passivate_default_topic: " - "Caught unknown C++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_TopicBase_Connector_T::passivate_subscriber (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::passivate_subscriber"); - - try - { - this->subscriber_->set_listener ( - ::DDS::SubscriberListener::_nil (), - 0); - this->subscriber_listener_ = ::DDS::SubscriberListener::_nil (); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::passivate_subscriber: " - "Caught unknown C++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_TopicBase_Connector_T::passivate_publisher (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::passivate_publisher"); - - try - { - this->publisher_->set_listener ( - ::DDS::PublisherListener::_nil (), - 0); - this->publisher_listener_ = ::DDS::PublisherListener::_nil (); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::passivate_default_topic: " - "Caught unknown C++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_TopicBase_Connector_T::remove_default_topic (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::remove_default_topic"); - - try - { - this->domain_participant_->delete_topic (this->topic_.in ()); - this->topic_ = ::DDS::Topic::_nil (); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::remove_default_topic: " - "Caught unknown C++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_TopicBase_Connector_T::remove_subscriber (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::remove_subscriber"); - - try - { - this->domain_participant_->delete_subscriber (this->subscriber_.in ()); - this->subscriber_ = ::DDS::Subscriber::_nil (); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::remove_subscriber: " - "Caught unknown C++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_TopicBase_Connector_T::remove_publisher (void) -{ - DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::remove_publisher"); - - try - { - this->domain_participant_->delete_publisher (this->publisher_.in ()); - this->publisher_ = ::DDS::Publisher::_nil (); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::remove_publisher: " - "Caught unknown C++ exception.\n")); - throw CORBA::INTERNAL (); - } -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h b/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h deleted file mode 100644 index 1e9416252dd..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h +++ /dev/null @@ -1,73 +0,0 @@ -/** - * @author Marcel Smit - * - * $Id$ - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_TOPIC_BASE_CONNECTOR_H -#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" - -template -class DDS_TopicBase_Connector_T - : public virtual DDS_Base_Connector_T -{ -public: - DDS_TopicBase_Connector_T (void); - virtual ~DDS_TopicBase_Connector_T (void); - - virtual char *topic_name (void); - - virtual void topic_name (const char * topic_name); - - virtual ::DDS::StringSeq *key_fields (void); - - virtual void key_fields (const ::DDS::StringSeq & key_fields); - - virtual void configuration_complete (void); - virtual void ccm_remove (void); - virtual void ccm_activate (ACE_Reactor* reactor); - virtual void ccm_passivate (void); - -protected: - void init_default_topic (void); - void init_publisher (void); - void init_subscriber (void); - - void activate_default_topic (ACE_Reactor* reactor); - void activate_publisher (ACE_Reactor* reactor); - void activate_subscriber (ACE_Reactor* reactor); - - void passivate_default_topic (void); - void passivate_publisher (void); - void passivate_subscriber (void); - - void remove_default_topic (void); - void remove_publisher (void); - void remove_subscriber (void); - - CORBA::String_var topic_name_; - DDS::StringSeq key_fields_; - - ::DDS::Topic_var topic_; - ::DDS::TopicListener_var topiclistener_; - - ::DDS::Publisher_var publisher_; - ::DDS::PublisherListener_var publisher_listener_; - ::DDS::Subscriber_var subscriber_; - ::DDS::SubscriberListener_var subscriber_listener_; - -typedef ::CIAO::DDS4CCM::TopicListener_T TopicListener; -typedef ::CIAO::DDS4CCM::SubscriberListener_T SubscriberListener; -typedef ::CIAO::DDS4CCM::PublisherListener_T PublisherListener; -}; - -#include "dds4ccm/impl/dds/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/dds/DDS_Update_T.cpp deleted file mode 100644 index c772f4fd8a9..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.cpp +++ /dev/null @@ -1,144 +0,0 @@ -// -*- 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/logger/Log_Macros.h" - -template -DDS_Update_T::DDS_Update_T (void) : - ccm_dds_writer_ (0) -{ -} - -template -DDS_Update_T::~DDS_Update_T (void) -{ -} - -template -void -DDS_Update_T::configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Publisher_ptr publisher, - const char* library_name, - const char* profile_name) -{ - DDS4CCM_TRACE ("DDS_Update_T::configuration_complete"); - if (CORBA::is_nil (this->data_writer_.in ())) - { - try - { - ::DDS::DataWriter_var dwv_tmp; - if (library_name && profile_name) - { - dwv_tmp = publisher->create_datawriter_with_profile ( - topic, - library_name, - profile_name, - ::DDS::DataWriterListener::_nil (), - 0); - } - else - { - ::DDS::DataWriterQos dwqos; - dwv_tmp = publisher->create_datawriter ( - topic, - dwqos, - ::DDS::DataWriterListener::_nil (), - 0); - } - ::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->data_writer_ = ::DDS::CCM_DataWriter::_narrow (dwv_tmp); - this->dds_update_.set_impl (dwv_tmp); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::configuration_complete: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } - } -} - -template -void -DDS_Update_T::activate () -{ - DDS4CCM_TRACE ("DDS_Update_T::activate"); - try - { - if (CORBA::is_nil (this->data_listener_.in ())) - { - ACE_NEW_THROW_EX (this->data_listener_, - DataWriterListener (), - CORBA::NO_MEMORY ()); - } - this->ccm_dds_writer_.set_listener ( - this->data_listener_.in (), - ::CIAO::DDS4CCM::DataWriterListener_T::get_mask ()); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::activate: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Update_T::passivate () -{ - DDS4CCM_TRACE ("DDS_Update_T::passivate"); - try - { - this->ccm_dds_writer_.set_listener ( - ::DDS::DataWriterListener::_nil (), - 0); - this->data_listener_ = ::DDS::DataWriterListener::_nil (); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::passivate: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Update_T::remove ( - ::DDS::Publisher_ptr publisher) -{ - DDS4CCM_TRACE ("DDS_Update_T::remove"); - try - { - publisher->delete_datawriter (this->data_writer_.in ()); - this->ccm_dds_writer_.set_impl (0); - this->data_writer_ = ::DDS::CCM_DataWriter::_nil (); - this->dds_update_.set_impl (0); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::remove: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -typename CCM_TYPE::updater_type::_ptr_type -DDS_Update_T::get_data (void) -{ - return &this->dds_update_; -} - -template -::DDS::CCM_DataWriter_ptr -DDS_Update_T::get_dds_entity (void) -{ - return &this->ccm_dds_writer_; -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.h b/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.h deleted file mode 100644 index c6c70235121..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.h +++ /dev/null @@ -1,52 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_UPDATE_T_H -#define DDS_UPDATE_T_H - -#include "dds4ccm/impl/dds/Updater_T.h" - -template -class DDS_Update_T -{ -public: - DDS_Update_T (void); - ~DDS_Update_T (void); - - typename CCM_TYPE::updater_type::_ptr_type get_data (void); - - ::DDS::CCM_DataWriter_ptr get_dds_entity (void); - - void configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Publisher_ptr publisher, - const char* library_name, - const char* profile_name); - - void activate (void); - - void passivate (void); - - void remove ( - ::DDS::Publisher_ptr publisher); - -private: - /** - * DDS_Update - */ - //@{ - ::DDS::CCM_DataWriter_var data_writer_; - ::DDS::DataWriterListener_var data_listener_; - ::CIAO::DDS4CCM::Updater_T dds_update_; - ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i ccm_dds_writer_; - //@} - typedef ::CIAO::DDS4CCM::DataWriterListener_T DataWriterListener; -}; - -#include "dds4ccm/impl/dds/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/dds/DDS_Write_T.cpp deleted file mode 100644 index f628d5a9829..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.cpp +++ /dev/null @@ -1,149 +0,0 @@ -// -*- 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/logger/Log_Macros.h" - -template -DDS_Write_T::DDS_Write_T (void) : - ccm_dds_writer_i (0) -{ -} - -template -DDS_Write_T::~DDS_Write_T (void) -{ -} - -template -void -DDS_Write_T::configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Publisher_ptr publisher, - const char* library_name, - const char* profile_name) -{ - DDS4CCM_TRACE ("DDS_Write_T::configuration_complete"); - - try - { - if (CORBA::is_nil (this->data_writer_.in ())) - { - ::DDS::DataWriter_var dwv_tmp; - if (library_name && profile_name) - { - dwv_tmp = publisher->create_datawriter_with_profile ( - topic, - library_name, - profile_name, - ::DDS::DataWriterListener::_nil (), - 0); - } - else - { - ::DDS::DataWriterQos dwqos; - dwv_tmp = publisher->create_datawriter ( - topic, - dwqos, - ::DDS::DataWriterListener::_nil (), - 0); - } - ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rw = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dwv_tmp.in ()); - this->ccm_dds_writer_i.set_impl (rw->get_impl ()); - this->data_writer_ = ::DDS::CCM_DataWriter::_narrow (dwv_tmp); - this->writer_t_.set_impl (dwv_tmp); - } - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::configuration_complete: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} -template -void -DDS_Write_T::activate () -{ - DDS4CCM_TRACE ("DDS_Write_T::activate"); - try - { - if (CORBA::is_nil (this->data_listener_.in ())) - { - ACE_NEW_THROW_EX (this->data_listener_, - DataWriterListener (), - CORBA::NO_MEMORY ()); - } - this->ccm_dds_writer_i.set_listener ( - this->data_listener_.in (), - ::CIAO::DDS4CCM::DataWriterListener_T::get_mask ()); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::activate: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Write_T::passivate () -{ - DDS4CCM_TRACE ("DDS_Write_T::passivate"); - try - { - this->ccm_dds_writer_i.set_listener ( - ::DDS::DataWriterListener::_nil (), - 0); - this->data_listener_ = ::DDS::DataWriterListener::_nil (); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::passivate: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - -template -void -DDS_Write_T::remove ( - ::DDS::Publisher_ptr publisher) -{ - DDS4CCM_TRACE ("DDS_Write_T::remove"); - try - { - publisher->delete_datawriter (this->data_writer_.in ()); - this->ccm_dds_writer_i.set_impl (0); - this->data_writer_ = ::DDS::CCM_DataWriter::_nil (); - this->writer_t_.set_impl (0); - } - catch (...) - { - DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::remove: Caught unknown c++ exception.\n")); - throw CORBA::INTERNAL (); - } -} - - -template -typename CCM_TYPE::writer_type::_ptr_type -DDS_Write_T::get_data (void) -{ - DDS4CCM_TRACE ("DDS_Write_T::get_data"); - - return &this->writer_t_; -} - -template -::DDS::CCM_DataWriter_ptr -DDS_Write_T::get_dds_entity (void) -{ - DDS4CCM_TRACE ("DDS_Write_T::get_dds_entity"); - - return &this->ccm_dds_writer_i; -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.h b/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.h deleted file mode 100644 index 5df2f64f3c6..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.h +++ /dev/null @@ -1,60 +0,0 @@ -/** - * @author Marcel Smit - * - * $Id$ - * - * Wrapper facade for NDDS. - */ -#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" - -template -class DDS_Write_T -{ -public: - DDS_Write_T (void); - ~DDS_Write_T (void); - - /** - * @name DDS_Write - * DDS_Write operations - */ - //@{ - typename CCM_TYPE::writer_type::_ptr_type get_data (void); - - ::DDS::CCM_DataWriter_ptr get_dds_entity (void); - //@} - - void configuration_complete ( - ::DDS::Topic_ptr topic, - ::DDS::Publisher_ptr publisher, - const char* library_name, - const char* profile_name); - - void activate (void); - - void passivate (void); - - void remove ( - ::DDS::Publisher_ptr publisher); - -private: - /** - * DDS_Write - */ - //@{ - ::DDS::CCM_DataWriter_var data_writer_; - ::DDS::DataWriterListener_var data_listener_; - ::CIAO::DDS4CCM::Writer_T writer_t_; - ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i ccm_dds_writer_i; - //@} - - typedef ::CIAO::DDS4CCM::DataWriterListener_T DataWriterListener; -}; - -#include "dds4ccm/impl/dds/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/dds/DataListenerControl_T.cpp deleted file mode 100644 index 627cec340b4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// -*- C++ -*- -// $Id$ - -template -CCM_DDS_DataListenerControl_T::CCM_DDS_DataListenerControl_T (void) : - mode_ (::CCM_DDS::NOT_ENABLED), - max_delivered_data_ (0) -{ - DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::CCM_DDS_DataListenerControl_T"); -} - -template -CCM_DDS_DataListenerControl_T::~CCM_DDS_DataListenerControl_T (void) -{ - DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::~CCM_DDS_DataListenerControl_T"); -} - -template -::CCM_DDS::ListenerMode -CCM_DDS_DataListenerControl_T::mode (void) -{ - DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::mode"); - return this->mode_.value (); -} - -template -void -CCM_DDS_DataListenerControl_T::mode (::CCM_DDS::ListenerMode mode) -{ - DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::mode"); - this->mode_ = mode; -} - -template -::CCM_DDS::DataNumber_t -CCM_DDS_DataListenerControl_T::max_delivered_data (void) -{ - DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::max_delivered_data"); - return this->max_delivered_data_.value (); -} - -template -void -CCM_DDS_DataListenerControl_T::max_delivered_data ( - ::CCM_DDS::DataNumber_t max_delivered_data) -{ - DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::max_delivered_data"); - this->max_delivered_data_ = max_delivered_data; -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.h deleted file mode 100644 index 50630e7221a..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataListenerControl_T.h +++ /dev/null @@ -1,48 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#ifndef DDS4CCM_DATALISTENERCONTROLI_H_ -#define DDS4CCM_DATALISTENERCONTROLI_H_ - -#include "dds4ccm/idl/dds4ccm_DataListenerControlEC.h" -#include "tao/LocalObject.h" -#include "ace/Copy_Disabled.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -template -class CCM_DDS_DataListenerControl_T - : public virtual BASE_TYPE, - public virtual ::CORBA::LocalObject, - private ACE_Copy_Disabled -{ -public: - /// Constructor - CCM_DDS_DataListenerControl_T (void); - - /// Destructor - virtual ~CCM_DDS_DataListenerControl_T (void); - - /// Set the mode - virtual ::CCM_DDS::ListenerMode mode (void); - - /// Get the mode - virtual void mode (::CCM_DDS::ListenerMode mode); - - /// Set the max_delivered_data - virtual ::CCM_DDS::DataNumber_t max_delivered_data (void); - - /// Get the max_delivered_data - virtual void max_delivered_data (::CCM_DDS::DataNumber_t max_delivered_data); - -protected: - ACE_Atomic_Op mode_; - ACE_Atomic_Op max_delivered_data_; -}; - -#include "dds4ccm/impl/dds/DataListenerControl_T.cpp" - -#endif /* DDS4CCM_DATALISTENERCONTROLI_H_ */ - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp deleted file mode 100644 index 1208e9489cd..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp +++ /dev/null @@ -1,439 +0,0 @@ -// $Id$ - -#include "DataReader.h" -#include "DataReaderListener.h" -#include "StatusCondition.h" -#include "ReadCondition.h" -#include "QueryCondition.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 "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_DataReader_i::CCM_DDS_DataReader_i (DDSDataReader * dr) - : impl_ (dr) - { - } - - CCM_DDS_DataReader_i::~CCM_DDS_DataReader_i (void) - { - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::enable (void) - { - return this->impl ()->enable (); - } - - ::DDS::StatusCondition_ptr - CCM_DDS_DataReader_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSStatusCondition* sc = this->impl ()->get_statuscondition (); - if (sc) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); - } -#else - ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - if (!CORBA::is_nil (sc.in ())) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc.in ()), - CORBA::NO_MEMORY ()); - } -#endif - return retval._retn (); - } - - ::DDS::StatusMask - CCM_DDS_DataReader_i::get_status_changes (void) - { - return this->impl ()->get_status_changes (); - } - - DDS_INSTANCE_HANDLE_T_RETN - CCM_DDS_DataReader_i::get_instance_handle (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; -#else - return this->impl ()->get_instance_handle (); -#endif - } - - ::DDS::ReadCondition_ptr - CCM_DDS_DataReader_i::create_readcondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states) - { - ::DDS::ReadCondition_var retval = ::DDS::ReadCondition::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSReadCondition* rc = this->impl ()->create_readcondition (sample_states, view_states, instance_states); - if (rc) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_ReadCondition_i (rc), - CORBA::NO_MEMORY ()); - } -#else - ::DDS::ReadCondition_var rc = this->impl ()->create_readcondition (sample_states, view_states, instance_states); - if (!CORBA::is_nil (rc.in ())) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc.in ()), - CORBA::NO_MEMORY ()); - } -#endif - return retval._retn (); - } - - ::DDS::QueryCondition_ptr - CCM_DDS_DataReader_i::create_querycondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states, - const char * query_expression, - const ::DDS::StringSeq & query_parameters) - { - ::DDS::QueryCondition_var retval = ::DDS::QueryCondition::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_StringSeq parameters; - parameters <<= query_parameters; - DDSQueryCondition* qc = this->impl ()->create_querycondition ( - sample_states, - view_states, - instance_states, - query_expression, - parameters); - - if (qc) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_QueryCondition_i (qc), - CORBA::NO_MEMORY ()); - } -#else - ::DDS::QueryCondition_var qc = this->impl ()->create_querycondition ( - sample_states, - view_states, - instance_states, - query_expression, - query_parameters); - - if (!CORBA::is_nil (qc.in ())) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_QueryCondition_i (qc.in ()), - CORBA::NO_MEMORY ()); - } -#endif - return retval._retn (); - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::delete_readcondition ( - ::DDS::ReadCondition_ptr a_condition) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_ReadCondition_i *rc = dynamic_cast< CCM_DDS_ReadCondition_i *> (a_condition); - if (!rc) - { - return ::DDS::RETCODE_BAD_PARAMETER; - } - return this->impl ()->delete_readcondition (rc->get_impl ()); -#else - return this->impl ()->delete_readcondition (a_condition); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::delete_contained_entities (void) - { - return this->impl ()->delete_contained_entities (); - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::set_qos ( - const ::DDS::DataReaderQos &qos) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DataReaderQos ddsqos; - ddsqos <<= qos; - return this->impl ()->set_qos (ddsqos); -#else - return this->impl ()->set_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::get_qos ( - ::DDS::DataReaderQos &qos) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_DataReaderQos ddsqos; - ::DDS_ReturnCode_t const retval = this->impl ()->get_qos (ddsqos); - qos <<= ddsqos; - return retval; -#else - return this->impl ()->get_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::set_listener ( - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask) - { - 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; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_drl, - CCM_DDS_DataReaderListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - return this->impl ()->set_listener (ccm_dds_drl, mask); -#else - return this->impl ()->set_listener (a_listener, mask); -#endif - } - - ::DDS::DataReaderListener_ptr - CCM_DDS_DataReader_i::get_listener (void) - { - DDS4CCM_TRACE ("CCM_DDS_DataReader_i::get_listener"); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDataReaderListener *drl = this->impl ()->get_listener (); - CCM_DDS_DataReaderListener_i *ccm_dds_drl = dynamic_cast (drl); - if (!ccm_dds_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 (); -#else - return this->impl ()->get_listener (); -#endif - } - - ::DDS::TopicDescription_ptr - CCM_DDS_DataReader_i::get_topicdescription (void) - { - ::DDS::TopicDescription_var dds_td = ::DDS::TopicDescription::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDSTopicDescription* td = this->impl ()->get_topicdescription (); - ACE_NEW_THROW_EX (dds_td, - CCM_DDS_TopicDescription_i (td), - CORBA::NO_MEMORY ()); -#else - ::DDS::TopicDescription_var td = this->impl ()->get_topicdescription (); - ACE_NEW_THROW_EX (dds_td, - CCM_DDS_TopicDescription_i (td.in ()), - CORBA::NO_MEMORY ()); -#endif - return dds_td._retn (); - } - - ::DDS::Subscriber_ptr - CCM_DDS_DataReader_i::get_subscriber (void) - { - ::DDS::Subscriber_var dds_td = ::DDS::Subscriber::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDSSubscriber* subscriber = this->impl ()->get_subscriber (); - ACE_NEW_THROW_EX (dds_td, - CCM_DDS_Subscriber_i (subscriber), - CORBA::NO_MEMORY ()); -#else - ::DDSSubscriber_var subscriber = this->impl ()->get_subscriber (); - ACE_NEW_THROW_EX (dds_td, - CCM_DDS_Subscriber_i (subscriber.in ()), - CORBA::NO_MEMORY ()); -#endif - return dds_td._retn (); - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::get_sample_rejected_status ( - ::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; - return retval; -#else - return this->impl ()->get_sample_rejected_status (status); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::get_liveliness_changed_status ( - ::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; - return retval; -#else - return this->impl ()->get_liveliness_changed_status (status); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::get_requested_deadline_missed_status ( - ::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; - return retval; -#else - return this->impl ()->get_requested_deadline_missed_status (status); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::get_requested_incompatible_qos_status ( - ::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; - return retval; -#else - return this->impl ()->get_requested_incompatible_qos_status (status); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::get_subscription_matched_status ( - ::DDS::SubscriptionMatchedStatus & status) - { -#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; - return retval; -#else - return this->impl ()->get_subscription_matched_status (status); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::get_sample_lost_status ( - ::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; - return retval; -#else - return this->impl ()->get_sample_lost_status (status); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::wait_for_historical_data ( - const ::DDS::Duration_t & max_wait) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_Duration_t rtiduration; - rtiduration <<= max_wait; - return this->impl ()->wait_for_historical_data (rtiduration); -#else - return this->impl ()->wait_for_historical_data (max_wait); -#endif - } - - ::DDS::ReturnCode_t - 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; - return retval; -#else - return this->impl ()->get_matched_publications (publication_handles); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataReader_i::get_matched_publication_data ( - ::DDS::PublicationBuiltinTopicData & publication_data, - 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; - - ccm_dds_pub_data <<= publication_data; - ccm_dds_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; - return retcode; -#else - return this->impl ()->get_matched_publication_data (publication_data, publication_handle); -#endif - } - - DDSDataReader * - CCM_DDS_DataReader_i::get_impl (void) - { - return this->impl_; - } - - void - CCM_DDS_DataReader_i::set_impl (DDSDataReader * dr) - { - this->impl_ = dr; - } - - DDSDataReader * - CCM_DDS_DataReader_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReader.h b/CIAO/connectors/dds4ccm/impl/dds/DataReader.h deleted file mode 100644 index 11b959c04f5..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReader.h +++ /dev/null @@ -1,143 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DATAREADER_H -#define DDS4CCM_DATAREADER_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" - -#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 "tao/LocalObject.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -# include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DataReader DDSDataReader; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataReader_i - : public virtual ::DDS::CCM_DataReader, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - CCM_DDS_DataReader_i (DDSDataReader *dr); - - /// Destructor - virtual ~CCM_DDS_DataReader_i (void); - - virtual ::DDS::ReturnCode_t - enable (void); - - virtual ::DDS::StatusCondition_ptr - get_statuscondition (void); - - virtual ::DDS::StatusMask - get_status_changes (void); - - virtual DDS_INSTANCE_HANDLE_T_RETN - get_instance_handle (void); - - virtual ::DDS::ReadCondition_ptr - create_readcondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states); - - virtual ::DDS::QueryCondition_ptr - create_querycondition ( - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states, - const char * query_expression, - const ::DDS::StringSeq & query_parameters); - - virtual ::DDS::ReturnCode_t - delete_readcondition ( - ::DDS::ReadCondition_ptr a_condition); - - virtual ::DDS::ReturnCode_t - delete_contained_entities (void); - - virtual ::DDS::ReturnCode_t - set_qos (const ::DDS::DataReaderQos & qos); - - virtual ::DDS::ReturnCode_t - get_qos (::DDS::DataReaderQos & qos); - - virtual ::DDS::ReturnCode_t - set_listener ( - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::DataReaderListener_ptr - get_listener (void); - - virtual ::DDS::TopicDescription_ptr - get_topicdescription (void); - - virtual ::DDS::Subscriber_ptr - get_subscriber (void); - - virtual ::DDS::ReturnCode_t - get_sample_rejected_status (::DDS::SampleRejectedStatus & status); - - virtual ::DDS::ReturnCode_t - get_liveliness_changed_status ( - ::DDS::LivelinessChangedStatus & status); - - virtual ::DDS::ReturnCode_t - get_requested_deadline_missed_status ( - ::DDS::RequestedDeadlineMissedStatus & status); - - virtual ::DDS::ReturnCode_t - get_requested_incompatible_qos_status ( - ::DDS::RequestedIncompatibleQosStatus & status); - - virtual ::DDS::ReturnCode_t - get_subscription_matched_status ( - ::DDS::SubscriptionMatchedStatus & status); - - virtual ::DDS::ReturnCode_t - get_sample_lost_status (::DDS::SampleLostStatus & status); - - virtual ::DDS::ReturnCode_t - wait_for_historical_data (const ::DDS::Duration_t & max_wait); - - virtual ::DDS::ReturnCode_t - get_matched_publications ( - ::DDS::InstanceHandleSeq & publication_handles); - - virtual ::DDS::ReturnCode_t - get_matched_publication_data ( - ::DDS::PublicationBuiltinTopicData & publication_data, - DDS_INSTANCE_HANDLE_T_IN publication_handle); - - DDSDataReader * get_impl (void); - - void set_impl (DDSDataReader * dr); - - private: - DDSDataReader * impl_; - - DDSDataReader * impl (void); - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp deleted file mode 100644 index c7f51f3a2d6..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// $Id$ - -#include "dds4ccm/impl/dds/Utils.h" - -#include "dds4ccm/impl/dds/DataReader.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - - -template -CIAO::DDS4CCM::DataReaderHandler_T::DataReaderHandler_T ( - typename CIAO::DDS4CCM::DataReaderListener_T* drl, - ::DDS::DataReader_ptr dr) - : drl_ (drl), - dr_ (::DDS::DataReader::_duplicate (dr)) -{ - this->reference_counting_policy ().value - (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); -} - -template -CIAO::DDS4CCM::DataReaderHandler_T::~DataReaderHandler_T (void) -{ -} - -template -int -CIAO::DDS4CCM::DataReaderHandler_T::handle_exception (ACE_HANDLE) -{ - try - { - this->drl_->on_data_available_i (this->dr_.in ()); - } - catch (...) - { - } - return 0; -} - -template -CIAO::DDS4CCM::DataReaderStateHandler_T::DataReaderStateHandler_T ( - typename CIAO::DDS4CCM::DataReaderStateListener_T* drl, - ::DDS::DataReader_ptr dr) - : drl_ (drl), - dr_ (::DDS::DataReader::_duplicate (dr)) -{ - this->reference_counting_policy ().value - (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); -} - -template -CIAO::DDS4CCM::DataReaderStateHandler_T::~DataReaderStateHandler_T (void) -{ -} - -template -int -CIAO::DDS4CCM::DataReaderStateHandler_T::handle_exception (ACE_HANDLE) -{ - try - { - this->drl_->on_data_available_i (this->dr_.in ()); - } - catch (...) - { - } - return 0; -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.h b/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.h deleted file mode 100644 index 44d96bc24c2..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderHandler_T.h +++ /dev/null @@ -1,63 +0,0 @@ -// $Id$ -/** - * @author Marcel Smit - * - * $Id$ - * - * Eventhandler on orb thread, handling the - * received data from DDS. - */ - -#ifndef DDS4CCM_DATAREADERHANDLER_T_H -#define DDS4CCM_DATAREADERHANDLER_T_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Event_Handler.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - class DataReaderListener_T; - - template - class DataReaderHandler_T : - public ACE_Event_Handler - { - public: - DataReaderHandler_T ( - typename CIAO::DDS4CCM::DataReaderListener_T* drl, - ::DDS::DataReader_ptr dr); - virtual ~DataReaderHandler_T (); - - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - typename CIAO::DDS4CCM::DataReaderListener_T* drl_; - ::DDS::DataReader_var dr_; - }; - - template - class DataReaderStateListener_T; - - template - class DataReaderStateHandler_T : - public ACE_Event_Handler - { - public: - DataReaderStateHandler_T ( - typename CIAO::DDS4CCM::DataReaderStateListener_T* drl, - ::DDS::DataReader_ptr dr); - virtual ~DataReaderStateHandler_T (); - - virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); - private: - typename CIAO::DDS4CCM::DataReaderStateListener_T* drl_; - ::DDS::DataReader_var dr_; - }; - } -} - -#include "dds4ccm/impl/dds/DataReaderHandler_T.cpp" - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp deleted file mode 100644 index 4cf709b1222..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.cpp +++ /dev/null @@ -1,159 +0,0 @@ -// $Id$ - -#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 "dds4ccm/idl/dds4ccm_BaseC.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_DataReaderListener_i::CCM_DDS_DataReaderListener_i (::DDS::DataReaderListener_ptr p) - : impl_ (::DDS::DataReaderListener::_duplicate (p)) - { - } - - CCM_DDS_DataReaderListener_i::~CCM_DDS_DataReaderListener_i (void) - { - } - - void - CCM_DDS_DataReaderListener_i::on_requested_deadline_missed ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_requested_deadline_missed"); - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::RequestedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus); -#else - this->impl_->on_requested_deadline_missed (dds_reader.in (), status); -#endif - } - - void - CCM_DDS_DataReaderListener_i::on_requested_incompatible_qos ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_requested_incompatible_qos"); - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::RequestedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus); -#else - this->impl_->on_requested_incompatible_qos (dds_reader.in (), status); -#endif - } - - void - CCM_DDS_DataReaderListener_i::on_sample_rejected ( - ::DDSDataReader* the_reader, - const ::DDS_SampleRejectedStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_sample_rejected"); - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::SampleRejectedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus); -#else - this->impl_->on_sample_rejected (dds_reader.in (), status); -#endif - } - - void - CCM_DDS_DataReaderListener_i::on_liveliness_changed ( - ::DDSDataReader* the_reader, - const ::DDS_LivelinessChangedStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_liveliness_changed"); - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::LivelinessChangedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus); -#else - this->impl_->on_liveliness_changed (dds_reader.in (), status); -#endif - } - - void - CCM_DDS_DataReaderListener_i::on_data_available(::DDSDataReader *the_reader) - { - DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_data_available"); - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - this->impl_->on_data_available (dds_reader.in ()); -#else - this->impl_->on_data_available (dds_reader.in ()); -#endif - } - - void - CCM_DDS_DataReaderListener_i::on_subscription_matched ( - ::DDSDataReader* the_reader, - const ::DDS_SubscriptionMatchedStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_subscription_matched"); - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::SubscriptionMatchedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus); -#else - this->impl_->on_subscription_matched (dds_reader.in (), status); -#endif - } - - void - CCM_DDS_DataReaderListener_i::on_sample_lost ( - ::DDSDataReader* the_reader, - const ::DDS_SampleLostStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_sample_lost"); - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::SampleLostStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_sample_lost (dds_reader.in (), ddsstatus); -#else - this->impl_->on_sample_lost (dds_reader.in (), status); -#endif - } - - ::DDS::DataReaderListener_ptr - CCM_DDS_DataReaderListener_i::get_datareaderlistener (void) - { - return ::DDS::DataReaderListener::_duplicate (this->impl_.in ()); - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.h b/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.h deleted file mode 100644 index a65d2e37931..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener.h +++ /dev/null @@ -1,73 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DATAREADERLISTENER_H -#define DDS4CCM_DATAREADERLISTENER_H - -#include "tao/LocalObject.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm_ndds_impl_export.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -# include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DataReaderListener DDSDataReaderListener; -typedef ::DDS::DataReader DDSDataReader; -typedef ::DDS::RequestedDeadlineMissedStatus DDS_RequestedDeadlineMissedStatus; -typedef ::DDS::LivelinessChangedStatus DDS_LivelinessChangedStatus; -typedef ::DDS::RequestedIncompatibleQosStatus DDS_RequestedIncompatibleQosStatus; -typedef ::DDS::SampleRejectedStatus DDS_SampleRejectedStatus; -typedef ::DDS::SubscriptionMatchedStatus DDS_SubscriptionMatchedStatus; -typedef ::DDS::SampleLostStatus DDS_SampleLostStatus; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataReaderListener_i : - public virtual ::DDSDataReaderListener - { - public: - /// Constructor - CCM_DDS_DataReaderListener_i (::DDS::DataReaderListener_ptr p); - - /// Destructor - virtual ~CCM_DDS_DataReaderListener_i (void); - - virtual void on_requested_deadline_missed(::DDSDataReader* reader, - const ::DDS_RequestedDeadlineMissedStatus& status); - - virtual void on_liveliness_changed(::DDSDataReader* reader, - const ::DDS_LivelinessChangedStatus& status); - - virtual void on_requested_incompatible_qos(::DDSDataReader* reader, - const ::DDS_RequestedIncompatibleQosStatus& status); - - virtual void on_sample_rejected(::DDSDataReader* reader, - const ::DDS_SampleRejectedStatus& status); - - virtual void on_data_available(::DDSDataReader* reader); - - virtual void on_sample_lost(::DDSDataReader* reader, - const ::DDS_SampleLostStatus& status); - - virtual void on_subscription_matched(::DDSDataReader* reader, - const ::DDS_SubscriptionMatchedStatus& status); - - ::DDS::DataReaderListener_ptr get_datareaderlistener (void); - private: - ::DDS::DataReaderListener_var impl_; - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp deleted file mode 100644 index 63f20392a6e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp +++ /dev/null @@ -1,175 +0,0 @@ -// $Id$ -#include "dds4ccm/impl/dds/Utils.h" - -#include "dds4ccm/impl/dds/DataReader.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "ace/Reactor.h" - -template -CIAO::DDS4CCM::DataReaderListener_T::DataReaderListener_T ( - typename CCM_TYPE::listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ::CCM_DDS::DataListenerControl_ptr control, - ACE_Reactor* reactor) - : PortStatusListener_T (port_status_listener, reactor) , - listener_ (CCM_TYPE::listener_type::_duplicate (listener)), - control_ (::CCM_DDS::DataListenerControl::_duplicate (control)) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::DataReaderListener_T"); -} - -template -CIAO::DDS4CCM::DataReaderListener_T::~DataReaderListener_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::~DataReaderListener_T"); -} - -template -void -CIAO::DDS4CCM::DataReaderListener_T::on_data_available(::DDS::DataReader_ptr rdr) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::on_data_available"); - - if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) - { - return; - } - else - { - if (this->reactor_) - { - drh* rh = 0; - ACE_NEW (rh, drh (this, rdr)); - - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderListener_T::failed to use reactor.\n"))); - } - } - else - { - this->on_data_available_i (rdr); - } - } -} - -template -void -CIAO::DDS4CCM::DataReaderListener_T::on_data_available_i (::DDS::DataReader_ptr rdr) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::on_data_available_i"); - - if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) - { - return; - } - - ::CIAO::DDS4CCM::CCM_DDS_DataReader_i* rd = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i*>(rdr); - if (!rd) - { - /* In this specific case, this will never fail */ - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderListener_T::dynamic_cast failed.\n"))); - return; - } - - typename DDS_TYPE::data_reader * reader = - dynamic_cast< typename DDS_TYPE::data_reader * > ((rd->get_impl ())); - - if (!reader) - { - /* In this specific case, this will never fail */ - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderListener_T::narrow failed.\n"))); - return; - } - - typename DDS_TYPE::dds_seq_type data; - DDS_SampleInfoSeq sample_info; - ::DDS::ReturnCode_t const result = reader->take ( - data, - sample_info, - DDS_LENGTH_UNLIMITED, - DDS_NOT_READ_SAMPLE_STATE, - DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, - DDS_ANY_INSTANCE_STATE); - if (result == DDS_RETCODE_NO_DATA) - { - return; - } - else if (result != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %C.\n"), translate_retcode (result))); - return; - } - - if (this->control_->mode () == ::CCM_DDS::ONE_BY_ONE) - { - for (::DDS_Long i = 0; i < data.length (); ++i) - { - if (sample_info[i].valid_data) - { - ::CCM_DDS::ReadInfo info; - info <<= sample_info[i]; - listener_->on_one_data (data[i], info); - } - } - } - else - { - CORBA::ULong nr_of_samples = 0; - for (::DDS_Long i = 0 ; i < sample_info.length(); i++) - { - if (sample_info[i].valid_data) - { - ++nr_of_samples; - } - } - - 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)); - - infoseq->length (nr_of_samples); - inst_seq->length (nr_of_samples); - - // Copy the valid samples - CORBA::ULong ix = 0; - for (::DDS_Long i = 0 ; i < sample_info.length(); i++) - { - if(sample_info[i].valid_data) - { - (*infoseq)[ix] <<= sample_info[i]; - (*inst_seq)[ix] = data[i]; - ++ix; - } - } - listener_->on_many_data (*inst_seq, *infoseq); - } - } - // Return the loan - reader->return_loan(data, sample_info); -} - -template -::DDS::StatusMask -CIAO::DDS4CCM::DataReaderListener_T::get_mask ( - typename CCM_TYPE::listener_type::_ptr_type listener) -{ - if (!CORBA::is_nil (listener) || CIAO_debug_level >= 10) - { - return ::DDS::DATA_AVAILABLE_STATUS | - ::DDS::REQUESTED_DEADLINE_MISSED_STATUS | - ::DDS::SAMPLE_LOST_STATUS; - } - else - { - return 0; - } -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.h b/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.h deleted file mode 100644 index 07f63e29529..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.h +++ /dev/null @@ -1,58 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DATAREADERLISTENER_T_H -#define DDS4CCM_DATAREADERLISTENER_T_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" - -#include "dds4ccm/impl/dds/PortStatusListener_T.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - namespace DDS4CCM - { - template - class DataReaderListener_T : - public PortStatusListener_T - { - public: - /// Constructor - DataReaderListener_T ( - typename CCM_TYPE::listener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ::CCM_DDS::DataListenerControl_ptr control, - ACE_Reactor* reactor); - - /// Destructor - virtual ~DataReaderListener_T (void); - - virtual void on_data_available( ::DDS::DataReader *rdr); - - static ::DDS::StatusMask get_mask ( - typename CCM_TYPE::listener_type::_ptr_type listener); - - void on_data_available_i ( ::DDS::DataReader *rdr); - - private: - typename CCM_TYPE::listener_type::_var_type listener_; - ::CCM_DDS::DataListenerControl_var control_; - - typedef ::CIAO::DDS4CCM::DataReaderHandler_T drh; - }; - } -} - -#include "dds4ccm/impl/dds/DataReaderListener_T.cpp" - -#endif /* DDS4CCM_DATAREADERLISTENER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp deleted file mode 100644 index d3e42fa1ca8..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp +++ /dev/null @@ -1,244 +0,0 @@ -// $Id$ -#include "dds4ccm/impl/dds/Utils.h" - -#include "dds4ccm/impl/dds/DataReader.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds/DataReaderHandler_T.h" -#include "tao/ORB_Core.h" - -#include - -template -CIAO::DDS4CCM::DataReaderStateListener_T::DataReaderStateListener_T ( - typename CCM_TYPE::statelistener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ::CCM_DDS::StateListenerControl_ptr control, - ACE_Reactor* reactor) - : PortStatusListener_T (port_status_listener, reactor) , - listener_ (CCM_TYPE::statelistener_type::_duplicate (listener)), - control_ (::CCM_DDS::StateListenerControl::_duplicate (control)) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::DataReaderStateListener_T"); -} - -// Implementation skeleton destructor -template -CIAO::DDS4CCM::DataReaderStateListener_T::~DataReaderStateListener_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::~DataReaderStateListener_T"); -} - -template -void -CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available(::DDS::DataReader_ptr rdr) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available"); - if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) - return; - else - { - if (this->reactor_) - { - drsh* rh = 0; - ACE_NEW (rh, drsh (this, rdr)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderStateHandler_T::failed to use reactor.\n"))); - } - } - else - { - this->on_data_available_i (rdr); - } - } -} - -template -void -CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available_i (::DDS::DataReader_ptr rdr) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available_i"); - - if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) - return; - - ::CIAO::DDS4CCM::CCM_DDS_DataReader_i* rd = - dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i*>(rdr); - if (!rd) - { - /* In this specific case, this will never fail */ - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderStateListener_T::dynamic_cast failed.\n"))); - return; - } - - typename DDS_TYPE::data_reader * reader = - dynamic_cast< typename DDS_TYPE::data_reader * > ((rd->get_impl ())); - - if (!reader) - { - /* In this specific case, this will never fail */ - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderStateListener_T::narrow failed.\n"))); - return; - } - - try - { - typename DDS_TYPE::dds_seq_type data; - DDS_SampleInfoSeq sample_info; - ::DDS_Long max_samples = 0; - - this->control_->mode () == ::CCM_DDS::ONE_BY_ONE - ? max_samples = DDS_LENGTH_UNLIMITED - : this->control_->max_delivered_data() == 0 - ? max_samples = DDS_LENGTH_UNLIMITED - : max_samples = this->control_->max_delivered_data (); - - ::DDS::ReturnCode_t const result = reader->take ( - data, - sample_info, - max_samples, - DDS_NOT_READ_SAMPLE_STATE, - DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, - DDS_ANY_INSTANCE_STATE); - if (result == DDS_RETCODE_NO_DATA) - return; - else if (result != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %d.\n"), result)); - } - if (this->control_->mode () == ::CCM_DDS::ONE_BY_ONE) - { - for (::DDS_Long i = 0; i < data.length (); ++i) - { - // sample data may not be valid anymore when - // deleted so don't check the valid_data flag - // here. - if (sample_info[i].instance_state == - ::DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE) - { - ::CCM_DDS::ReadInfo readinfo; - readinfo <<= sample_info[i]; - this->listener_->on_deletion (data[i], readinfo); - } - if (sample_info[i].valid_data) - { - if (sample_info[i].view_state == - ::DDS_NEW_VIEW_STATE) - { - ::CCM_DDS::ReadInfo readinfo; - readinfo <<= sample_info[i]; - this->listener_->on_creation (data[i], readinfo); - } - else - { - ::CCM_DDS::ReadInfo info; - info <<= sample_info[i]; - this->listener_->on_one_update (data[i], info); - } - } - } - } - else if (this->control_->mode () == ::CCM_DDS::MANY_BY_MANY) - { - typedef std::vector Updates; - Updates updates; - - CORBA::ULong nr_of_updates = 0; - - for (::DDS_Long i = 0 ; i < sample_info.length(); i++) - { - if ((sample_info[i].valid_data && - sample_info[i].view_state == ::DDS_NEW_VIEW_STATE) || - sample_info[i].instance_state == ::DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE) - { - // 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); - - infoseq->length (nr_of_updates); - inst_seq->length (nr_of_updates); - CORBA::ULong ix = 0; - for(Updates::iterator iter = updates.begin(); - iter != updates.end(); - ++iter) - { - (*infoseq)[ix] <<= sample_info[*iter]; - (*inst_seq)[ix] = data[*iter]; - ++ix; - } - 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) - { - ::CCM_DDS::ReadInfo readinfo; - readinfo <<= sample_info[i]; - this->listener_->on_creation (data[i], readinfo); - } - else if (sample_info[i].instance_state == ::DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE) - { - ::CCM_DDS::ReadInfo readinfo; - readinfo <<= sample_info[i]; - this->listener_->on_deletion (data[i], readinfo); - } - //clean up - updates.clear (); - nr_of_updates = 0; - } - else if (sample_info[i].valid_data) - { - ++nr_of_updates; - updates.push_back (i); - } - } - //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); - - infoseq->length (nr_of_updates); - inst_seq->length (nr_of_updates); - CORBA::ULong ix = 0; - for(Updates::iterator iter = updates.begin(); - iter != updates.end(); - ++iter) - { - (*infoseq)[ix] <<= sample_info[*iter]; - (*inst_seq)[ix] = data[*iter]; - ++ix; - } - this->listener_->on_many_updates (*inst_seq, *infoseq); - } - // Return the loan - reader->return_loan(data, sample_info); - } - } - catch (...) - { - } -} - -template -::DDS::StatusMask -CIAO::DDS4CCM::DataReaderStateListener_T::get_mask ( - typename CCM_TYPE::statelistener_type::_ptr_type listener) -{ - if (!CORBA::is_nil (listener) || CIAO_debug_level >= 10) - { - return ::DDS::DATA_AVAILABLE_STATUS | - ::DDS::REQUESTED_DEADLINE_MISSED_STATUS | - ::DDS::SAMPLE_LOST_STATUS; - } - else - { - return 0; - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.h b/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.h deleted file mode 100644 index 18e1cf4bb3d..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.h +++ /dev/null @@ -1,53 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DATAREADERSTATELISTENER_T_H -#define DDS4CCM_DATAREADERSTATELISTENER_T_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - class DataReaderStateListener_T : - public PortStatusListener_T - { - public: - /// Constructor - DataReaderStateListener_T ( - typename CCM_TYPE::statelistener_type::_ptr_type listener, - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ::CCM_DDS::StateListenerControl_ptr control, - ACE_Reactor* reactor); - - /// Destructor - virtual ~DataReaderStateListener_T (void); - - virtual void on_data_available (::DDS::DataReader_ptr rdr); - - static ::DDS::StatusMask get_mask ( - typename CCM_TYPE::statelistener_type::_ptr_type listener); - - void on_data_available_i (::DDS::DataReader_ptr rdr); - - private: - typename CCM_TYPE::statelistener_type::_var_type listener_; - ::CCM_DDS::StateListenerControl_var control_; - - typedef ::CIAO::DDS4CCM::DataReaderStateHandler_T drsh; - }; - } -} - -#include "dds4ccm/impl/dds/DataReaderStateListener_T.cpp" - -#endif /* DDS4CCM_DATAREADERSTATELISTENER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp deleted file mode 100644 index 33c15bf1e37..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp +++ /dev/null @@ -1,307 +0,0 @@ -// $Id$ - -#include "DataWriter.h" -#include "StatusCondition.h" -#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 "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_DataWriter_i::CCM_DDS_DataWriter_i (DDSDataWriter * dw) - : impl_ (dw) - { - } - - CCM_DDS_DataWriter_i::~CCM_DDS_DataWriter_i (void) - { - } - - ::DDS::ReturnCode_t - CCM_DDS_DataWriter_i::set_qos (const ::DDS::DataWriterQos & qos) - { - 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); -#else - return this->impl ()->set_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataWriter_i::get_qos (::DDS::DataWriterQos & qos) - { - 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::ReturnCode_t retcode = - this->impl()->get_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; -#else - return this->impl ()->get_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataWriter_i::set_listener (::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_DataWriterListener_i* ccm_dds_impl_list = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_impl_list, - CCM_DDS_DataWriterListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - return this->impl ()->set_listener (ccm_dds_impl_list, mask); -#else - return this->impl ()->set_listener (a_listener, mask); -#endif - } - - ::DDS::DataWriterListener_ptr - CCM_DDS_DataWriter_i::get_listener (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDataWriterListener *wr = this->impl ()->get_listener (); - CCM_DDS_DataWriterListener_i *list_proxy = dynamic_cast (wr); - if (!list_proxy) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DataWriter_i::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::DataWriterListener::_nil (); - } - return list_proxy->get_datawriterlistener (); -#else - return this->impl ()->get_listener (); -#endif - } - - ::DDS::Topic_ptr - CCM_DDS_DataWriter_i::get_topic (void) - { - ::DDS::Topic_var retval = ::DDS::Topic::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSTopic* t = this->impl ()->get_topic (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_Topic_i (t), - CORBA::NO_MEMORY ()); -#else - ::DDS::Topic_var t = this->impl ()->get_topic (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_Topic_i (t.in ()), - CORBA::NO_MEMORY ()); -#endif - return retval._retn (); - } - - ::DDS::Publisher_ptr - CCM_DDS_DataWriter_i::get_publisher (void) - { - ::DDS::Publisher_var retval = ::DDS::Publisher::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSPublisher* p = this->impl ()->get_publisher (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_Publisher_i (p), - CORBA::NO_MEMORY ()); -#else - ::DDS::Publisher_var p = this->impl ()->get_publisher (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_Publisher_i (p.in ()), - CORBA::NO_MEMORY ()); -#endif - return retval._retn (); - } - - ::DDS::ReturnCode_t - CCM_DDS_DataWriter_i::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_Duration_t rtiduration; - rtiduration <<= max_wait; - return this->impl ()->wait_for_acknowledgments (rtiduration); -#else - return this->impl ()->wait_for_acknowledgments (max_wait); -#endif - } - - ::DDS::ReturnCode_t - 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; - return retval; -#else - return this->impl ()->get_liveliness_lost_status (status); -#endif - } - - ::DDS::ReturnCode_t - 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; - return retval; -#else - return this->impl ()->get_offered_deadline_missed_status (status); -#endif - } - - ::DDS::ReturnCode_t - 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; - return retval; -#else - return this->impl ()->get_offered_incompatible_qos_status (status); -#endif - } - - ::DDS::ReturnCode_t - 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; - return retval; -#else - return this->impl ()->get_publication_matched_status (status); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataWriter_i::assert_liveliness (void) - { - return this->impl ()->assert_liveliness (); - } - - ::DDS::ReturnCode_t - CCM_DDS_DataWriter_i::get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandleSeq rtiseq; - rtiseq <<= subscription_handles; - ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_subscriptions (rtiseq); - subscription_handles <<= rtiseq; - return retval; -#else - return this->impl ()->get_matched_subscriptions (subscription_handles); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataWriter_i::get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data, - 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; -#else - return this->impl ()->get_matched_subscription_data (subscription_data, subscription_handle); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DataWriter_i::enable (void) - { - return this->impl ()->enable (); - } - - ::DDS::StatusCondition_ptr - CCM_DDS_DataWriter_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSStatusCondition* sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); -#else - ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc.in ()), - CORBA::NO_MEMORY ()); -#endif - return retval._retn (); - } - - ::DDS::StatusMask - CCM_DDS_DataWriter_i::get_status_changes (void) - { - return this->impl ()->get_status_changes (); - } - - DDS_INSTANCE_HANDLE_T_RETN - CCM_DDS_DataWriter_i::get_instance_handle (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; -#else - return this->impl ()->get_instance_handle (); -#endif - } - - DDSDataWriter * - CCM_DDS_DataWriter_i::get_impl (void) - { - return this->impl_; - } - - void - CCM_DDS_DataWriter_i::set_impl (DDSDataWriter * dw) - { - this->impl_ = dw; - } - - DDSDataWriter * - CCM_DDS_DataWriter_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/dds/DataWriter.h deleted file mode 100644 index 5b664dce78a..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataWriter.h +++ /dev/null @@ -1,112 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DATAWRITER_H -#define DDS4CCM_DATAWRITER_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" - -#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 "tao/LocalObject.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -#include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DataWriter DDSDataWriter; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataWriter_i - : public virtual ::DDS::CCM_DataWriter, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - CCM_DDS_DataWriter_i (DDSDataWriter * dw); - - /// Destructor - virtual ~CCM_DDS_DataWriter_i (void); - - virtual - ::DDS::ReturnCode_t set_qos (const ::DDS::DataWriterQos & qos); - - virtual - ::DDS::ReturnCode_t get_qos (::DDS::DataWriterQos & qos); - - virtual - ::DDS::ReturnCode_t set_listener (::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual - ::DDS::DataWriterListener_ptr get_listener (void); - - virtual - ::DDS::Topic_ptr get_topic (void); - - virtual - ::DDS::Publisher_ptr get_publisher (void); - - virtual - ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait); - - virtual - ::DDS::ReturnCode_t get_liveliness_lost_status (::DDS::LivelinessLostStatus & status); - - virtual - ::DDS::ReturnCode_t get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status); - - virtual - ::DDS::ReturnCode_t get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status); - - virtual - ::DDS::ReturnCode_t get_publication_matched_status (::DDS::PublicationMatchedStatus & status); - - virtual - ::DDS::ReturnCode_t assert_liveliness (void); - - virtual - ::DDS::ReturnCode_t get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles); - - virtual - ::DDS::ReturnCode_t get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data, - DDS_INSTANCE_HANDLE_T_IN subscription_handle); - - virtual - ::DDS::ReturnCode_t enable (void); - - virtual - ::DDS::StatusCondition_ptr get_statuscondition (void); - - virtual - ::DDS::StatusMask get_status_changes (void); - - virtual - DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void); - - DDSDataWriter * get_impl (void); - - void set_impl (DDSDataWriter * dw); - - private: - DDSDataWriter * impl_; - - DDSDataWriter * impl (void); - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.cpp deleted file mode 100644 index 71ee37d6430..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.cpp +++ /dev/null @@ -1,106 +0,0 @@ -// $Id$ - -#include "DataWriterListener.h" -#include "DataWriter.h" -#include "ndds/PublicationMatchedStatus.h" -#include "ndds/LivelinessLostStatus.h" -#include "ndds/OfferedIncompatibleQosStatus.h" -#include "ndds/OfferedDeadlineMissedStatus.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_DataWriterListener_i::CCM_DDS_DataWriterListener_i (::DDS::DataWriterListener_ptr s) - : impl_ (::DDS::DataWriterListener::_duplicate (s)) - { - } - - CCM_DDS_DataWriterListener_i::~CCM_DDS_DataWriterListener_i (void) - { - } - - void - CCM_DDS_DataWriterListener_i::on_offered_deadline_missed ( - ::DDSDataWriter *the_writer, - const ::DDS_OfferedDeadlineMissedStatus & status) - { - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::OfferedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - ACE_NEW (dds_writer, - CCM_DDS_DataWriter_i (the_writer)); - this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus); -#else - ACE_NEW (dds_writer, - CCM_DDS_DataWriter_i (the_writer)); - this->impl_->on_offered_deadline_missed (dds_writer.in (), status); -#endif - } - - void - CCM_DDS_DataWriterListener_i::on_offered_incompatible_qos ( - ::DDSDataWriter *the_writer, - const ::DDS_OfferedIncompatibleQosStatus & status) - { - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::OfferedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - ACE_NEW (dds_writer, - CCM_DDS_DataWriter_i (the_writer)); - this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus); -#else - ACE_NEW (dds_writer, - CCM_DDS_DataWriter_i (the_writer)); - this->impl_->on_offered_incompatible_qos (dds_writer.in (), status); -#endif - } - - void - CCM_DDS_DataWriterListener_i::on_liveliness_lost ( - ::DDSDataWriter *the_writer, - const ::DDS_LivelinessLostStatus & status) - { - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::LivelinessLostStatus ddsstatus; - ddsstatus <<= status; - ACE_NEW (dds_writer, - CCM_DDS_DataWriter_i (the_writer)); - this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus); -#else - ACE_NEW (dds_writer, - CCM_DDS_DataWriter_i (the_writer)); - this->impl_->on_liveliness_lost (dds_writer.in (), status); -#endif - } - - void - CCM_DDS_DataWriterListener_i::on_publication_matched ( - ::DDSDataWriter *the_writer, - const ::DDS_PublicationMatchedStatus & status) - { - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::PublicationMatchedStatus ddsstatus; - ddsstatus <<= status; - ACE_NEW (dds_writer, - CCM_DDS_DataWriter_i (the_writer)); - this->impl_->on_publication_matched (dds_writer.in (), ddsstatus); -#else - ACE_NEW (dds_writer, - CCM_DDS_DataWriter_i (the_writer)); - this->impl_->on_publication_matched (dds_writer.in (), status); -#endif - } - - ::DDS::DataWriterListener_ptr - CCM_DDS_DataWriterListener_i::get_datawriterlistener (void) - { - return ::DDS::DataWriterListener::_duplicate (this->impl_.in ()); - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.h b/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.h deleted file mode 100644 index 1776bf65f81..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener.h +++ /dev/null @@ -1,70 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DATAWRITERLISTENER_H -#define DDS4CCM_DATAWRITERLISTENER_H - -#include "tao/LocalObject.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -# include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DataWriterListener DDSDataWriterListener; -typedef ::DDS::DataWriter DDSDataWriter; -typedef ::DDS::OfferedDeadlineMissedStatus DDS_OfferedDeadlineMissedStatus; -typedef ::DDS::OfferedIncompatibleQosStatus DDS_OfferedIncompatibleQosStatus; -typedef ::DDS::LivelinessLostStatus DDS_LivelinessLostStatus; -typedef ::DDS::PublicationMatchedStatus DDS_PublicationMatchedStatus; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataWriterListener_i : - public virtual ::DDSDataWriterListener - { - public: - /// Constructor - CCM_DDS_DataWriterListener_i (::DDS::DataWriterListener_ptr p); - - /// Destructor - virtual ~CCM_DDS_DataWriterListener_i (void); - - virtual void on_offered_deadline_missed ( - ::DDSDataWriter *the_writer, - const ::DDS_OfferedDeadlineMissedStatus & status); - - virtual void on_offered_incompatible_qos ( - ::DDSDataWriter *the_writer, - const ::DDS_OfferedIncompatibleQosStatus & status); - - virtual void on_liveliness_lost ( - ::DDSDataWriter *the_writer, - const ::DDS_LivelinessLostStatus & status); - - virtual void on_publication_matched ( - ::DDSDataWriter *the_writer, - const ::DDS_PublicationMatchedStatus & status); - - ::DDS::DataWriterListener_ptr get_datawriterlistener (void); - private: - ::DDS::DataWriterListener_var impl_; - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp deleted file mode 100644 index 5155e2402ca..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// $Id$ -#include "dds4ccm/impl/dds/Utils.h" - -#include "dds4ccm/impl/dds/DataWriter.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -template -CIAO::DDS4CCM::DataWriterListener_T::DataWriterListener_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::DataWriterListener_T"); -} - -template -CIAO::DDS4CCM::DataWriterListener_T::~DataWriterListener_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::~DataWriterListener_T"); -} - -template -void -CIAO::DDS4CCM::DataWriterListener_T::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedDeadlineMissedStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DataWriterListener_T::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedIncompatibleQosStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DataWriterListener_T::on_liveliness_lost ( - ::DDS::DataWriter_ptr , - const ::DDS::LivelinessLostStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DataWriterListener_T::on_publication_matched ( - ::DDS::DataWriter_ptr , - const ::DDS::PublicationMatchedStatus & ) -{ -} - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -template -void -CIAO::DDS4CCM::DataWriterListener_T::on_reliable_reader_activity_changed ( - ::DDS::DataWriter_ptr , - const ::DDS::ReliableReaderActivityChangedStatus & ) -{ -} -#endif - -template -::DDS::StatusMask -CIAO::DDS4CCM::DataWriterListener_T::get_mask (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::get_mask"); - return 0; -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.h b/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.h deleted file mode 100644 index f8801ee0c90..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DataWriterListener_T.h +++ /dev/null @@ -1,65 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_DATAWRITERLISTENER_T -#define DDS_DATAWRITERLISTENER_T - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - class DataWriterListener_T : - public ::DDS::DataWriterListener, - private ACE_Copy_Disabled - { - public: - /// Constructor - DataWriterListener_T (void); - - /// Destructor - virtual ~DataWriterListener_T (void); - - virtual void - on_offered_deadline_missed ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedDeadlineMissedStatus & ); - - virtual void - on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedIncompatibleQosStatus & ); - - virtual void - on_liveliness_lost ( - ::DDS::DataWriter_ptr , - const ::DDS::LivelinessLostStatus & ); - - virtual void - on_publication_matched ( - ::DDS::DataWriter_ptr , - const ::DDS::PublicationMatchedStatus & ); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual void - on_reliable_reader_activity_changed ( - ::DDS::DataWriter_ptr , - const ::DDS::ReliableReaderActivityChangedStatus & ); -#endif - - static ::DDS::StatusMask get_mask (void); - }; - } -} - -#include "dds4ccm/impl/dds/DataWriterListener_T.cpp" - -#endif /* DDS_DATAWRITERLISTENER_T */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp deleted file mode 100644 index c70676db7d9..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp +++ /dev/null @@ -1,1014 +0,0 @@ -// $Id$ - -#include "DomainParticipant.h" -#include "Subscriber.h" -#include "Publisher.h" -#include "ContentFilteredTopic.h" -#include "Topic.h" -#include "TopicDescription.h" -#include "Utils.h" -#include "StatusCondition.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 "dds4ccm/idl/dds4ccm_BaseC.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_DomainParticipant_i::CCM_DDS_DomainParticipant_i ( - DDSDomainParticipant * dp) : impl_ (dp) - { - DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_i::CCM_DDS_DomainParticipant_i"); - } - - CCM_DDS_DomainParticipant_i::~CCM_DDS_DomainParticipant_i (void) - { - DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_i::~CCM_DDS_DomainParticipant_i"); - } - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::Publisher_ptr - CCM_DDS_DomainParticipant_i::create_publisher_with_profile ( - const char* library_name, - const char *profile_name, - ::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher_with_profile"); - - 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; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_pl, - CCM_DDS_PublisherListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - DDSPublisher * ccm_dds_pub = - this->impl ()->create_publisher_with_profile (library_name, - profile_name, - ccm_dds_pl, - mask); - - if (!ccm_dds_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; - 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), - 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 (); - return retval._retn (); - } -#endif - - ::DDS::Publisher_ptr - CCM_DDS_DomainParticipant_i::create_publisher ( - const ::DDS::PublisherQos & qos, - ::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher"); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (qos); - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - " - "Creating Publisher\n")); - - DDS_PublisherQos ccm_dds_qos = DDS_PUBLISHER_QOS_DEFAULT; - - CCM_DDS_PublisherListener_i *ccm_dds_pl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_pl, - CCM_DDS_PublisherListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - - DDSPublisher * ccm_dds_pub = - this->impl ()->create_publisher (ccm_dds_qos, - ccm_dds_pl, - mask); - - if (!ccm_dds_pub) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - " - "Error: Unable to create Publisher\n")); - 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), - CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - " - "Successfully created a DDSPublisher\n")); - - ccm_dds_pub->enable (); - return retval._retn (); -#else - return this->impl ()->create_publisher (qos, a_listener, mask); -#endif - } - - ::DDS::ReturnCode_t - 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); - - if (!ccm_dds_pub) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - " - "Unable to cast provided object refence to servant pointer.\n")); - return ::DDS::RETCODE_ERROR; - } - - 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 ()); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - " - "Error: RTI delete_publisher returned non-ok error code %C\n", - translate_retcode (retval))); - } - else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - " - "Provided publisher successfully deleted\n")); - - return retval; -#else - return this->impl ()->delete_publisher (p); -#endif - } - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::Subscriber_ptr - CCM_DDS_DomainParticipant_i::create_subscriber_with_profile ( - const char* library_name, - const char *profile_name, - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber_with_profile"); - - 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; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_sl, - CCM_DDS_SubscriberListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - DDSSubscriber * ccm_dds_sub = - this->impl ()->create_subscriber_with_profile ( - library_name, - profile_name, - ccm_dds_sl, - mask); - - if (!ccm_dds_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; - 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), - 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 (); - return retval._retn (); - } -#endif - - ::DDS::Subscriber_ptr - CCM_DDS_DomainParticipant_i::create_subscriber (const ::DDS::SubscriberQos & qos, - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber"); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (qos); - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - " - "Creating Subscriber\n")); - - CCM_DDS_SubscriberListener_i *ccm_dds_sl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_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, - mask); - - if (!ccm_dds_sub) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - " - "Error: Unable to create Subscriber\n")); - delete ccm_dds_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), - CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - " - "Successfully created a DDSSubscriber\n")); - - ccm_dds_sub->enable (); - return retval._retn (); -#else - return this->impl ()->create_subscriber (qos, a_listener, mask); -#endif - } - - ::DDS::ReturnCode_t - 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); - - if (!ccm_dds_sub) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - " - "Unable to cast provided object refence to servant pointer.\n")); - return ::DDS::RETCODE_ERROR; - } - - 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 ()); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - " - "Error: RTI delete_subscriber returned non-ok error code %C\n", - translate_retcode (retval))); - } - else - { - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - " - "Provided subscriber successfully deleted\n")); - } - - return retval; -#else - return this->impl ()->delete_subscriber (s); -#endif - } - - ::DDS::Subscriber_ptr - CCM_DDS_DomainParticipant_i::get_builtin_subscriber (void) - { - ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSSubscriber* sub = this->impl ()->get_builtin_subscriber (); - if (sub) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_Subscriber_i (sub), - CORBA::NO_MEMORY ()); - } -#else - ::DDS::Subscriber_var sub = this->impl ()->get_builtin_subscriber (); - if (!CORBA::is_nil (sub.in ())) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_Subscriber_i (sub.in ()), - CORBA::NO_MEMORY ()); - } -#endif - return retval._retn (); - } - - ::DDS::Topic_ptr - CCM_DDS_DomainParticipant_i::create_topic (const char * impl_name, - const char * type_name, - const ::DDS::TopicQos & qos, - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic"); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (qos); - - if (impl_name == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " - "Error: provided nil topic name\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, - 0); - } - - if (type_name == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " - "Error: provided nil type name\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, - 0); - } - - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic - " - "Attempting to create topic with name %C and type %C\n", - impl_name, type_name)); - - CCM_DDS_TopicListener_i *ccm_dds_tl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_tl, - CCM_DDS_TopicListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - - DDS_TopicQos ccm_dds_qos = DDS_TOPIC_QOS_DEFAULT; - - DDSTopic *ccm_dds_topic = this->impl ()->create_topic (impl_name, - type_name, - ccm_dds_qos, - ccm_dds_tl, - mask); - - if (ccm_dds_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; - 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), - CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic - " - "Successfully created topic with name %C and type %C\n", - impl_name, type_name)); - - return retval._retn (); -#else - return this->impl ()->create_topic (impl_name, - type_name, - qos, - a_listener, - mask); -#endif - } - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::Topic_ptr - CCM_DDS_DomainParticipant_i::create_topic_with_profile ( - const char *impl_name, - const char *type_name, - const char *library_name, - const char *profile_name, - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic_with_profile"); - - if (impl_name == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " - "Error: provided nil topic name\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - - if (type_name == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " - "Error: provided nil type name\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " - "Attempting to create topic with name %C and type %C\n", - impl_name, type_name)); - - ::DDS::Duration_t dur = { 0, 1000000 }; - ::DDS::Topic_var tp = this->find_topic (impl_name, dur); - if (CORBA::is_nil (tp)) - { - CCM_DDS_TopicListener_i *ccm_dds_tl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_tl, - CCM_DDS_TopicListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - DDSTopic *ccm_dds_topic = this->impl ()->create_topic_with_profile (impl_name, - type_name, - library_name, - profile_name, - ccm_dds_tl, - mask); - - if (ccm_dds_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; - 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), - CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " - "Successfully created topic with name %C and type %C\n", - impl_name, type_name)); - - return retval._retn (); - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " - "Re-using topic with name %C and type %C.\n", - impl_name, type_name)); - return ::DDS::Topic::_duplicate (tp.in ()); - } - } -#endif - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::delete_topic (::DDS::Topic_ptr a_topic) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_topic"); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_Topic_i *top = dynamic_cast< CCM_DDS_Topic_i *> (a_topic); - - if (top == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - " - "Unable to cast provided object reference to servant.\n")); - return ::DDS::RETCODE_BAD_PARAMETER; - } - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - " - "Successfully casted provided object reference to servant.\n")); - - DDS_ReturnCode_t const retval = this->impl ()->delete_topic (top->get_impl ()); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - " - "Error: RTI delete_topic returned non-ok error code %C\n", - translate_retcode (retval))); - } - else - { - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - " - "Provided topic successfully deleted\n")); - } - - return retval; -#else - return this->impl ()->delete_topic (a_topic); -#endif - } - - ::DDS::Topic_ptr - CCM_DDS_DomainParticipant_i::find_topic (const char * impl_name, - const ::DDS::Duration_t & timeout) - { - ::DDS::Topic_var retval = ::DDS::Topic::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_Duration_t ddstimeout; - ddstimeout <<= timeout; - ::DDSTopic* topic = this->impl ()->find_topic (impl_name, ddstimeout); - if (topic) - { - ACE_NEW_RETURN (retval, - CCM_DDS_Topic_i (topic), - ::DDS::Topic::_nil ()); - } -#else - ::DDS::Topic_var topic = this->impl ()->find_topic (impl_name, timeout); - if (!CORBA::is_nil (topic.in ()) - { - ACE_NEW_RETURN (retval, - CCM_DDS_Topic_i (topic.in ()), - ::DDS::Topic::_nil ()); - } -#endif - return retval._retn (); - } - - ::DDS::TopicDescription_ptr - CCM_DDS_DomainParticipant_i::lookup_topicdescription (const char * name) - { - ::DDS::TopicDescription_var retval = ::DDS::TopicDescription::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDSTopicDescription* topic = this->impl ()->lookup_topicdescription (name); - if (topic) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_TopicDescription_i (topic), - CORBA::NO_MEMORY ()); - } -#else - ::DDSTopicDescription_var topic = this->impl ()->lookup_topicdescription (name); - if (!CORBA::is_ni (topic.in ())) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_TopicDescription_i (topic.in ()), - CORBA::NO_MEMORY ()); - } -#endif - return retval._retn (); - } - - ::DDS::ContentFilteredTopic_ptr - CCM_DDS_DomainParticipant_i::create_contentfilteredtopic (const char * name, - ::DDS::Topic_ptr related_topic, - const char * filter_expression, - const ::DDS::StringSeq & expression_parameters) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_contentfilteredtopic"); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_Topic_i *top = dynamic_cast< CCM_DDS_Topic_i *> (related_topic); - if (!top) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_contentfilteredtopic - " - "Unable to cast provided topic.\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - - const char** parameterlist = 0; - ACE_NEW_THROW_EX (parameterlist, - const char*[expression_parameters.length ()], - CORBA::NO_MEMORY ()); - - for (CORBA::ULong i = 0; i < expression_parameters.length (); ++i) - { - parameterlist[i] = expression_parameters[i].in (); - } - DDS_StringSeq parameters (expression_parameters.length ()); - parameters.from_array (parameterlist, expression_parameters.length ()); - - DDSContentFilteredTopic * ccm_dds_cft = this->impl ()->create_contentfilteredtopic ( - name, - top->get_impl (), - filter_expression, - parameters); - delete [] parameterlist; - if (!ccm_dds_cft) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_contentfilteredtopic - " - "RTI DDS returned a nil ContentFilteredTopic.\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - - ::DDS::ContentFilteredTopic_var retval = ::DDS::ContentFilteredTopic::_nil (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_ContentFilteredTopic_i (ccm_dds_cft), - CORBA::NO_MEMORY ()); - - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_contentfilteredtopic - " - "Successfully created topic with name <%C> and filter expression <%C>\n", - name, filter_expression)); - - return retval._retn (); -#else - return this->impl ()->create_contentfilteredtopic ( - name, - related_topic, - filter_expression, - expression_parameters); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::delete_contentfilteredtopic (::DDS::ContentFilteredTopic_ptr /*a_contentfilteredtopic*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_contentfilteredtopic"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::MultiTopic_ptr - CCM_DDS_DomainParticipant_i::create_multitopic (const char * /*name*/, - const char * /*type_name*/, - const char * /*subscription_expression*/, - const ::DDS::StringSeq & /*expression_parameters*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_multitopic"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::delete_multitopic (::DDS::MultiTopic_ptr /*a_multitopic*/) - { - //this->impl ()->delete_multitopic ( - DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_multitopic"); - throw CORBA::NO_IMPLEMENT (); - - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::delete_contained_entities (void) - { - return this->impl ()->delete_contained_entities (); - - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::set_qos (const ::DDS::DomainParticipantQos & qos) - { - 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); -#else - return this->impl()->set_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::get_qos (::DDS::DomainParticipantQos & qos) - { - 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; - return retcode; -#else - return this->impl()->get_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::set_listener (::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_DomainPublisherListener_i* ccm_dds_impl_list = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_impl_list, - CCM_DDS_DomainPublisherListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - return this->impl_->set_listener (ccm_dds_impl_list, mask); -#else - return this->impl_->set_listener (a_listener, mask); -#endif - } - - ::DDS::DomainParticipantListener_ptr - CCM_DDS_DomainParticipant_i::get_listener (void) - { - 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_dp_list); - if (!list_proxy) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DomainParticipant_i::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::DomainParticipantListener::_nil (); - } - return list_proxy->get_domainparticipantlistener (); -#else - return this->impl ()->get_listener (); -#endif - } - - ::DDS::ReturnCode_t - 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); -#else - return this->impl ()->ignore_participant (handle); -#endif - } - - ::DDS::ReturnCode_t - 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); -#else - return this->impl ()->ignore_topic (handle); -#endif - } - - ::DDS::ReturnCode_t - 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); -#else - return this->impl ()->ignore_publication (handle); -#endif - } - - ::DDS::ReturnCode_t - 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); -#else - return this->impl ()->ignore_subscription (handle); -#endif - } - - ::DDS::DomainId_t - CCM_DDS_DomainParticipant_i::get_domain_id (void) - { - return this->impl ()->get_domain_id (); - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::assert_liveliness (void) - { - return this->impl ()->assert_liveliness (); - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::set_default_publisher_qos (const ::DDS::PublisherQos & qos) - { - 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); -#else - return this->impl()->set_default_publisher_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::get_default_publisher_qos (::DDS::PublisherQos & qos) - { - 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; - return retcode; -#else - return this->impl()->get_default_publisher_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::set_default_subscriber_qos (const ::DDS::SubscriberQos & qos) - { - 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); -#else - return this->impl()->set_default_subscriber_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::get_default_subscriber_qos (::DDS::SubscriberQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_subscriber_qos"); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_SubscriberQos ccm_dds_qos; - ::DDS::ReturnCode_t retcode = - this->impl()-> get_default_subscriber_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; -#else - return this->impl()->get_default_subscriber_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::set_default_topic_qos (const ::DDS::TopicQos & qos) - { - 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); -#else - return this->impl()->set_default_topic_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::get_default_topic_qos (::DDS::TopicQos & qos) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_topic_qos"); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_TopicQos ccm_dds_qos; - ::DDS::ReturnCode_t retcode = - this->impl()-> get_default_topic_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; -#else - return this->impl()->get_default_topic_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::get_discovered_participants (::DDS::InstanceHandleSeq & impl_handles) - { -#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; - return retval; -#else - return this->impl ()->get_discovered_participants (impl_handles); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::get_discovered_participant_data (::DDS::ParticipantBuiltinTopicData & /*impl_data*/, - DDS_INSTANCE_HANDLE_T_IN /*impl_handle*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_participant_data"); - throw CORBA::NO_IMPLEMENT (); - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::get_discovered_topics (::DDS::InstanceHandleSeq & impl_handles) - { -#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; - return retval; -#else - return this->impl ()->get_discovered_topics (impl_handles); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::get_discovered_topic_data (::DDS::TopicBuiltinTopicData & /*impl_data*/, - DDS_INSTANCE_HANDLE_T_IN /*impl_handle*/) - { - DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_topic_data"); - throw CORBA::NO_IMPLEMENT (); - } - - ::CORBA::Boolean - 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); -#else - return this->impl ()->contains_entity (a_handle); -#endif - } - - ::DDS::ReturnCode_t - 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; - return retval; -#else - return this->impl ()->get_current_time (current_time); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipant_i::enable (void) - { - return this->impl ()->enable (); - } - - ::DDS::StatusCondition_ptr - CCM_DDS_DomainParticipant_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSStatusCondition* sc = this->impl ()->get_statuscondition (); - if (sc) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); - } -#else - ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - if (!CORBA::is_nil (sc.in ())) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc.in ()), - CORBA::NO_MEMORY ()); - } -#endif - return retval._retn (); - } - - ::DDS::StatusMask - CCM_DDS_DomainParticipant_i::get_status_changes (void) - { - return this->impl ()->get_status_changes (); - } - - DDS_INSTANCE_HANDLE_T_RETN - CCM_DDS_DomainParticipant_i::get_instance_handle (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; -#else - return this->impl ()->get_instance_handle (); -#endif - } - - DDSDomainParticipant * - CCM_DDS_DomainParticipant_i::get_impl (void) - { - return this->impl_; - } - - void - CCM_DDS_DomainParticipant_i::set_impl (DDSDomainParticipant * dp) - { - this->impl_ = dp; - } - - DDSDomainParticipant * - CCM_DDS_DomainParticipant_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.h b/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.h deleted file mode 100644 index 71e2a69457f..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.h +++ /dev/null @@ -1,208 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef CIAO_NDDS_PARTICIPANT_H -#define CIAO_NDDS_PARTICIPANT_H - -#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" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -#include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DomainParticipant DDSDomainParticipant; -#endif - -#include "tao/LocalObject.h" - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DomainParticipant_i : - public virtual ::DDS::CCM_DomainParticipant, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - CCM_DDS_DomainParticipant_i (DDSDomainParticipant * dp); - - /// Destructor - virtual ~CCM_DDS_DomainParticipant_i (void); - - virtual ::DDS::Publisher_ptr create_publisher ( - const ::DDS::PublisherQos & qos, - ::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual ::DDS::Publisher_ptr create_publisher_with_profile ( - const char* library_name, - const char *profile_name, - ::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask); -#endif - - virtual ::DDS::ReturnCode_t delete_publisher (::DDS::Publisher_ptr p); - - virtual ::DDS::Subscriber_ptr create_subscriber ( - const ::DDS::SubscriberQos & qos, - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual ::DDS::Subscriber_ptr create_subscriber_with_profile( - const char* library_name, - const char *profile_name, - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask); -#endif - - virtual ::DDS::ReturnCode_t delete_subscriber (::DDS::Subscriber_ptr s); - - virtual ::DDS::Subscriber_ptr get_builtin_subscriber (void); - - virtual ::DDS::Topic_ptr create_topic ( - const char * impl_name, - const char * type_name, - const ::DDS::TopicQos & qos, - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual ::DDS::Topic_ptr create_topic_with_profile ( - const char * impl_name, - const char * type_name, - const char* library_name, - const char *profile_name, - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask); -#endif - - virtual ::DDS::ReturnCode_t delete_topic (::DDS::Topic_ptr a_topic); - - virtual ::DDS::Topic_ptr find_topic ( - const char * impl_name, - const ::DDS::Duration_t & timeout); - - virtual ::DDS::TopicDescription_ptr lookup_topicdescription ( - const char * name); - - virtual ::DDS::ContentFilteredTopic_ptr create_contentfilteredtopic ( - const char * name, - ::DDS::Topic_ptr related_topic, - const char * filter_expression, - const ::DDS::StringSeq & expression_parameters); - - virtual ::DDS::ReturnCode_t delete_contentfilteredtopic ( - ::DDS::ContentFilteredTopic_ptr a_contentfilteredtopic); - - virtual ::DDS::MultiTopic_ptr create_multitopic ( - const char * name, - const char * type_name, - const char * subscription_expression, - const ::DDS::StringSeq & expression_parameters); - - virtual ::DDS::ReturnCode_t delete_multitopic ( - ::DDS::MultiTopic_ptr a_multitopic); - - virtual ::DDS::ReturnCode_t delete_contained_entities (void); - - virtual ::DDS::ReturnCode_t set_qos ( - const ::DDS::DomainParticipantQos & qos); - - virtual ::DDS::ReturnCode_t get_qos ( - ::DDS::DomainParticipantQos & qos); - - virtual ::DDS::ReturnCode_t set_listener ( - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::DomainParticipantListener_ptr get_listener (void); - - virtual ::DDS::ReturnCode_t ignore_participant ( - DDS_INSTANCE_HANDLE_T_IN handle); - - virtual ::DDS::ReturnCode_t ignore_topic ( - DDS_INSTANCE_HANDLE_T_IN handle); - - virtual ::DDS::ReturnCode_t ignore_publication ( - DDS_INSTANCE_HANDLE_T_IN handle); - - virtual ::DDS::ReturnCode_t ignore_subscription ( - DDS_INSTANCE_HANDLE_T_IN handle); - - virtual ::DDS::DomainId_t get_domain_id (void); - - virtual ::DDS::ReturnCode_t assert_liveliness (void); - - virtual ::DDS::ReturnCode_t set_default_publisher_qos ( - const ::DDS::PublisherQos & qos); - - virtual ::DDS::ReturnCode_t get_default_publisher_qos ( - ::DDS::PublisherQos & qos); - - virtual ::DDS::ReturnCode_t set_default_subscriber_qos ( - const ::DDS::SubscriberQos & qos); - - virtual ::DDS::ReturnCode_t get_default_subscriber_qos ( - ::DDS::SubscriberQos & qos); - - virtual ::DDS::ReturnCode_t set_default_topic_qos ( - const ::DDS::TopicQos & qos); - - virtual ::DDS::ReturnCode_t get_default_topic_qos ( - ::DDS::TopicQos & qos); - - virtual ::DDS::ReturnCode_t get_discovered_participants ( - ::DDS::InstanceHandleSeq & impl_handles); - - virtual ::DDS::ReturnCode_t get_discovered_participant_data ( - ::DDS::ParticipantBuiltinTopicData & impl_data, - DDS_INSTANCE_HANDLE_T_IN impl_handle); - - virtual ::DDS::ReturnCode_t get_discovered_topics ( - ::DDS::InstanceHandleSeq & impl_handles); - - virtual ::DDS::ReturnCode_t get_discovered_topic_data ( - ::DDS::TopicBuiltinTopicData & impl_data, - DDS_INSTANCE_HANDLE_T_IN impl_handle); - - virtual ::CORBA::Boolean contains_entity ( - DDS_INSTANCE_HANDLE_T_IN a_handle); - - virtual ::DDS::ReturnCode_t get_current_time ( - ::DDS::Time_t & current_time); - - virtual ::DDS::ReturnCode_t enable (void); - - virtual ::DDS::StatusCondition_ptr get_statuscondition (void); - - virtual ::DDS::StatusMask get_status_changes (void); - - virtual DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void); - - DDSDomainParticipant * get_impl (void); - - void set_impl (DDSDomainParticipant * dp); - - protected: - DDSDomainParticipant *impl_; - - DDSDomainParticipant * impl (void); - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp deleted file mode 100644 index 794bf1283d4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp +++ /dev/null @@ -1,338 +0,0 @@ -// $Id$ - -#include "DomainParticipantFactory.h" -#include "DomainParticipant.h" -#include "DomainParticipantListener.h" - -#include "ndds/DomainParticipantFactoryQos.h" -#include "ndds/DomainParticipantQos.h" - -#include "Utils.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/idl/dds4ccm_BaseC.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DomainParticipantFactory DDSDomainParticipantFactory; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_DomainParticipantFactory_i::CCM_DDS_DomainParticipantFactory_i (void) - { - DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::CCM_DDS_DomainParticipantFactory_i"); - } - - CCM_DDS_DomainParticipantFactory_i::~CCM_DDS_DomainParticipantFactory_i (void) - { - DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::~CCM_DDS_DomainParticipantFactory_i"); - } - - ::DDS::DomainParticipant_ptr - CCM_DDS_DomainParticipantFactory_i::create_participant (::DDS::DomainId_t domain_id, - const ::DDS::DomainParticipantQos & qos, - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::create_participant"); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (qos); - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant - " - "Creating domain participant for domain <%d>\n", - domain_id)); - - CCM_DDS_DomainPublisherListener_i *ccm_dds_dpl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_dpl, - CCM_DDS_DomainPublisherListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - - DDSDomainParticipant *part = DDSDomainParticipantFactory::get_instance ()-> - create_participant (domain_id, - DDS_PARTICIPANT_QOS_DEFAULT, - ccm_dds_dpl, - mask); - - if (!part) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant - " - "Error: Unable to create DomainParticipant for domain <%d>\n", - domain_id)); - throw CCM_DDS::InternalError (1, 0); - } - - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); - ACE_NEW_THROW_EX (retval, - 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); - - return retval._retn (); -#else - return DDSDomainParticipantFactory::get_instance ()-> - create_participant (domain_id, - qos, - a_listener, - mask); -#endif - } - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::DomainParticipant_ptr - CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile ( - ::DDS::DomainId_t domain_id, - const char * library_name, - const char * profile_name, - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile"); - - 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; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_dpl, - CCM_DDS_DomainPublisherListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - - ACE_CString qos_profile = library_name; - qos_profile += ACE_TEXT ("#"); - qos_profile += profile_name; - - CCM_DDS_DomainParticipant_i *ccm_dds_dp = 0; - - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->dps_mutex_, CORBA::INTERNAL ()); - { - ccm_dds_dp = this->dps_[qos_profile]; - - if (!ccm_dds_dp) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - " - "Creating participant: profile <%C> - domain <%d>\n", - qos_profile.c_str (), - domain_id)); - DDSDomainParticipant * part = DDSDomainParticipantFactory::get_instance ()-> - create_participant_with_profile (domain_id, - library_name, - profile_name, - ccm_dds_dpl, - mask); - if (!part) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - " - "Error: Unable to create DomainParticipant\n")); - throw CCM_DDS::InternalError (1, 0); - } - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_DomainParticipant_i (part), - CORBA::NO_MEMORY ()); - - 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; - return retval._retn (); - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - " - "Re-using participant for QOS profile <%C> and domin <%d>.\n", - qos_profile.c_str (), - domain_id)); - return ::DDS::DomainParticipant::_duplicate (ccm_dds_dp); - } - } - } -#endif - - void - CCM_DDS_DomainParticipantFactory_i::remove_participant (CCM_DDS_DomainParticipant_i * part) - { - DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::remove_participant"); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, - this->dps_mutex_, CORBA::INTERNAL ()); - - if (part->_refcount_value () == 1) - { - DomainParticipants::iterator pos; - for (pos = this->dps_.begin(); pos != this->dps_.end(); ++pos) - { - if (pos->second == part) - { - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::remove_participant - " - "Removing participant for %C from list.\n", - pos->first.c_str ())); - this->dps_.erase (pos->first); - break; - } - } - } - else - { - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::remove_participant - " - "Don't delete participant since it's still used - ref_count <%d>\n", - part->_refcount_value ())); - } -#else -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipantFactory_i::delete_participant (::DDS::DomainParticipant_ptr a_participant) - { - DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::delete_participant"); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_DomainParticipant_i *part = dynamic_cast< CCM_DDS_DomainParticipant_i * > (a_participant); - - if (!part) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - " - "Unable to cast provided object reference to servant type, bailing.\n")); - return DDS::RETCODE_ERROR; - } - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - " - "Successfully casted provided object reference to servant type.\n")); - - this->remove_participant (part); - - DDS::ReturnCode_t retval = DDS::RETCODE_OK; - - if (part->_refcount_value () == 1) - { - retval = DDSDomainParticipantFactory::get_instance ()-> - delete_participant (part->get_impl ()); - - if (retval != DDS::RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - " - "RTI delete_participant returned non-ok error code %C\n", - translate_retcode (retval))); - } - else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - " - "Successfully deleted provided participant.\n")); - } - return retval; -#else - return DDSDomainParticipantFactory::get_instance ()-> - delete_participant (a_participant); -#endif - } - - ::DDS::DomainParticipant_ptr - CCM_DDS_DomainParticipantFactory_i::lookup_participant (::DDS::DomainId_t domain_id) - { - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDomainParticipant* dp = DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id); - ACE_NEW_THROW_EX (retval, - CCM_DDS_DomainParticipant_i (dp), - CORBA::NO_MEMORY ()); -#else - ::DDS::DomainParticipant_var dp = DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id); - ACE_NEW_THROW_EX (retval, - CCM_DDS_DomainParticipant_i (dp.in ()), - CORBA::NO_MEMORY ()); -#endif - return retval._retn (); - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos (const ::DDS::DomainParticipantQos & qos) - { - 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); -#else - return DDSDomainParticipantFactory::get_instance ()->set_default_participant_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipantFactory_i::get_default_participant_qos (::DDS::DomainParticipantQos & qos) - { - 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::ReturnCode_t retcode = - DDSDomainParticipantFactory::get_instance ()->get_default_participant_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; -#else - return DDSDomainParticipantFactory::get_instance ()->get_default_participant_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipantFactory_i::set_qos (const ::DDS::DomainParticipantFactoryQos & qos) - { - 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); -#else - return DDSDomainParticipantFactory::get_instance ()->set_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipantFactory_i::get_qos (::DDS::DomainParticipantFactoryQos & qos) - { - DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::get_qos"); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_DomainParticipantFactoryQos ccm_dds_qos; - ::DDS::ReturnCode_t retcode = - DDSDomainParticipantFactory::get_instance ()->get_qos (ccm_dds_qos); - ccm_dds_qos <<= qos; - return retcode; -#else - return DDSDomainParticipantFactory::get_instance ()->get_qos (qos); -#endif - } - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::ReturnCode_t - CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos_with_profile ( - const char * library_name, - const char * profile_name) - { - DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos_with_profile"); - - return DDSDomainParticipantFactory::get_instance ()->set_default_participant_qos_with_profile (library_name, profile_name); - } -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) - ::DDS::DomainParticipantFactory_ptr - CCM_DDS_DomainParticipantFactory_i::get_instance (void) - { - return 0; - } -#endif - } -} - -#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton * - ACE_Singleton::singleton_; -#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.h b/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.h deleted file mode 100644 index 694955f52bc..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.h +++ /dev/null @@ -1,111 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS_RTI_PARTICIPANTFACTORY_H -#define DDS_RTI_PARTICIPANTFACTORY_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" - -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" - -#include "tao/LocalObject.h" - -#include "ace/Singleton.h" - -#include - -namespace CIAO -{ - namespace DDS4CCM - { - class CCM_DDS_DomainParticipant_i; - - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DomainParticipantFactory_i : - public virtual ::DDS::CCM_DomainParticipantFactory, - public virtual ::CORBA::LocalObject - { - friend class ACE_Singleton; - - private: - // Construtor - CCM_DDS_DomainParticipantFactory_i (void); - - /// Destructor - virtual ~CCM_DDS_DomainParticipantFactory_i (void); - - public: -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) - virtual ::DDS::DomainParticipantFactory_ptr get_instance (void); -#endif - - virtual - ::DDS::DomainParticipant_ptr create_participant (::DDS::DomainId_t domain_id, - const ::DDS::DomainParticipantQos & qos, - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual - ::DDS::DomainParticipant_ptr create_participant_with_profile (::DDS::DomainId_t domain_id, - const char * library_name, - const char * profile_name, - ::DDS::DomainParticipantListener_ptr a_listener, - ::DDS::StatusMask mask); -#endif - - virtual - ::DDS::ReturnCode_t delete_participant (::DDS::DomainParticipant_ptr a_participant); - - virtual - ::DDS::DomainParticipant_ptr lookup_participant (::DDS::DomainId_t domain_id); - - virtual - ::DDS::ReturnCode_t set_default_participant_qos (const ::DDS::DomainParticipantQos & qos); - - virtual - ::DDS::ReturnCode_t get_default_participant_qos (::DDS::DomainParticipantQos & qos); - - virtual - ::DDS::ReturnCode_t set_qos (const ::DDS::DomainParticipantFactoryQos & qos); - - virtual - ::DDS::ReturnCode_t get_qos (::DDS::DomainParticipantFactoryQos & qos); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual ::DDS::ReturnCode_t set_default_participant_qos_with_profile( - const char * library_name, - const char * profile_name); -#endif - - private: - void remove_participant (CCM_DDS_DomainParticipant_i * part); - - TAO_SYNCH_MUTEX dps_mutex_; - typedef std::map DomainParticipants; - DomainParticipants dps_; - private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const CCM_DDS_DomainParticipantFactory_i &)) - ACE_UNIMPLEMENTED_FUNC (CCM_DDS_DomainParticipantFactory_i (const CCM_DDS_DomainParticipantFactory_i &)) - }; - - typedef ACE_Singleton Domain_Participant_Factory; - } -} - -#define DPFACTORY ::CIAO::DDS4CCM::Domain_Participant_Factory::instance () - -/// Declare a process wide singleton -DDS4CCM_NDDS_IMPL_SINGLETON_DECLARE (ACE_Singleton, - ::CIAO::DDS4CCM::CCM_DDS_DomainParticipantFactory_i, - TAO_SYNCH_MUTEX) - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp b/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp deleted file mode 100644 index 90d81e1a7cb..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp +++ /dev/null @@ -1,127 +0,0 @@ -// $Id$ - -#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 "dds4ccm/idl/dds4ccm_BaseC.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_DomainPublisherListener_i::CCM_DDS_DomainPublisherListener_i ( - ::DDS::DomainParticipantListener_ptr p) - : impl_ (::DDS::DomainParticipantListener::_duplicate (p)) - { - } - - CCM_DDS_DomainPublisherListener_i::~CCM_DDS_DomainPublisherListener_i (void) - { - } - - void - CCM_DDS_DomainPublisherListener_i::on_inconsistent_topic ( - ::DDS::Topic_ptr, - const ::DDS::InconsistentTopicStatus & ) - { - } - - void - CCM_DDS_DomainPublisherListener_i::on_requested_deadline_missed ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedDeadlineMissedStatus & ) - { - } - - void - CCM_DDS_DomainPublisherListener_i::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedIncompatibleQosStatus & ) - { - } - - void - CCM_DDS_DomainPublisherListener_i::on_sample_rejected ( - ::DDS::DataReader_ptr , - const ::DDS::SampleRejectedStatus & ) - { - } - - void - CCM_DDS_DomainPublisherListener_i::on_liveliness_changed ( - ::DDS::DataReader_ptr , - const ::DDS::LivelinessChangedStatus & ) - { - } - - void - CCM_DDS_DomainPublisherListener_i::on_data_available ( - ::DDS::DataReader_ptr ) - { - } - - void - CCM_DDS_DomainPublisherListener_i::on_subscription_matched ( - ::DDS::DataReader_ptr , - const ::DDS::SubscriptionMatchedStatus & ) - { - } - - void - CCM_DDS_DomainPublisherListener_i::on_sample_lost ( - ::DDS::DataReader_ptr , - const ::DDS::SampleLostStatus & ) - { - } - - void - CCM_DDS_DomainPublisherListener_i::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedDeadlineMissedStatus & ) - { - } - - void - CCM_DDS_DomainPublisherListener_i::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedIncompatibleQosStatus & ) - { - } - - void - CCM_DDS_DomainPublisherListener_i::on_liveliness_lost ( - ::DDS::DataWriter_ptr , - const ::DDS::LivelinessLostStatus & ) - { - } - - void - CCM_DDS_DomainPublisherListener_i::on_publication_matched ( - ::DDS::DataWriter_ptr , - const ::DDS::PublicationMatchedStatus & ) - { - } - - void - CCM_DDS_DomainPublisherListener_i::on_data_on_readers ( - ::DDS::Subscriber_ptr ) - { - } - - ::DDS::DomainParticipantListener_ptr - CCM_DDS_DomainPublisherListener_i::get_domainparticipantlistener (void) - { - return ::DDS::DomainParticipantListener::_duplicate (this->impl_.in ()); - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.h deleted file mode 100644 index ef0b7f6aee9..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener.h +++ /dev/null @@ -1,111 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DOMAINPARTICIPANTLISTENER_H -#define DDS4CCM_DOMAINPARTICIPANTLISTENER_H - -#include "tao/LocalObject.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm_ndds_impl_export.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -# include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DomainParticipantListener DDSDomainParticipantListener; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DomainPublisherListener_i : - public virtual ::DDSDomainParticipantListener - { - public: - /// Constructor - CCM_DDS_DomainPublisherListener_i (::DDS::DomainParticipantListener_ptr p); - - /// Destructor - virtual ~CCM_DDS_DomainPublisherListener_i (void); - - ::DDS::DomainParticipantListener_ptr get_domainparticipantlistener (void); - - virtual void - on_inconsistent_topic ( - ::DDS::Topic_ptr, - const ::DDS::InconsistentTopicStatus & ); - - virtual void - on_requested_deadline_missed ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedDeadlineMissedStatus & ); - - virtual void - on_requested_incompatible_qos ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedIncompatibleQosStatus & ); - - virtual void - on_sample_rejected ( - ::DDS::DataReader_ptr , - const ::DDS::SampleRejectedStatus & ); - - virtual void - on_liveliness_changed ( - ::DDS::DataReader_ptr , - const ::DDS::LivelinessChangedStatus & ); - - virtual void - on_data_available ( - ::DDS::DataReader_ptr ); - - virtual void - on_subscription_matched ( - ::DDS::DataReader_ptr , - const ::DDS::SubscriptionMatchedStatus & ); - - virtual void - on_sample_lost ( - ::DDS::DataReader_ptr , - const ::DDS::SampleLostStatus & ); - - virtual void - on_offered_deadline_missed ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedDeadlineMissedStatus & ); - - virtual void - on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedIncompatibleQosStatus & ); - - virtual void - on_liveliness_lost ( - ::DDS::DataWriter_ptr , - const ::DDS::LivelinessLostStatus & ); - - virtual void - on_publication_matched ( - ::DDS::DataWriter_ptr , - const ::DDS::PublicationMatchedStatus & ); - - virtual void - on_data_on_readers ( - ::DDS::Subscriber_ptr ); - - private: - ::DDS::DomainParticipantListener_var impl_; - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp deleted file mode 100644 index 609e38355c1..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp +++ /dev/null @@ -1,142 +0,0 @@ -// $Id$ -#include "dds4ccm/impl/dds/Utils.h" - -#include "dds4ccm/impl/dds/DataReader.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds/DataReaderHandler_T.h" -#include "tao/ORB_Core.h" - -template -CIAO::DDS4CCM::DomainParticipantListener_T::DomainParticipantListener_T ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener) - : error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DomainParticipantListener_T::DomainParticipantListener_T"); -} - -template -CIAO::DDS4CCM::DomainParticipantListener_T::~DomainParticipantListener_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DomainParticipantListener_T::~DomainParticipantListener_T"); -} - -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_inconsistent_topic ( - ::DDS::Topic_ptr, - const ::DDS::InconsistentTopicStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_requested_deadline_missed ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedDeadlineMissedStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedIncompatibleQosStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_sample_rejected ( - ::DDS::DataReader_ptr , - const ::DDS::SampleRejectedStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_liveliness_changed ( - ::DDS::DataReader_ptr , - const ::DDS::LivelinessChangedStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_data_available ( - ::DDS::DataReader_ptr ) -{ -} - -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_subscription_matched ( - ::DDS::DataReader_ptr , - const ::DDS::SubscriptionMatchedStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_sample_lost ( - ::DDS::DataReader_ptr , - const ::DDS::SampleLostStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedDeadlineMissedStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedIncompatibleQosStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_liveliness_lost ( - ::DDS::DataWriter_ptr , - const ::DDS::LivelinessLostStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_publication_matched ( - ::DDS::DataWriter_ptr , - const ::DDS::PublicationMatchedStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_data_on_readers ( - ::DDS::Subscriber_ptr ) -{ -} - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -template -void -CIAO::DDS4CCM::DomainParticipantListener_T::on_reliable_reader_activity_changed ( - ::DDS::DataWriter_ptr , - const ::DDS::ReliableReaderActivityChangedStatus & ) -{ -} -#endif - -template -::DDS::StatusMask -CIAO::DDS4CCM::DomainParticipantListener_T::get_mask (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DomainParticipantListener_T::get_mask"); - return 0; -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h b/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h deleted file mode 100644 index 76acc73cc16..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h +++ /dev/null @@ -1,109 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - class DomainParticipantListener_T : - public virtual ::DDS::CCM_DomainParticipantListener, - public virtual ::CORBA::LocalObject, - private virtual ACE_Copy_Disabled - { - public: - /// Constructor - DomainParticipantListener_T ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener); - - /// Destructor - virtual ~DomainParticipantListener_T (void); - - static ::DDS::StatusMask get_mask (void); - - virtual void - on_inconsistent_topic ( - ::DDS::Topic_ptr, - const ::DDS::InconsistentTopicStatus & ); - - virtual void - on_requested_deadline_missed ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedDeadlineMissedStatus & ); - - virtual void - on_requested_incompatible_qos ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedIncompatibleQosStatus & ); - - virtual void - on_sample_rejected ( - ::DDS::DataReader_ptr , - const ::DDS::SampleRejectedStatus & ); - - virtual void - on_liveliness_changed ( - ::DDS::DataReader_ptr , - const ::DDS::LivelinessChangedStatus & ); - - virtual void - on_data_available ( - ::DDS::DataReader_ptr ); - - virtual void - on_subscription_matched ( - ::DDS::DataReader_ptr , - const ::DDS::SubscriptionMatchedStatus & ); - - virtual void - on_sample_lost ( - ::DDS::DataReader_ptr , - const ::DDS::SampleLostStatus & ); - - virtual void - on_offered_deadline_missed ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedDeadlineMissedStatus & ); - - virtual void - on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr , - const ::DDS::OfferedIncompatibleQosStatus & ); - - virtual void - on_liveliness_lost ( - ::DDS::DataWriter_ptr , - const ::DDS::LivelinessLostStatus & ); - - virtual void - on_publication_matched ( - ::DDS::DataWriter_ptr , - const ::DDS::PublicationMatchedStatus & ); - - virtual void - on_data_on_readers ( - ::DDS::Subscriber_ptr ); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual void - on_reliable_reader_activity_changed ( - ::DDS::DataWriter_ptr , - const ::DDS::ReliableReaderActivityChangedStatus & ); -#endif - - private: - ::CCM_DDS::ConnectorStatusListener_var error_listener_; - }; - } -} - -#include "dds4ccm/impl/dds/DomainParticipantListener_T.cpp" diff --git a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp deleted file mode 100644 index f13db77d845..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.cpp +++ /dev/null @@ -1,433 +0,0 @@ -// $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/logger/Log_Macros.h" - -template -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::Getter_Base_T (void) : - impl_ (0), - condition_(0), - time_out_ (), - max_delivered_data_ (0), - ws_ (0), - rd_condition_ (0) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::Getter_Base_T"); -} - -template -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::~Getter_Base_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::~Getter_Base_T"); - delete ws_; -} - -template -typename DDS_TYPE::data_reader * -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::impl (void) -{ - if (this->impl_) - { - return this->impl_; - } - else - { - throw ::CORBA::BAD_INV_ORDER (); - } -} - -template -bool -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::wait ( - DDSConditionSeq& active_conditions) -{ - DDS_Duration_t timeout; - timeout <<= this->time_out_; - DDS_ReturnCode_t const retcode = this->ws_->wait (active_conditions, timeout); - if (retcode == DDS_RETCODE_TIMEOUT) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("Getter: No data available after timeout.\n"))); - return false; - } - return true; -} - -template -bool -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::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 ()); - - DDSConditionSeq active_conditions; - if (!this->wait (active_conditions)) - { - return false; - } - - ::DDS_Long max_samples = this->max_delivered_data_; - if (max_samples == 0) - { - max_samples = DDS_LENGTH_UNLIMITED; - } - - DDS_SampleInfoSeq sample_info; - typename DDS_TYPE::dds_seq_type data; - for (::DDS_Long i = 0; i < active_conditions.length(); i++) - { - if (active_conditions[i] == this->rd_condition_) - { - // Check trigger - active_conditions[i]->get_trigger_value (); - - // Take read condition - DDS_ReturnCode_t retcode = this->impl ()->read_w_condition ( - data, - sample_info, - max_samples, - this->rd_condition_); - - if (retcode == DDS_RETCODE_OK && data.length () >= 1) - { - ::CORBA::ULong number_read = 0; - for (::DDS_Long index = 0; index < sample_info.length (); index ++) - { - if (sample_info[index].valid_data) - { - ++number_read; - } - } - DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("Getter_Base_T::get_many: ") - ACE_TEXT ("read <%d> - valid <%d>\n"), - sample_info.length (), - number_read)); - infos->length (number_read); - instances->length (number_read); - number_read = 0; - for (::DDS_Long j = 0; j < data.length (); j ++) - { - if (sample_info[j].valid_data) - { - infos->operator[](number_read) <<= sample_info[j]; - instances->operator[](number_read) = data[j]; - ++number_read; - } - } - } - else - { - // RETCODE_NO_DATA should be an error - // 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 - " - "Error while reading from DDS: <%C>\n", - translate_retcode (retcode))); - this->impl ()->return_loan(data,sample_info); - throw CCM_DDS::InternalError (retcode, 1); - } - - retcode = this->impl ()->return_loan(data,sample_info); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("return loan error %C\n"), - translate_retcode (retcode))); - } - } - } - return true; -} - -template -::DDS::Duration_t -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::time_out (void) -{ - return this->time_out_; -} - -template -void -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::time_out ( - const ::DDS::Duration_t & time_out) -{ - this->time_out_ = time_out; -} - -template -::CCM_DDS::DataNumber_t -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::max_delivered_data (void) -{ - return this->max_delivered_data_; -} - -template -void -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::max_delivered_data ( - ::CCM_DDS::DataNumber_t max_delivered_data) -{ - this->max_delivered_data_ = max_delivered_data; -} - -template -void -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::passivate () -{ - DDS_ReturnCode_t retcode = this->ws_->detach_condition (this->rd_condition_); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "Getter_Base_T::passivate - " - "Unable to detach read condition from waitset.\n")); - } - else - { - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "Getter_Base_T::passivate - " - "Read condition succesfully detached from waitset.\n")); - } - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "Getter_Base_T::passivate - " - "Unable to detach guard condition from waitset.\n")); - } - else - { - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "Getter_Base_T::passivate - " - "Guard condition succesfully detached from waitset.\n")); - } - retcode = this->impl ()->delete_readcondition (this->rd_condition_); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "Getter_Base_T::passivate - " - "Unable to delete read condition from DDSDataReader.\n")); - } - else - { - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "Getter_Base_T::passivate - " - "Read condition succesfully deleted from DDSDataReader.\n")); - } -} - -template -void -CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::set_impl ( - ::DDS::DataReader_ptr reader) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::set_impl"); - - if (::CORBA::is_nil (reader)) - { - impl_ = 0; - delete this->ws_; - this->ws_ = 0; - } - else - { - CCM_DDS_DataReader_i *rdr = dynamic_cast (reader); - if (!rdr) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Getter_Base_T::data_reader - " - "Unable to cast provided DataReader to servant\n")); - throw CORBA::INTERNAL (); - } - - this->impl_ = DDS_TYPE::data_reader::narrow (rdr->get_impl ()); - - if (!this->impl_) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::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->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); - DDS_ReturnCode_t retcode = this->ws_->attach_condition (this->rd_condition_); - if (retcode != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "GETTER: Unable to attach read condition to waitset.\n")); - throw CCM_DDS::InternalError (retcode, 1); - } - } -} - -template -bool -CIAO::DDS4CCM::DDS_CCM::Getter_T::get_one ( - typename DDS_TYPE::value_type::_out_type an_instance, - ::CCM_DDS::ReadInfo_out info) -{ - DDSConditionSeq active_conditions; - if (!this->wait (active_conditions)) - { - return false; - } - - for (::DDS_Long i = 0; i < active_conditions.length(); i++) - { - if (active_conditions[i] == this->rd_condition_) - { - bool valid_data_read = false; - - while (!valid_data_read) - { - DDS_SampleInfoSeq sample_info; - typename DDS_TYPE::dds_seq_type data; - DDS_ReturnCode_t retcode = this->impl ()->read_w_condition ( - data, - sample_info, - 1, - this->rd_condition_); - if (retcode == DDS_RETCODE_NO_DATA) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - "CIAO::DDS4CCM::DDS_CCM::Getter_T::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::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 ("::get_one - ") - ACE_TEXT ("return loan error\n"))); - } - throw CCM_DDS::InternalError (retcode, 1); - } - else if (data.length () == 1 && - sample_info[0].valid_data) - { - info <<= sample_info[0]; - an_instance = data[0]; - valid_data_read = true; - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - "CIAO::DDS4CCM::DDS_CCM::Getter_T::get_one - " - "No valid available in DDS.\n")); - } - //return the loan of each read. - 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 ("::get_one - ") - ACE_TEXT ("return loan error\n"))); - } - } - } - } - - return true; -} - -template -bool -CIAO::DDS4CCM::DDS_CCM::Getter_T::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 ()); - DDSConditionSeq active_conditions; - if (!this->wait (active_conditions)) - { - return false; - } - - DDS_SampleInfoSeq sample_info; - typename DDS_TYPE::dds_seq_type data; - for (::DDS_Long i = 0; i < active_conditions.length(); i++) - { - if (active_conditions[i] == this->rd_condition_) - { - bool valid_data_read = false; - - while (!valid_data_read) - { - DDS_SampleInfoSeq sample_info; - typename DDS_TYPE::dds_seq_type data; - DDS_ReturnCode_t retcode = this->impl ()->read_w_condition ( - data, - sample_info, - 1, - this->rd_condition_); - if (retcode == DDS_RETCODE_NO_DATA) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - "CIAO::DDS4CCM::DDS_CCM::Getter_T::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::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 ("::get_one - ") - ACE_TEXT ("return loan error\n"))); - } - throw CCM_DDS::InternalError (retcode, 1); - } - else if (data.length () == 1 && - sample_info[0].valid_data) - { - info <<= sample_info[0]; - *an_instance = data[0]; - valid_data_read = true; - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - "CIAO::DDS4CCM::DDS_CCM::Getter_T::get_one - " - "No valid available in DDS.\n")); - } - //return the loan of each read. - 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 ("::get_one - ") - ACE_TEXT ("return loan error\n"))); - } - } - } - } - - return true; -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.h b/CIAO/connectors/dds4ccm/impl/dds/Getter_T.h deleted file mode 100644 index 3849319fcc4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Getter_T.h +++ /dev/null @@ -1,141 +0,0 @@ -/** - * @author Marcel Smit - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef GETTER_T_H -#define GETTER_T_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::GuardCondition DDSGuardCondition; -typedef ::DDS::WaitSet DDSWaitSet; -typedef ::DDS::ReadCondition DDSReadCondition; -typedef ::DDS::ConditionSeq DDSConditionSeq; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - namespace DDS_CCM - { - /** - * @class Getter_Base_T - * - * @brief Templated base class for the Getter port. - * - * Spec: Get operations are performed with the following parameters - * · SampleStateMask: NO_READ, - * · ViewStateMask: NEW or NOT_NEW, - * · InstanceStateMask: ALIVE or NOT_ALIVE, - * · Through the query (if any) of the Reader associated to the port, - * · Within the time limit specified in time_out. - * - * All methods return a boolean as result indicating whether actual data - * are provided (TRUE) or if the time-out occurred (FALSE). - */ - template - class Getter_Base_T : - public virtual CCM_TYPE::getter_type, - public virtual ::CORBA::LocalObject, - private virtual ACE_Copy_Disabled - { - public: - /// Constructor - Getter_Base_T (void); - - /// Destructor - virtual ~Getter_Base_T (void); - - /** - * Spec : get_many returns all the available samples - * in the limits set by the attribute max_delivered_data. - * In case there are more available samples, the first - * max_delivered_data are returned. The default value for - * that attribute is UNLIMITED (0) - */ - virtual bool get_many ( - typename CCM_TYPE::seq_type::_out_type instances, - ::CCM_DDS::ReadInfoSeq_out infos); - virtual ::DDS::Duration_t time_out (void); - virtual void time_out (const ::DDS::Duration_t & time_out); - - virtual ::CCM_DDS::DataNumber_t max_delivered_data (void); - virtual void max_delivered_data ( - ::CCM_DDS::DataNumber_t max_delivered_data); - - /** - * Set the actual pointer to DDS Datareader - */ - void set_impl (::DDS::DataReader_ptr reader); - - void passivate (void); - - protected: - typename DDS_TYPE::data_reader *impl_; - - DDSQueryCondition* condition_; - ::DDS::Duration_t time_out_; - ::CCM_DDS::DataNumber_t max_delivered_data_; - DDSWaitSet* ws_; - DDSReadCondition* rd_condition_; - - bool wait (DDSConditionSeq& active_conditions); - - typename DDS_TYPE::data_reader * impl (void); - }; - - template - class Getter_T; - - /** - * @brief Implementation of the Getter port for variable sized data types. - * - */ - template - class Getter_T : - public Getter_Base_T - { - public: - /** - * - * @brief get_one implementation for variable sized datatypes. - * - * Spec : get_one returns the next sample to be gotten. - */ - virtual bool get_one ( - typename DDS_TYPE::value_type::_out_type an_instance, - ::CCM_DDS::ReadInfo_out info); - }; - - /** - * @brief Implementation of the Getter port for fixed sized data types. - * - */ - template - class Getter_T : - public Getter_Base_T - { - public: - /** - * @brief get_one implementation for fixed sized datatypes. - * - * Spec : get_one returns the next sample to be gotten. - */ - virtual bool get_one ( - typename DDS_TYPE::value_type::_out_type an_instance, - ::CCM_DDS::ReadInfo_out info); - }; - } - } -} - -#include "dds4ccm/impl/dds/Getter_T.cpp" - -#endif /* GETTER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp deleted file mode 100644 index a8699e10c1d..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp +++ /dev/null @@ -1,91 +0,0 @@ -// $Id$ - -#include "dds4ccm/impl/dds/DataWriter.h" -#include "dds4ccm/impl/dds/Utils.h" - -#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -template -CIAO::DDS4CCM::InstanceHandleManager_T::InstanceHandleManager_T (void) - : impl_ (0) -{ -} - -template -CIAO::DDS4CCM::InstanceHandleManager_T::~InstanceHandleManager_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::InstanceHandleManager_T::~InstanceHandleManager_T"); -} - -template -typename DDS_TYPE::data_writer * -CIAO::DDS4CCM::InstanceHandleManager_T::impl (void) -{ - if (this->impl_) - { - return this->impl_; - } - else - { - throw ::CORBA::BAD_INV_ORDER (); - } -} - -template -::DDS::InstanceHandle_t -CIAO::DDS4CCM::InstanceHandleManager_T:: - register_instance (const typename DDS_TYPE::value_type & datum) -{ - ::DDS::InstanceHandle_t dds_handle; - ::DDS_InstanceHandle_t const handle = this->impl ()->register_instance (datum); - dds_handle <<= handle; - return dds_handle; -} - -template -void -CIAO::DDS4CCM::InstanceHandleManager_T::unregister_instance ( - const typename DDS_TYPE::value_type & datum, - const ::DDS::InstanceHandle_t & instance_handle) -{ - ::DDS_InstanceHandle_t handle = ::DDS_HANDLE_NIL; - handle <<= instance_handle; - this->impl ()->unregister_instance (datum, handle); -} - -template -void -CIAO::DDS4CCM::InstanceHandleManager_T::set_impl ( - ::DDS::DataWriter_ptr writer) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::InstanceHandleManager_T::set_impl"); - - if (::CORBA::is_nil (writer)) - { - impl_ = 0; - } - else - { - CCM_DDS_DataWriter_i *rdw = dynamic_cast (writer); - - if (rdw == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::InstanceHandleManager_T::data_writer - " - "Unable to cast provided DataWriter to servant\n")); - throw ::CORBA::INTERNAL (); - } - - this->impl_ = DDS_TYPE::data_writer::narrow (rdw->get_impl ()); - - if (!this->impl_) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::InstanceHandleManager_T::data_writer - " - "Unable to narrow the provided writer entity to the specific " - "type necessary to publish messages\n")); - throw ::CORBA::INTERNAL (); - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h b/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h deleted file mode 100644 index ef5f78fdbae..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h +++ /dev/null @@ -1,51 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef INSTANCE_HANDLEMANGER_T_H -#define INSTANCE_HANDLEMANGER_T_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - class InstanceHandleManager_T : - public virtual BASE_TYPE, - public virtual ::CORBA::LocalObject, - private virtual ACE_Copy_Disabled - { - public: - /// Constructor - InstanceHandleManager_T (void); - - /// Destructor - virtual ~InstanceHandleManager_T (void); - - virtual ::DDS::InstanceHandle_t register_instance ( - const typename DDS_TYPE::value_type & datum); - - virtual void unregister_instance ( - const typename DDS_TYPE::value_type & datum, - const ::DDS::InstanceHandle_t & instance_handle); - - void set_impl (::DDS::DataWriter_ptr writer); - - typename DDS_TYPE::data_writer * impl (void); - - private: - typename DDS_TYPE::data_writer *impl_; - }; - } -} - -#include "dds4ccm/impl/dds/InstanceHandleManager_T.cpp" - -#endif /* INSTANCE_HANDLEMANGER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp deleted file mode 100644 index 02c81857d3e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp +++ /dev/null @@ -1,182 +0,0 @@ -// $Id$ -#include "dds4ccm/impl/dds/Utils.h" - -#include "dds4ccm/impl/dds/DataReader.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds/DataReaderHandler_T.h" -#include "tao/ORB_Core.h" - -template -CIAO::DDS4CCM::PortStatusListener_T::PortStatusListener_T ( - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ACE_Reactor* reactor) - : port_status_listener_ (::CCM_DDS::PortStatusListener::_duplicate (port_status_listener)), - reactor_ (reactor) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener_T::PortStatusListener_T"); -} - -template -CIAO::DDS4CCM::PortStatusListener_T::~PortStatusListener_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener_T::~PortStatusListener_T"); -} - -template -void -CIAO::DDS4CCM::PortStatusListener_T::on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener_T::on_requested_deadline_missed"); - - DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO - ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ") - ACE_TEXT ("total count <%d> - total change <%d> - ") - ACE_TEXT ("last instance handle - isValid <%l>\n"), - status.total_count, status.total_count_change, - status.last_instance_handle.length, status.last_instance_handle.isValid)); - - if (!CORBA::is_nil (this->port_status_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnRequestedDeadlineMissedHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnRequestedDeadlineMissedHandler ( - this->port_status_listener_, the_reader, status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO - ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->port_status_listener_->on_requested_deadline_missed (the_reader, status); - } - } - catch (...) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ") - ACE_TEXT ("DDS Exception caught\n"))); - } - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, - ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ") - ACE_TEXT ("No portstatus listener installed\n"))); - } -} - -template -void -CIAO::DDS4CCM::PortStatusListener_T::on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener_T::on_sample_lost"); - - DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO - ACE_TEXT ("PortStatusListener_T::on_sample_lost: ") - ACE_TEXT ("total count <%d> - total change <%d>\n"), - status.total_count, status.total_count_change)); - - if (!CORBA::is_nil (this->port_status_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnSampleLostHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnSampleLostHandler ( - this->port_status_listener_, - the_reader, - status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO - ACE_TEXT ("PortStatusListener_T::on_sample_lost: ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->port_status_listener_->on_sample_lost (the_reader, status); - } - } - catch (...) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PortStatusListener_T::on_sample_lost: ") - ACE_TEXT ("DDS Exception caught\n"))); - } - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, - ACE_TEXT ("PortStatusListener_T::on_sample_lost: ") - ACE_TEXT ("No portstatus listener installed\n"))); - } -} - -template -void -CIAO::DDS4CCM::PortStatusListener_T::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedIncompatibleQosStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::PortStatusListener_T::on_sample_rejected ( - ::DDS::DataReader_ptr , - const ::DDS::SampleRejectedStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::PortStatusListener_T::on_liveliness_changed ( - ::DDS::DataReader_ptr , - const ::DDS::LivelinessChangedStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::PortStatusListener_T::on_data_available ( - ::DDS::DataReader_ptr ) -{ -} - -template -void -CIAO::DDS4CCM::PortStatusListener_T::on_subscription_matched ( - ::DDS::DataReader_ptr , - const ::DDS::SubscriptionMatchedStatus & ) -{ -} - -template -::DDS::StatusMask -CIAO::DDS4CCM::PortStatusListener_T::get_mask ( - ::CCM_DDS::PortStatusListener_ptr psl) -{ - if (!CORBA::is_nil (psl) || CIAO_debug_level >= 10) - { - return DDS_REQUESTED_DEADLINE_MISSED_STATUS | - DDS_SAMPLE_LOST_STATUS; - } - else - { - return 0; - } -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.h b/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.h deleted file mode 100644 index 14cbecb1e5a..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.h +++ /dev/null @@ -1,84 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_PORTSTATUSLISTENER_T_H -#define DDS4CCM_PORTSTATUSLISTENER_T_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - namespace DDS4CCM - { - template - class PortStatusListener_T : - public ::DDS::DataReaderListener, - private ACE_Copy_Disabled - { - public: - /// Constructor - PortStatusListener_T ( - ::CCM_DDS::PortStatusListener_ptr port_status_listener, - ACE_Reactor* reactor); - - /// Destructor - virtual ~PortStatusListener_T (void); - - virtual void on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual void on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); - - virtual void - on_requested_incompatible_qos ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedIncompatibleQosStatus & ); - - virtual void - on_sample_rejected ( - ::DDS::DataReader_ptr , - const ::DDS::SampleRejectedStatus & ); - - virtual void - on_liveliness_changed ( - ::DDS::DataReader_ptr , - const ::DDS::LivelinessChangedStatus & ); - - virtual void - on_data_available ( - ::DDS::DataReader_ptr ); - - virtual void - on_subscription_matched ( - ::DDS::DataReader_ptr , - const ::DDS::SubscriptionMatchedStatus & ); - - static ::DDS::StatusMask get_mask ( - ::CCM_DDS::PortStatusListener_ptr psl); - - private: - ::CCM_DDS::PortStatusListener_var port_status_listener_; - protected: - ACE_Reactor* reactor_; - - }; - } -} - -#include "dds4ccm/impl/dds/PortStatusListener_T.cpp" - -#endif /* DDS4CCM_PORTSTATUSLISTENER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/dds/Publisher.cpp deleted file mode 100644 index 73f596c11b5..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Publisher.cpp +++ /dev/null @@ -1,450 +0,0 @@ -// $Id$ - -#include "Publisher.h" -#include "PublisherListener.h" -#include "Topic.h" -#include "DataWriter.h" -#include "StatusCondition.h" -#include "Utils.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 "dds4ccm/idl/dds4ccm_BaseC.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_Publisher_i::CCM_DDS_Publisher_i (DDSPublisher * dw) - : impl_ (dw) - { - DDS4CCM_TRACE ("CCM_DDS_Publisher_i::CCM_DDS_Publisher_i"); - } - - CCM_DDS_Publisher_i::~CCM_DDS_Publisher_i (void) - { - DDS4CCM_TRACE ("CCM_DDS_Publisher_i::~CCM_DDS_Publisher_i"); - } - - ::DDS::DataWriter_ptr - CCM_DDS_Publisher_i::create_datawriter (::DDS::Topic_ptr a_topic, - const ::DDS::DataWriterQos & qos, - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("CCM_DDS_Publisher_i::create_datawriter"); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ACE_UNUSED_ARG (qos); - - CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); - - if (!topic) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter - " - "Error: Unable to cast provided topic to its servant.\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - - DDSDataWriterListener *ccm_dds_drl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_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 ( - topic->get_impl (), - ccm_dds_qos, - ccm_dds_drl, - mask); - - if (!ccm_dds_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; - 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), - CORBA::NO_MEMORY ()); - - ccm_dds_dw->enable (); - CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ()); - dw->set_impl (ccm_dds_dw); - - return retval._retn (); -#else - return this->impl ()->create_datawriter ( - a_topic, - qos, - a_listener, - mask); -#endif - } - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::DataWriter_ptr - CCM_DDS_Publisher_i::create_datawriter_with_profile (::DDS::Topic_ptr a_topic, - const char* library_name, - const char *profile_name, - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("CCM_DDS_Publisher_i::create_datawriter"); - - CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); - - if (!topic) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter_with_profile - " - "Error: Unable to cast provided topic to its servant.\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - - DDSDataWriterListener *ccm_dds_drl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_drl, - CCM_DDS_DataWriterListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - DDSDataWriter *ccm_dds_dw = this->impl ()->create_datawriter_with_profile ( - topic->get_impl (), - library_name, - profile_name, - ccm_dds_drl, - mask); - - if (!ccm_dds_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; - 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), - CORBA::NO_MEMORY ()); - - ccm_dds_dw->enable (); - CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ()); - dw->set_impl (ccm_dds_dw); - - return retval._retn (); - } -#endif - - ::DDS::ReturnCode_t - CCM_DDS_Publisher_i::delete_datawriter (::DDS::DataWriter_ptr a_datawriter) - { - DDS4CCM_TRACE ("CCM_DDS_Publisher_i::delete_datawriter"); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - CCM_DDS_DataWriter_i *top = dynamic_cast< CCM_DDS_DataWriter_i *> (a_datawriter); - - if (top == 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - " - "Unable to cast provided object reference to servant.\n")); - return ::DDS::RETCODE_BAD_PARAMETER; - } - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - " - "Successfully casted provided object reference to servant.\n")); - - DDS_ReturnCode_t const retval = this->impl ()->delete_datawriter (top->get_impl ()); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - " - "Error: RTI delete_datawriter returned non-ok error code %C\n", - translate_retcode (retval))); - } - else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - " - "Provided datawriter successfully deleted\n")); - - return retval; -#else - return this->impl ()->delete_datawriter (a_datawriter); -#endif - } - - ::DDS::DataWriter_ptr - CCM_DDS_Publisher_i::lookup_datawriter (const char * impl_name) - { - ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDataWriter* dw = this->impl ()->lookup_datawriter (impl_name); - ACE_NEW_THROW_EX (retval, - CCM_DDS_DataWriter_i (dw), - CORBA::NO_MEMORY ()); -#else - ::DDS::DataWriter_var dw = this->impl ()->lookup_datawriter (impl_name); - ACE_NEW_THROW_EX (retval, - CCM_DDS_DataWriter_i (dw.in ()), - CORBA::NO_MEMORY ()); -#endif - return retval._retn (); - } - - ::DDS::ReturnCode_t - CCM_DDS_Publisher_i::delete_contained_entities (void) - { - return this->impl ()->delete_contained_entities (); - } - - ::DDS::ReturnCode_t - CCM_DDS_Publisher_i::set_qos (const ::DDS::PublisherQos & qos) - { - 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); -#else - return this->impl ()->set_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Publisher_i::get_qos (::DDS::PublisherQos & qos) - { - 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::ReturnCode_t retcode = this->impl()-> - get_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; -#else - return this->impl ()->get_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Publisher_i::set_listener (::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask) - { - 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; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_impl_list, - CCM_DDS_PublisherListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - return this->impl ()->set_listener (ccm_dds_impl_list, mask); -#else - return this->impl ()->set_listener (a_listener, mask); -#endif - } - - ::DDS::PublisherListener_ptr - CCM_DDS_Publisher_i::get_listener (void) - { - 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_pub_list); - if (!list_proxy) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Publisher_i::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::PublisherListener::_nil (); - } - return list_proxy->get_publisher_listener (); -#else - return this->impl ()->get_listener (); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Publisher_i::suspend_publications (void) - { - return this->impl ()->suspend_publications (); - } - - ::DDS::ReturnCode_t - CCM_DDS_Publisher_i::resume_publications (void) - { - return this->impl ()->resume_publications (); - } - - ::DDS::ReturnCode_t - CCM_DDS_Publisher_i::begin_coherent_changes (void) - { - return this->impl ()->begin_coherent_changes (); - } - - ::DDS::ReturnCode_t - CCM_DDS_Publisher_i::end_coherent_changes (void) - { - return this->impl ()->end_coherent_changes (); - } - - ::DDS::ReturnCode_t - 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); -#else - return this->impl ()->wait_for_acknowledgments (max_wait); -#endif - } - - ::DDS::DomainParticipant_ptr - CCM_DDS_Publisher_i::get_participant (void) - { - DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_participant"); - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDomainParticipant* p = this->impl ()->get_participant (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_DomainParticipant_i (p), - CORBA::NO_MEMORY ()); -#else - ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_DomainParticipant_i (p.in ()), - CORBA::NO_MEMORY ()); -#endif - return retval._retn (); - } - - ::DDS::ReturnCode_t - CCM_DDS_Publisher_i::set_default_datawriter_qos (const ::DDS::DataWriterQos & qos) - { - 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); -#else - return this->impl()->set_default_datawriter_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Publisher_i::get_default_datawriter_qos (::DDS::DataWriterQos & qos) - { - 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::ReturnCode_t retcode = - this->impl()->get_default_datawriter_qos (ccm_dds_qos); - qos <<= ccm_dds_qos; - return retcode; -#else - return this->impl()->get_default_datawriter_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Publisher_i::copy_from_topic_qos (::DDS::DataWriterQos & a_dataimpl_qos, - const ::DDS::TopicQos & a_impl_qos) - { - 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; - - ccm_dds_qos <<= a_dataimpl_qos; - ccm_dds_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; - return retcode; -#else - return this->impl()->copy_from_topic_qos (a_dataimpl_qos, - a_impl_qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Publisher_i::enable (void) - { - return this->impl ()->enable (); - } - - ::DDS::StatusCondition_ptr - CCM_DDS_Publisher_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSStatusCondition* sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); -#else - ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc.in ()), - CORBA::NO_MEMORY ()); -#endif - return retval._retn (); - } - - ::DDS::StatusMask - CCM_DDS_Publisher_i::get_status_changes (void) - { - return this->impl ()->get_status_changes (); - } - - ::DDS::InstanceHandle_t - CCM_DDS_Publisher_i::get_instance_handle (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; -#else - return this->impl ()->get_instance_handle (); -#endif - } - - DDSPublisher * - CCM_DDS_Publisher_i::get_impl (void) - { - return this->impl_; - } - - void - CCM_DDS_Publisher_i::set_impl (DDSPublisher * dw) - { - this->impl_ = dw; - } - - DDSPublisher * - CCM_DDS_Publisher_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/Publisher.h b/CIAO/connectors/dds4ccm/impl/dds/Publisher.h deleted file mode 100644 index 6943c2783da..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Publisher.h +++ /dev/null @@ -1,132 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_PUBLISHER_H -#define DDS4CCM_PUBLISHER_H - -#include "tao/LocalObject.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -# include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::Publisher DDSPublisher; -#endif - -#include "tao/LocalObject.h" - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_Publisher_i : - public virtual ::DDS::CCM_Publisher, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - CCM_DDS_Publisher_i (DDSPublisher * dw); - - /// Destructor - virtual ~CCM_DDS_Publisher_i (void); - - virtual - ::DDS::DataWriter_ptr create_datawriter (::DDS::Topic_ptr a_topic, - const ::DDS::DataWriterQos & qos, - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual - ::DDS::DataWriter_ptr create_datawriter_with_profile (::DDS::Topic_ptr a_topic, - const char* library_name, - const char *profile_name, - ::DDS::DataWriterListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual - ::DDS::ReturnCode_t delete_datawriter (::DDS::DataWriter_ptr a_datawriter); - - virtual - ::DDS::DataWriter_ptr lookup_datawriter (const char * impl_name); - - virtual - ::DDS::ReturnCode_t delete_contained_entities (void); - - virtual - ::DDS::ReturnCode_t set_qos (const ::DDS::PublisherQos & qos); - - virtual - ::DDS::ReturnCode_t get_qos (::DDS::PublisherQos & qos); - - virtual - ::DDS::ReturnCode_t set_listener (::DDS::PublisherListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual - ::DDS::PublisherListener_ptr get_listener (void); - - virtual - ::DDS::ReturnCode_t suspend_publications (void); - - virtual - ::DDS::ReturnCode_t resume_publications (void); - - virtual - ::DDS::ReturnCode_t begin_coherent_changes (void); - - virtual - ::DDS::ReturnCode_t end_coherent_changes (void); - - virtual - ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait); - - virtual - ::DDS::DomainParticipant_ptr get_participant (void); - - virtual - ::DDS::ReturnCode_t set_default_datawriter_qos (const ::DDS::DataWriterQos & qos); - - virtual - ::DDS::ReturnCode_t get_default_datawriter_qos (::DDS::DataWriterQos & qos); - - virtual - ::DDS::ReturnCode_t copy_from_topic_qos (::DDS::DataWriterQos & a_dataimpl_qos, - const ::DDS::TopicQos & a_impl_qos); - - virtual - ::DDS::ReturnCode_t enable (void); - - virtual - ::DDS::StatusCondition_ptr get_statuscondition (void); - - virtual - ::DDS::StatusMask get_status_changes (void); - - virtual - ::DDS::InstanceHandle_t get_instance_handle (void); - - DDSPublisher * get_impl (void); - - void set_impl (DDSPublisher *p); - - private: - DDSPublisher *impl_; - - DDSPublisher *impl (void); - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.cpp deleted file mode 100644 index 3c71be88f87..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.cpp +++ /dev/null @@ -1,114 +0,0 @@ -// $Id$ - -#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 "dds4ccm/idl/dds4ccm_BaseC.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_PublisherListener_i::CCM_DDS_PublisherListener_i ( ::DDS::PublisherListener_ptr p) - : impl_ (::DDS::PublisherListener::_duplicate (p)) - { - DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::CCM_DDS_PublisherListener_i"); - } - - CCM_DDS_PublisherListener_i::~CCM_DDS_PublisherListener_i (void) - { - DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::~CCM_DDS_PublisherListener_i"); - } - - void - CCM_DDS_PublisherListener_i::on_offered_deadline_missed ( - ::DDSDataWriter* writer, - const ::DDS_OfferedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_offered_deadline_missed"); - - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); - ACE_NEW (dds_writer, - CCM_DDS_DataWriter_i (writer)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::OfferedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus); -#else - this->impl_->on_offered_deadline_missed (dds_writer.in (), status); -#endif - } - - void - CCM_DDS_PublisherListener_i::on_offered_incompatible_qos ( - ::DDSDataWriter* writer, - const ::DDS_OfferedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_offered_incompatible_qos"); - - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); - ACE_NEW (dds_writer, - CCM_DDS_DataWriter_i (writer)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::OfferedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus); -#else - this->impl_->on_offered_incompatible_qos (dds_writer.in (), status); -#endif - } - - void - CCM_DDS_PublisherListener_i::on_liveliness_lost ( - ::DDSDataWriter* writer, - const ::DDS_LivelinessLostStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_liveliness_lost"); - - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); - ACE_NEW (dds_writer, - CCM_DDS_DataWriter_i (writer)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::LivelinessLostStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus); -#else - this->impl_->on_liveliness_lost (dds_writer.in (), status); -#endif - } - - void - CCM_DDS_PublisherListener_i::on_publication_matched ( - ::DDSDataWriter* writer, - const ::DDS_PublicationMatchedStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_publication_matched"); - - ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); - ACE_NEW (dds_writer, - CCM_DDS_DataWriter_i (writer)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::PublicationMatchedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_publication_matched (dds_writer.in (), ddsstatus); -#else - this->impl_->on_publication_matched (dds_writer.in (), status); -#endif - } - - ::DDS::PublisherListener_ptr - CCM_DDS_PublisherListener_i::get_publisher_listener (void) - { - return ::DDS::PublisherListener::_duplicate (this->impl_.in ()); - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.h deleted file mode 100644 index 0c408332357..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener.h +++ /dev/null @@ -1,76 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_PUBLISHERLISTENER_H -#define DDS4CCM_PUBLISHERLISTENER_H - -#include "tao/LocalObject.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -# include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::PublisherListener DDSPublisherListener; -typedef ::DDS::DataWriter DDSDataWriter; -typedef ::DDS::OfferedDeadlineMissedStatus DDS_OfferedDeadlineMissedStatus; -typedef ::DDS::OfferedIncompatibleQosStatus DDS_OfferedIncompatibleQosStatus; -typedef ::DDS::LivelinessLostStatus DDS_LivelinessLostStatus; -typedef ::DDS::PublicationMatchedStatus DDS_PublicationMatchedStatus; -#endif - -#include "tao/LocalObject.h" - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_PublisherListener_i : - public virtual ::DDSPublisherListener - { - public: - /// Constructor - CCM_DDS_PublisherListener_i (::DDS::PublisherListener_ptr p); - - /// Destructor - virtual ~CCM_DDS_PublisherListener_i (void); - - virtual void - on_offered_deadline_missed ( - ::DDSDataWriter *writer, - const ::DDS_OfferedDeadlineMissedStatus & status); - - virtual void - on_offered_incompatible_qos ( - ::DDSDataWriter *writer, - const ::DDS_OfferedIncompatibleQosStatus & status); - - virtual void - on_liveliness_lost ( - ::DDSDataWriter* writer, - const ::DDS_LivelinessLostStatus & status); - - virtual void - on_publication_matched ( - ::DDSDataWriter *writer, - const ::DDS_PublicationMatchedStatus & status); - - ::DDS::PublisherListener_ptr get_publisher_listener (void); - private: - ::DDS::PublisherListener_var impl_; - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp deleted file mode 100644 index 5eba489e62c..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp +++ /dev/null @@ -1,260 +0,0 @@ -// $Id$ -#include "dds4ccm/impl/dds/Utils.h" - -#include "dds4ccm/impl/dds/DataReader.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds/DataReaderHandler_T.h" -#include "dds4ccm/impl/dds/DDSCallbackStatusHandler.h" -#include "tao/ORB_Core.h" - -template -CIAO::DDS4CCM::PublisherListener_T::PublisherListener_T ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ACE_Reactor* reactor) - : error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)), - reactor_ (reactor) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::PublisherListener_T"); -} - -template -CIAO::DDS4CCM::PublisherListener_T::~PublisherListener_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::~PublisherListener_T"); -} - -template -void -CIAO::DDS4CCM::PublisherListener_T::on_unexpected_status ( - ::DDS::Entity_ptr entity, - ::DDS::StatusKind status_kind) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_unexpected_status"); - - if (!CORBA::is_nil (this->error_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnUnexpectedStatusHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnUnexpectedStatusHandler ( - this->error_listener_, entity, status_kind)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("PublisherListener_T::failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_unexpected_status (entity, status_kind); - } - } - catch (...) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, - ACE_TEXT ("PublisherListener_T::on_unexpected_status: ") - ACE_TEXT ("DDS Exception caught\n"))); - } - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ") - ACE_TEXT ("No error listener connected\n"))); - } -} - -template -void -CIAO::DDS4CCM::PublisherListener_T::on_offered_deadline_missed ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::OfferedDeadlineMissedStatus & status) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_offered_deadline_missed"); - - DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO - ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ") - ACE_TEXT ("total count <%d> - count change <%d> - ") - ACE_TEXT ("last instance handle - isValid <%d>\n"), - status.total_count, status.total_count_change, - status.last_instance_handle.length, - status.last_instance_handle.isValid)); - - if (!CORBA::is_nil (this->error_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnOfferedDeadlineMissedHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnOfferedDeadlineMissedHandler ( - this->error_listener_, the_Writer, status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("PublisherListener_T::failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_offered_deadline_missed (the_Writer, status); - } - } - catch (...) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ") - ACE_TEXT ("DDS Exception caught\n"))); - } - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ") - ACE_TEXT ("No error listener connected\n"))); - } -} - -template -void -CIAO::DDS4CCM::PublisherListener_T::on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::OfferedIncompatibleQosStatus & status) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_offered_incompatible_qos"); - - DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO - ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos: ") - ACE_TEXT ("total count <%d> - total change <%d> - ") - ACE_TEXT ("last policy id <%d> - policies "), - status.total_count, status.total_count_change, - status.last_policy_id)); - for (CORBA::ULong i = 0; i < status.policies.length (); ++i) - { - DDS4CCM_DEBUG (10, (LM_DEBUG, - ACE_TEXT ("\t\tid <%d> - count <%d>\n"), - status.policies[i].policy_id, - status.policies[i].count)); - } - - if (!CORBA::is_nil (this->error_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnOfferedIncompatibleQoSHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnOfferedIncompatibleQoSHandler ( - this->error_listener_, the_Writer, status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("PublisherListener_T::failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_offered_incompatible_qos (the_Writer, status); - } - } - catch (...) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos: ") - ACE_TEXT ("DDS Exception caught\n"))); - } - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos: ") - ACE_TEXT ("No error listener connected\n"))); - } -} - -template -void -CIAO::DDS4CCM::PublisherListener_T::on_liveliness_lost ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::LivelinessLostStatus & status) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_liveliness_lost"); - - DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO - ACE_TEXT ("PublisherListener_T::on_liveliness_lost: ") - ACE_TEXT ("total count <%d> - count change <%d>\n"), - status.total_count, status.total_count_change)); - - this->on_unexpected_status (the_Writer, ::DDS::LIVELINESS_LOST_STATUS); -} - -template -void -CIAO::DDS4CCM::PublisherListener_T::on_publication_matched ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::PublicationMatchedStatus & status) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_publication_matched"); - - DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO - ACE_TEXT ("PublisherListener_T::on_publication_matched: ") - ACE_TEXT ("total count <%d> - count change <%d> - ") - ACE_TEXT ("current count <%d> - current count change <%d> ") - ACE_TEXT ("last publication handle - isValid <%d>\n"), - status.total_count, status.total_count_change, - status.current_count, status.current_count_change, - status.last_subscription_handle.length, - status.last_subscription_handle.isValid)); - - this->on_unexpected_status (the_Writer, ::DDS::PUBLICATION_MATCHED_STATUS); -} - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -template -void -CIAO::DDS4CCM::PublisherListener_T::on_reliable_reader_activity_changed ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::ReliableReaderActivityChangedStatus & status) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_reliable_reader_activity_changed"); - - DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO - ACE_TEXT ("PublisherListener_T::on_reliable_reader_activity_changed: ") - ACE_TEXT ("active count <%d> - active change <%d> - ") - ACE_TEXT ("not active count <%d> - inactive count change <%d>") - ACE_TEXT ("last instance handle - isValid <%d>\n"), - status.active_count, status.active_count_change, - status.not_active_count, status.inactive_count_change, - status.last_instance_handle.length, - status.last_instance_handle.isValid)); - - this->on_unexpected_status (the_Writer, ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS); -} -#endif - -template -::DDS::StatusMask -CIAO::DDS4CCM::PublisherListener_T::get_mask ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener) -{ - if (!CORBA::is_nil (error_listener) || CIAO_debug_level >= 10) - { - return DDS_STATUS_MASK_ALL; -/* - ::DDS::OFFERED_DEADLINE_MISSED_STATUS | - ::DDS::OFFERED_INCOMPATIBLE_QOS_STATUS | -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS | -#endif - ::DDS::LIVELINESS_LOST_STATUS | - ::DDS::PUBLICATION_MATCHED_STATUS;*/ - } - else - { - return 0; - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.h b/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.h deleted file mode 100644 index d094cee1567..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.h +++ /dev/null @@ -1,78 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS_PUBLISHERLISTENER_T_H_ -#define DDS_PUBLISHERLISTENER_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - namespace DDS4CCM - { - template - class PublisherListener_T : - public ::DDS::PublisherListener, - private ACE_Copy_Disabled - { - public: - /// Constructor - PublisherListener_T ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ACE_Reactor* reactor); - - virtual void on_offered_deadline_missed ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::OfferedDeadlineMissedStatus & status); - - virtual void on_liveliness_lost ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::LivelinessLostStatus & status); - - virtual void on_offered_incompatible_qos ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::OfferedIncompatibleQosStatus & status); - - virtual void on_publication_matched ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::PublicationMatchedStatus & status); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual void on_reliable_reader_activity_changed ( - ::DDS::DataWriter_ptr the_Writer, - const ::DDS::ReliableReaderActivityChangedStatus & status); -#endif - - /// Destructor - virtual ~PublisherListener_T (void); - - static ::DDS::StatusMask get_mask ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener); - - private: - virtual void on_unexpected_status ( - ::DDS::Entity_ptr entity, - ::DDS::StatusKind status_kind); - - ::CCM_DDS::ConnectorStatusListener_var error_listener_; - - ACE_Reactor* reactor_; - }; - } -} - -#include "dds4ccm/impl/dds/PublisherListener_T.cpp" - -#endif /* DDS_PUBLISHERLISTENER_T_H_ */ - diff --git a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp b/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp deleted file mode 100644 index 84f742d3e10..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp +++ /dev/null @@ -1,134 +0,0 @@ -// $Id$ - -#include "QueryCondition.h" -#include "Subscriber.h" -#include "DataReader.h" - -#include "ndds/StringSeq.h" - -#include "dds4ccm/idl/dds4ccm_BaseC.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_QueryCondition_i::CCM_DDS_QueryCondition_i (DDSQueryCondition * qc) - : impl_ (qc) - { - } - - CCM_DDS_QueryCondition_i::~CCM_DDS_QueryCondition_i (void) - { - } - - ::CORBA::Boolean - CCM_DDS_QueryCondition_i::get_trigger_value (void) - { - return this->impl ()->get_trigger_value (); - } - - ::DDS::SampleStateMask - CCM_DDS_QueryCondition_i::get_sample_state_mask (void) - { - return this->impl ()->get_sample_state_mask (); - } - - ::DDS::ViewStateMask - CCM_DDS_QueryCondition_i::get_view_state_mask (void) - { - return this->impl ()->get_view_state_mask (); - } - - ::DDS::InstanceStateMask - CCM_DDS_QueryCondition_i::get_instance_state_mask (void) - { - return this->impl ()->get_instance_state_mask (); - } - - ::DDS::DataReader_ptr - CCM_DDS_QueryCondition_i::get_datareader (void) - { - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDSDataReader* reader = this->impl ()->get_datareader (); - if (reader) - { - ACE_NEW_THROW_EX (dds_reader, - CCM_DDS_DataReader_i (reader), - CORBA::NO_MEMORY ()); - } -#else - ::DDS::DataReader_var reader = this->impl ()->get_datareader (); - if (!CORBA::is_nil (reader.in ())) - { - ACE_NEW_THROW_EX (dds_reader, - CCM_DDS_DataReader_i (reader.in ()), - CORBA::NO_MEMORY ()); - } -#endif - return dds_reader._retn (); - } - - char * - CCM_DDS_QueryCondition_i::get_query_expression (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - return ::CORBA::string_dup (this->impl ()->get_query_expression ()); -#else - return this->impl ()->get_query_expression (); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_QueryCondition_i::get_query_parameters ( - ::DDS::StringSeq & query_parameters) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_StringSeq parameters; - ::DDS::ReturnCode_t const retval = this->impl ()->get_query_parameters (parameters); - query_parameters <<= parameters; - return retval; -#else - return this->impl ()->get_query_parameters (query_parameters); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_QueryCondition_i::set_query_parameters ( - const ::DDS::StringSeq & query_parameters) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_StringSeq parameters; - parameters <<= query_parameters; - return this->impl ()->set_query_parameters (parameters); -#else - return this->impl ()->set_query_parameters (query_parameters); -#endif - } - - DDSQueryCondition * - CCM_DDS_QueryCondition_i::get_impl (void) - { - return this->impl_; - } - - void - CCM_DDS_QueryCondition_i::set_impl (DDSQueryCondition * dw) - { - this->impl_ = dw; - } - - DDSQueryCondition * - CCM_DDS_QueryCondition_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.h b/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.h deleted file mode 100644 index 5fd66fc5584..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.h +++ /dev/null @@ -1,75 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_QUERYCONDITION_H -#define DDS4CCM_QUERYCONDITION_H - -#include "tao/LocalObject.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -#include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::QueryCondition DDSQueryCondition; -#endif - -#include "tao/LocalObject.h" - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_QueryCondition_i : - public virtual ::DDS::CCM_QueryCondition, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - CCM_DDS_QueryCondition_i (DDSQueryCondition * qc); - - /// Destructor - virtual ~CCM_DDS_QueryCondition_i (void); - - virtual ::CORBA::Boolean get_trigger_value (void); - - virtual ::DDS::SampleStateMask get_sample_state_mask (void); - - virtual ::DDS::ViewStateMask get_view_state_mask (void); - - virtual ::DDS::InstanceStateMask get_instance_state_mask (void); - - virtual ::DDS::DataReader_ptr get_datareader (void); - - virtual char *get_query_expression (void); - - virtual ::DDS::ReturnCode_t - get_query_parameters (::DDS::StringSeq & query_parameters); - - virtual ::DDS::ReturnCode_t - set_query_parameters (const ::DDS::StringSeq & query_parameters); - - DDSQueryCondition * get_impl (void); - - void set_impl (DDSQueryCondition * qc); - - private: - DDSQueryCondition * impl_; - - DDSQueryCondition * impl (); - }; - } -} - -#endif /* DDS4CCM_QUERYCONDITION_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ReadCondition.cpp b/CIAO/connectors/dds4ccm/impl/dds/ReadCondition.cpp deleted file mode 100644 index e8459b51e0a..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ReadCondition.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// $Id$ - -#include "ReadCondition.h" -#include "DataReader.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_ReadCondition_i::CCM_DDS_ReadCondition_i (DDSReadCondition * rc) - : impl_ (rc) - { - } - - CCM_DDS_ReadCondition_i::~CCM_DDS_ReadCondition_i (void) - { - } - - ::CORBA::Boolean - CCM_DDS_ReadCondition_i::get_trigger_value (void) - { - return this->impl ()->get_trigger_value (); - } - - ::DDS::SampleStateMask - CCM_DDS_ReadCondition_i::get_sample_state_mask (void) - { - return this->impl ()->get_sample_state_mask (); - } - - ::DDS::ViewStateMask - CCM_DDS_ReadCondition_i::get_view_state_mask (void) - { - return this->impl ()->get_view_state_mask (); - } - - ::DDS::InstanceStateMask - CCM_DDS_ReadCondition_i::get_instance_state_mask (void) - { - return this->impl ()->get_instance_state_mask (); - } - - ::DDS::DataReader_ptr - CCM_DDS_ReadCondition_i::get_datareader (void) - { - ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); - ::DDSDataReader* rd = this->impl ()->get_datareader (); - if (rd) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_DataReader_i (rd), - CORBA::NO_MEMORY ()); - } - return retval._retn (); - } - - DDSReadCondition * - CCM_DDS_ReadCondition_i::get_impl (void) - { - return this->impl_; - } - - void - CCM_DDS_ReadCondition_i::set_impl (DDSReadCondition * rc) - { - this->impl_ = rc; - } - - DDSReadCondition * - CCM_DDS_ReadCondition_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/ReadCondition.h b/CIAO/connectors/dds4ccm/impl/dds/ReadCondition.h deleted file mode 100644 index 450102cb5b2..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ReadCondition.h +++ /dev/null @@ -1,72 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_READCONDITION_H -#define DDS4CCM_READCONDITION_H - -#include "tao/LocalObject.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -#include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::ReadCondition DDSReadCondition; -#endif - -#include "tao/LocalObject.h" - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_ReadCondition_i : - public virtual ::DDS::CCM_ReadCondition, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - CCM_DDS_ReadCondition_i (DDSReadCondition * rc); - - /// Destructor - virtual ~CCM_DDS_ReadCondition_i (void); - - virtual ::CORBA::Boolean - get_trigger_value (void); - - virtual ::DDS::SampleStateMask - get_sample_state_mask (void); - - virtual ::DDS::ViewStateMask - get_view_state_mask (void); - - virtual ::DDS::InstanceStateMask - get_instance_state_mask (void); - - virtual ::DDS::DataReader_ptr - get_datareader (void); - - DDSReadCondition * get_impl (void); - - void set_impl (DDSReadCondition * rc); - - private: - DDSReadCondition *impl_; - - DDSReadCondition * impl (void); - }; - } -} - -#endif /* DDS4CCM_READCONDITION_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/Reader_T.cpp deleted file mode 100644 index 8989c8a1b1d..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Reader_T.cpp +++ /dev/null @@ -1,573 +0,0 @@ -// $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/logger/Log_Macros.h" - -template -CIAO::DDS4CCM::DDS_CCM::Reader_T::Reader_T (void) - : topic_ (0), - library_name_ (""), - profile_name_ (""), - impl_ (0) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Reader_T::Reader_T"); - #if defined DDS4CCM_USES_QUERY_CONDITION - this->qc_ = DDS::QueryCondition::_nil (); - #else - this->cft_ = ::DDS::ContentFilteredTopic::_nil (); - #endif -} - -template -CIAO::DDS4CCM::DDS_CCM::Reader_T::~Reader_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Reader_T::~Reader_T"); -} - -template -typename DDS_TYPE::data_reader * -CIAO::DDS4CCM::DDS_CCM::Reader_T::impl (void) -{ - if (this->impl_) - { - return this->impl_; - } - else - { - throw ::CORBA::BAD_INV_ORDER (); - } -} - -// For the requirement : 'samples ordered by instances' the following settings are necessary: -// ordered_access -> true and DDS_INSTANCE_PRESENTATION_QOS (default) . -template -CORBA::ULong -CIAO::DDS4CCM::DDS_CCM::Reader_T::get_nr_valid_samples ( - const DDS_SampleInfoSeq& sample_info, - bool determine_last) -{ - CORBA::ULong nr_of_samples = 0; - for (::DDS_Long i = 0 ; i < sample_info.length(); ++i) - { - if (determine_last) - { - if (sample_info[i].sample_rank == 0 && sample_info[i].valid_data) - { - ++nr_of_samples; - } - } - else if (sample_info[i].valid_data) - { - ++nr_of_samples; - } - } - return nr_of_samples; -} - -template -void -CIAO::DDS4CCM::DDS_CCM::Reader_T::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, - 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 - ") - ACE_TEXT ("retval is %C\n"), translate_retcode(retval))); - throw ::CCM_DDS::InternalError (retval, 0); - } -} - - -template -void -CIAO::DDS4CCM::DDS_CCM::Reader_T::read_last ( - typename CCM_TYPE::seq_type::_out_type instances, - ::CCM_DDS::ReadInfoSeq_out infos) -{ - // This function has to return the last sample of all instances - DDS_SampleInfoSeq sample_info; - typename DDS_TYPE::dds_seq_type data; - - 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 ()); - - 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 - ") - ACE_TEXT ("total number of samples <%u> - ") - ACE_TEXT ("last number of samples <%u>\n"), - data.length(), - nr_of_last_samples)); - CORBA::ULong ix = 0; - - infoseq->length (nr_of_last_samples); - inst_seq->length (nr_of_last_samples); - - // We need only the last sample of each instance - for (::DDS_Long i = 0 ; i < sample_info.length(); ++i) - { - if((sample_info[i].sample_rank == 0) && (sample_info[i].valid_data)) - { - (*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; -} - -template -void -CIAO::DDS4CCM::DDS_CCM::Reader_T::read_all ( - typename CCM_TYPE::seq_type::_out_type instances, - ::CCM_DDS::ReadInfoSeq_out infos) -{ - // This function has to return all samples of all instances - DDS_SampleInfoSeq sample_info; - typename DDS_TYPE::dds_seq_type data; - - 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 - ") - 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 ()); - - infoseq->length (nr_of_valid_samples); - inst_seq->length (nr_of_valid_samples); - - CORBA::ULong ix = 0; - - for (::DDS_Long i = 0 ; i < sample_info.length(); ++i) - { - if(sample_info[i].valid_data) - { - (*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; -} - -template -DDS_InstanceHandle_t -CIAO::DDS4CCM::DDS_CCM::Reader_T::check_handle ( - const typename DDS_TYPE::value_type& an_instance, - const ::DDS::InstanceHandle_t & instance_handle) -{ - DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; - hnd <<= instance_handle; - - DDS_InstanceHandle_t const lookup_hnd = - this->impl ()->lookup_instance (an_instance); - if (!DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL) && - !DDS_InstanceHandle_equals (&hnd, &lookup_hnd)) - { - throw ::CCM_DDS::InternalError (0, 0); - } - if (DDS_InstanceHandle_equals (&lookup_hnd, &::DDS_HANDLE_NIL)) - { - throw ::CCM_DDS::NonExistent (); - } - return lookup_hnd; -} - -template -void -CIAO::DDS4CCM::DDS_CCM::Reader_T::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 - ") - ACE_TEXT ("Reading with instance.\n"))); - DDS_ReturnCode_t const retval = this->impl ()->read_instance ( - data, - sample_info, - DDS_LENGTH_UNLIMITED, - lookup_hnd, - DDS_READ_SAMPLE_STATE | DDS_NOT_READ_SAMPLE_STATE , - DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, - DDS_ALIVE_INSTANCE_STATE); - 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 - ") - ACE_TEXT ("retval is %C\n"), translate_retcode(retval))); - throw ::CCM_DDS::InternalError (retval, 0); - } -} - -template -void -CIAO::DDS4CCM::DDS_CCM::Reader_T::read_one_last ( - typename DDS_TYPE::value_type& an_instance, - ::CCM_DDS::ReadInfo_out info, - const ::DDS::InstanceHandle_t & instance_handle) -{ - DDS_InstanceHandle_t const lookup_hnd = this->check_handle (an_instance, instance_handle); - - DDS_SampleInfoSeq sample_info; - typename DDS_TYPE::dds_seq_type data; - - // For now, only read with instance... - this->read_with_instance (data, lookup_hnd, sample_info); - - ::DDS_Long sample = data.length(); - DDS4CCM_DEBUG (6, (LM_INFO, - ACE_TEXT ("CIAO::DDS4CCM::DDS_CCM::Reader_T::read_one_last - ") - ACE_TEXT ("total number of samples <%u>\n"), - sample)); - while (sample >= 0 && !sample_info[sample-1].valid_data) - { - --sample; - } - if (sample >= 0) - { - if(sample_info[sample-1].valid_data) - { - an_instance = data[sample-1]; - info <<= sample_info[sample-1]; - } - } - // Return the loan - this->impl ()->return_loan(data, sample_info); -} - -template -void -CIAO::DDS4CCM::DDS_CCM::Reader_T::read_one_all ( - const typename DDS_TYPE::value_type& an_instance, - typename CCM_TYPE::seq_type::_out_type instances, - ::CCM_DDS::ReadInfoSeq_out infos, - const ::DDS::InstanceHandle_t & instance_handle) -{ - DDS_InstanceHandle_t const lookup_hnd = - this->check_handle (an_instance, instance_handle); - - DDS_SampleInfoSeq sample_info; - typename DDS_TYPE::dds_seq_type data; - - this->read_with_instance (data, lookup_hnd, sample_info); - - // 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 - ") - 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 ()); - - infoseq->length (nr_of_valid_samples); - inst_seq->length (nr_of_valid_samples); - - // Copy the valid samples - CORBA::ULong ix = 0; - for (::DDS_Long i = 0 ; i < sample_info.length(); ++i) - { - if(sample_info[i].valid_data) - { - (*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; -} - -template -void -CIAO::DDS4CCM::DDS_CCM::Reader_T::create_filter ( - const ::CCM_DDS::QueryFilter & filter) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::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 - " - "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 - " - "Error: Unable to get Participant.\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1); - } - - this->cft_ = dp->create_contentfilteredtopic ( - "DDS4CCMContentFilteredTopic", - this->topic_.in (), - filter.query, - filter.query_parameters); - if (CORBA::is_nil (this->cft_)) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::create_filter - " - "Error: Unable to create ContentFilteredTopic.\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1); - } - ::DDS::DataReaderListener_var listener = this->reader_->get_listener (); - CCM_DDS::PortStatusListener_ptr psl = CCM_DDS::PortStatusListener::_nil (); - if (!CORBA::is_nil (listener)) - { - psl = dynamic_cast (listener.in ()); - this->reader_->set_listener (::DDS::DataReaderListener::_nil (), 0); - } - ::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 - " - "Error: Unable to delete DataReader.\n")); - } - this->reader_ = ::DDS::CCM_DataReader::_nil (); - - ::DDS::DataReader_var reader = ::DDS::DataReader::_nil (); - if (this->library_name_.length () > 0 && - this->profile_name_.length () > 0) - { - reader = sub->create_datareader_with_profile ( - this->cft_, - this->library_name_.c_str (), - this->profile_name_.c_str (), - listener, - ::CIAO::DDS4CCM::PortStatusListener_T::get_mask ( - psl)); - } - else - { - ::DDS::DataReaderQos drqos; - reader = sub->create_datareader ( - this->cft_, - drqos, - listener, - ::CIAO::DDS4CCM::PortStatusListener_T::get_mask ( - psl)); - } - if (CORBA::is_nil(reader)) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::create_filter - " - "Error: Unable to create a new DataReader.\n")); - } - this->reader_ = ::DDS::CCM_DataReader::_narrow (reader); - this->set_impl (reader); -} - -template - ::CCM_DDS::QueryFilter * - CIAO::DDS4CCM::DDS_CCM::Reader_T::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 - " - "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 ()); - filter->query = this->qc_->get_query_expression (); - this->qc_->get_query_parameters (filter->query_parameters); - return filter._retn (); - #else - if (CORBA::is_nil (this->cft_)) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::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 ()); - 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 - " - "Error getting expression_parameters. " - "Retval is %C\n", - translate_retcode(retval))); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, retval); - } - return filter._retn (); - #endif -} - -template -void -CIAO::DDS4CCM::DDS_CCM::Reader_T::filter ( - const ::CCM_DDS::QueryFilter & filter) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Reader_T::filter"); - #if defined DDS4CCM_USES_QUERY_CONDITION - if (CORBA::is_nil (this->qc_)) - { - this->qc_ = this->impl ()->create_querycondition ( - DDS_READ_SAMPLE_STATE | DDS_NOT_READ_SAMPLE_STATE, - DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, - DDS_ALIVE_INSTANCE_STATE, - filter.query, - filter.query_parameters); - if (CORBA::is_nil (this->qc_)) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::filter - " - "Error creating query condition.")); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1); - } - } - else - { - ::DDS::ReturnCode_t retval = this->qc_->set_query_parameters ( - filter.query_parameters); - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::filter - " - "Error setting expression_parameters. " - "Retval is %C\n", - translate_retcode(retval))); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, retval); - } - } - #else - if (CORBA::is_nil (this->cft_)) - { - this->create_filter (filter); - } - else - { - ::DDS::ReturnCode_t retval = this->cft_->set_expression_parameters ( - filter.query_parameters); - if (retval != ::DDS::RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::filter - " - "Error setting expression_parameters. " - "Retval is %C\n", - translate_retcode(retval))); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, retval); - } - } - #endif -} - -template -void -CIAO::DDS4CCM::DDS_CCM::Reader_T::set_qos ( - ::DDS::Topic_ptr topic, - const char * library_name, - const char * profile_name) -{ - this->library_name_ = library_name; - this->profile_name_ = profile_name; - this->topic_ = topic; -} - -template -void -CIAO::DDS4CCM::DDS_CCM::Reader_T::set_impl ( - ::DDS::DataReader_ptr reader) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::DDS_CCM::Reader_T::set_impl"); - - if (::CORBA::is_nil (reader)) - { - this->impl_ = 0; - } - else - { - this->reader_ = reader; - CCM_DDS_DataReader_i *rdr = dynamic_cast (reader); - - if (!rdr) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::data_reader - " - "Unable to cast provided DataReader to servant\n")); - throw ::CORBA::INTERNAL (); - } - - this->impl_ = DDS_TYPE::data_reader::narrow (rdr->get_impl ()); - - if (!this->impl ()) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::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/dds/Reader_T.h deleted file mode 100644 index 056920f1921..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Reader_T.h +++ /dev/null @@ -1,112 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ -#ifndef DDS_READER_T -#define DDS_READER_T - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::InstanceHandle_t DDS_InstanceHandle_t; -typedef ::DDS::SampleInfoSeq DDS_SampleInfoSeq; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - namespace DDS_CCM - { - template - class Reader_T : - public virtual CCM_TYPE::reader_type, - public virtual ::CORBA::LocalObject, - private virtual ACE_Copy_Disabled - { - public: - /// Constructor - Reader_T (void); - - /// Destructor - virtual ~Reader_T (void); - - virtual void read_last ( - typename CCM_TYPE::seq_type::_out_type instances, - ::CCM_DDS::ReadInfoSeq_out infos); - - virtual void read_all ( - typename CCM_TYPE::seq_type::_out_type instances, - ::CCM_DDS::ReadInfoSeq_out infos); - - virtual void read_one_last ( - typename DDS_TYPE::value_type& an_instance, - ::CCM_DDS::ReadInfo_out info, - const ::DDS::InstanceHandle_t & instance_handle); - - virtual void read_one_all ( - const typename DDS_TYPE::value_type& an_instance, - typename CCM_TYPE::seq_type::_out_type instances, - ::CCM_DDS::ReadInfoSeq_out infos, - const ::DDS::InstanceHandle_t & instance_handle); - - virtual ::CCM_DDS::QueryFilter *filter (void); - - virtual void filter (const ::CCM_DDS::QueryFilter & filter); - - void set_impl (::DDS::DataReader_ptr reader); - void set_qos ( - ::DDS::Topic_ptr topic, - const char * libary_name, - const char * profile_name); - - private: - ::DDS::Topic_var topic_; - ::DDS::DataReader_var reader_; - - ACE_CString library_name_; - ACE_CString profile_name_; - - #if defined DDS4CCM_USES_QUERY_CONDITION - DDS::QueryCondition_var qc_; - #else - DDS::ContentFilteredTopic_var cft_; - #endif - - typename DDS_TYPE::data_reader * impl_; - - typename DDS_TYPE::data_reader * impl (void); - - DDS_InstanceHandle_t check_handle ( - const typename DDS_TYPE::value_type& an_instance, - const ::DDS::InstanceHandle_t & instance_handle); - - void read_with_instance ( - typename DDS_TYPE::dds_seq_type & data, - const ::DDS_InstanceHandle_t & lookup_hnd, - DDS_SampleInfoSeq & sample_info); - - void read_without_instance ( - typename DDS_TYPE::dds_seq_type & data, - DDS_SampleInfoSeq & sample_info); - - CORBA::ULong get_nr_valid_samples ( - const DDS_SampleInfoSeq & sample_info, - bool determine_last = false); - - void create_filter ( - const ::CCM_DDS::QueryFilter & filter); - }; - } - } -} - -#include "dds4ccm/impl/dds/Reader_T.cpp" - -#endif /* DDS_READER_T */ - diff --git a/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.cpp deleted file mode 100644 index 197e999eae8..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// -*- C++ -*- -// $Id$ - -template -CCM_DDS_StateListenerControl_T::CCM_DDS_StateListenerControl_T (void) - : is_filter_interpreted_ (false) -{ - DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::CCM_DDS_StateListenerControl_T"); -} - -template -CCM_DDS_StateListenerControl_T::~CCM_DDS_StateListenerControl_T (void) -{ - DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::~CCM_DDS_StateListenerControl_T"); -} - -template -::CORBA::Boolean -CCM_DDS_StateListenerControl_T::is_filter_interpreted (void) -{ - DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::is_filter_interpreted"); - - return this->is_filter_interpreted_.value (); -} - -template -void -CCM_DDS_StateListenerControl_T::is_filter_interpreted ( - ::CORBA::Boolean is_filter_interpreted) -{ - DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::is_filter_interpreted"); - - this->is_filter_interpreted_ = is_filter_interpreted; -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.h deleted file mode 100644 index bbee0e73a71..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/StateListenerControl_T.h +++ /dev/null @@ -1,38 +0,0 @@ -// -*- C++ -*- -// $Id$ - -#ifndef DDS4CCM_STATELISTENERCONTROLI_H_ -#define DDS4CCM_STATELISTENERCONTROLI_H_ - -#include "dds4ccm/impl/dds/DataListenerControl_T.h" -#include "dds4ccm/idl/dds4ccm_StateListenerControlEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -#pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -template -class CCM_DDS_StateListenerControl_T - : public virtual CCM_DDS_DataListenerControl_T -{ -public: - /// Constructor - CCM_DDS_StateListenerControl_T (void); - - /// Destructor - virtual ~CCM_DDS_StateListenerControl_T (void); - - /// Set the is_filter_interpreted - virtual ::CORBA::Boolean is_filter_interpreted (void); - - /// Get the is_filter_interpreted - virtual void is_filter_interpreted (::CORBA::Boolean is_filter_interpreted); - -private: - ACE_Atomic_Op is_filter_interpreted_; -}; - -#include "dds4ccm/impl/dds/StateListenerControl_T.cpp" - -#endif /* DDS4CCM_STATELISTENERCONTROLI_H_ */ - diff --git a/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.cpp b/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.cpp deleted file mode 100644 index 37baef77d72..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.cpp +++ /dev/null @@ -1,72 +0,0 @@ -// $Id$ - -#include "StatusCondition.h" -#include "Subscriber.h" - -#include "dds4ccm/idl/dds4ccm_BaseC.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_StatusCondition_i::CCM_DDS_StatusCondition_i ( - DDSStatusCondition * sc) : - impl_ (sc) - { - } - - CCM_DDS_StatusCondition_i::~CCM_DDS_StatusCondition_i (void) - { - } - - ::CORBA::Boolean - CCM_DDS_StatusCondition_i::get_trigger_value (void) - { - return this->impl ()->get_trigger_value (); - } - - ::DDS::StatusMask - CCM_DDS_StatusCondition_i::get_enabled_statuses (void) - { - return this->impl ()->get_enabled_statuses (); - } - - ::DDS::ReturnCode_t - CCM_DDS_StatusCondition_i::set_enabled_statuses ( - ::DDS::StatusMask mask) - { - return this->impl ()->set_enabled_statuses (mask); - } - - ::DDS::Entity_ptr - CCM_DDS_StatusCondition_i::get_entity (void) - { - throw CORBA::NO_IMPLEMENT (); - } - - DDSStatusCondition * - CCM_DDS_StatusCondition_i::get_impl (void) - { - return this->impl_; - } - - void - CCM_DDS_StatusCondition_i::set_impl (DDSStatusCondition * sc) - { - this->impl_ = sc; - } - - DDSStatusCondition * - CCM_DDS_StatusCondition_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.h b/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.h deleted file mode 100644 index 1cccb4a3fa1..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/StatusCondition.h +++ /dev/null @@ -1,64 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_STATUSCONDITION_H -#define DDS4CCM_STATUSCONDITION_H - -#include "tao/LocalObject.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -# include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::StatusCondition DDSStatusCondition; -#endif - -#include "tao/LocalObject.h" - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_StatusCondition_i : - public virtual ::DDS::CCM_StatusCondition, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - CCM_DDS_StatusCondition_i (DDSStatusCondition *sc); - - /// Destructor - virtual ~CCM_DDS_StatusCondition_i (void); - - virtual ::CORBA::Boolean get_trigger_value (void); - - virtual ::DDS::StatusMask get_enabled_statuses (void); - - virtual ::DDS::ReturnCode_t set_enabled_statuses (::DDS::StatusMask mask); - - virtual ::DDS::Entity_ptr get_entity (void); - - DDSStatusCondition * get_impl (void); - - void set_impl (DDSStatusCondition * sc); - - private: - DDSStatusCondition * impl_; - DDSStatusCondition * impl (void); - }; - } -} - -#endif /* DDS4CCM_STATUSCONDITION_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/dds/Subscriber.cpp deleted file mode 100644 index 51f57c7b4b1..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Subscriber.cpp +++ /dev/null @@ -1,531 +0,0 @@ -// $Id$ - -#include "Subscriber.h" -#include "SubscriberListener.h" -#include "Topic.h" -#include "ContentFilteredTopic.h" -#include "DataReader.h" -#include "DataReaderListener.h" -#include "Utils.h" -#include "StatusCondition.h" - -#include "ndds/InstanceHandle_t.h" -#include "ndds/DataReaderQos.h" -#include "ndds/SubscriberQos.h" -#include "ndds/TopicQos.h" - -#include "dds4ccm/idl/dds4ccm_BaseC.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_Subscriber_i::CCM_DDS_Subscriber_i (DDSSubscriber * sub) - : impl_ (sub) - { - DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::CCM_DDS_Subscriber_i"); - } - - CCM_DDS_Subscriber_i::~CCM_DDS_Subscriber_i (void) - { - DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::~CCM_DDS_Subscriber_i"); - } - - ::DDS::ReturnCode_t - CCM_DDS_Subscriber_i::enable (void) - { - return this->impl ()->enable (); - } - - ::DDS::StatusCondition_ptr - CCM_DDS_Subscriber_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSStatusCondition* sc = this->impl ()->get_statuscondition (); - if (sc) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); - } -#else - ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - if (!CORBA::is_nil (sc.in ())) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc.in ()), - CORBA::NO_MEMORY ()); - } -#endif - return retval._retn (); - } - - ::DDS::StatusMask - CCM_DDS_Subscriber_i::get_status_changes (void) - { - return this->impl ()->get_status_changes (); - } - - ::DDS::InstanceHandle_t - CCM_DDS_Subscriber_i::get_instance_handle (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; -#else - return this->impl ()->get_instance_handle (); -#endif - } - - DDSDataReader * - CCM_DDS_Subscriber_i::create_datareader ( - DDSContentFilteredTopic * topic, - DDSDataReaderListener * ccm_dds_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; - return this->impl ()->create_datareader (topic, - ccm_dds_qos, - ccm_dds_drl, - mask); -#else - return this->impl ()->create_datareader (topic, - qos, - ccm_dds_drl, - mask); -#endif - } - - DDSDataReader * - CCM_DDS_Subscriber_i::create_datareader ( - DDSTopic * topic, - DDSDataReaderListener * ccm_dds_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; - return this->impl ()->create_datareader (topic, - ccm_dds_qos, - ccm_dds_drl, - mask); -#else - return this->impl ()->create_datareader (topic, - qos, - ccm_dds_drl, - mask); -#endif - } - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDataReader * - CCM_DDS_Subscriber_i::create_datareader_with_profile ( - DDSContentFilteredTopic * topic, - const char * library_name, - const char * profile_name, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask) - { - return this->impl ()->create_datareader_with_profile (topic, - library_name, - profile_name, - ccm_dds_drl, - mask); - } -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDataReader * - CCM_DDS_Subscriber_i::create_datareader_with_profile ( - DDSTopic * topic, - const char * library_name, - const char * profile_name, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask) - { - return this->impl ()->create_datareader_with_profile (topic, - library_name, - profile_name, - ccm_dds_drl, - mask); - } -#endif - - ::DDS::DataReader_ptr - CCM_DDS_Subscriber_i::create_datareader ( - ::DDS::TopicDescription_ptr a_topic, - const ::DDS::DataReaderQos & qos, - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::create_datareader"); - ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); - DDSDataReaderListener *ccm_dds_drl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_drl, - CCM_DDS_DataReaderListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - - DDSDataReader * ccm_dds_dr = 0; - CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); - - if (!topic) - { - CCM_DDS_ContentFilteredTopic_i * cf_topic = - dynamic_cast < CCM_DDS_ContentFilteredTopic_i * > (a_topic); - if (!cf_topic) - { - 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; - 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); - } - else - ccm_dds_dr = this->create_datareader (topic->get_impl (), ccm_dds_drl, mask, qos); - - if (!ccm_dds_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; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - " - "Successfully created datareader.\n")); - } - - ccm_dds_dr->enable (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_DataReader_i (ccm_dds_dr), - CORBA::NO_MEMORY ()); - return retval._retn (); - } - - ::DDS::DataReader_ptr - CCM_DDS_Subscriber_i::create_datareader_with_profile ( - ::DDS::TopicDescription_ptr a_topic, - const char * library_name, - const char * profile_name, - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::create_datareader_with_profile"); - ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); - DDSDataReaderListener *ccm_dds_drl = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_drl, - CCM_DDS_DataReaderListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - - DDSDataReader * ccm_dds_dr = 0; - CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); - - if (!topic) - { - CCM_DDS_ContentFilteredTopic_i * cf_topic = - dynamic_cast < CCM_DDS_ContentFilteredTopic_i * > (a_topic); - if (!cf_topic) - { - 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; - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); - } - else - ccm_dds_dr = this->create_datareader_with_profile (cf_topic->get_impl (), - library_name, - profile_name, - ccm_dds_drl, - mask); - } - else - ccm_dds_dr = this->create_datareader_with_profile (topic->get_impl (), - library_name, - profile_name, - ccm_dds_drl, - mask); - - if (!ccm_dds_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; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - " - "Successfully created datareader with profile <%C#%C>.\n", - library_name, - profile_name)); - } - - ccm_dds_dr->enable (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_DataReader_i (ccm_dds_dr), - CORBA::NO_MEMORY ()); - return retval._retn (); - } - - ::DDS::ReturnCode_t - CCM_DDS_Subscriber_i::delete_datareader ( - ::DDS::DataReader_ptr a_datareader) - { - CCM_DDS_DataReader_i *dr = dynamic_cast< CCM_DDS_DataReader_i *> (a_datareader); - if (!dr) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - " - "Unable to cast provided object reference to servant.\n")); - return ::DDS::RETCODE_BAD_PARAMETER; - } - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - " - "Successfully casted provided object reference to servant.\n")); - - DDS_ReturnCode_t const retval = this->impl ()->delete_datareader (dr->get_impl ()); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - " - "Error: Returned non-ok error code %C\n", - translate_retcode (retval))); - } - else - { - DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - " - "Datareader successfully deleted\n")); - } - - return retval; - } - - ::DDS::ReturnCode_t - CCM_DDS_Subscriber_i::delete_contained_entities (void) - { - return this->impl ()->delete_contained_entities (); - } - - ::DDS::DataReader_ptr - CCM_DDS_Subscriber_i::lookup_datareader ( - const char * impl_name) - { - ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); - DDSDataReader* dr = this->impl ()->lookup_datareader (impl_name); - if (dr) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_DataReader_i (dr), - CORBA::NO_MEMORY ()); - } - return retval._retn (); - } - - ::DDS::ReturnCode_t - CCM_DDS_Subscriber_i::get_datareaders ( - ::DDS::DataReaderSeq & /*readers*/, - ::DDS::SampleStateMask /*sample_states*/, - ::DDS::ViewStateMask /*view_states*/, - ::DDS::InstanceStateMask /*instance_states*/) - { - throw CORBA::NO_IMPLEMENT (); - // Add your implementation here - } - - ::DDS::ReturnCode_t - CCM_DDS_Subscriber_i::notify_datareaders (void) - { - return this->impl ()->notify_datareaders (); - } - - ::DDS::ReturnCode_t - CCM_DDS_Subscriber_i::set_qos ( - const ::DDS::SubscriberQos & qos) - { - 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); -#else - return this->impl ()->set_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Subscriber_i::get_qos ( - ::DDS::SubscriberQos & qos) - { - 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; - return retcode; -#else - return this->impl ()->get_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Subscriber_i::set_listener ( - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask) - { - DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::set_listener"); - - CCM_DDS_SubscriberListener_i* ccm_dds_impl_list = 0; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_impl_list, - CCM_DDS_SubscriberListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - return this->impl ()->set_listener (ccm_dds_impl_list, mask); - } - - ::DDS::SubscriberListener_ptr - CCM_DDS_Subscriber_i::get_listener (void) - { - 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_impl_list); - if (!list_proxy) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Subscriber_i::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::SubscriberListener::_nil (); - } - return list_proxy->get_subscriber_listener (); - } - - ::DDS::ReturnCode_t - CCM_DDS_Subscriber_i::begin_access (void) - { - return this->impl ()->begin_access (); - } - - ::DDS::ReturnCode_t - CCM_DDS_Subscriber_i::end_access (void) - { - return this->impl ()->end_access (); - } - - ::DDS::DomainParticipant_ptr - CCM_DDS_Subscriber_i::get_participant (void) - { - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDomainParticipant* p = this->impl ()->get_participant (); - if (p) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_DomainParticipant_i (p), - CORBA::NO_MEMORY ()); - } -#else - ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); - if (!CORBA::is_nil (p.in)) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_DomainParticipant_i (p.in ()), - CORBA::NO_MEMORY ()); - } -#endif - return retval._retn (); - } - - ::DDS::ReturnCode_t - CCM_DDS_Subscriber_i::set_default_datareader_qos ( - const ::DDS::DataReaderQos & qos) - { - 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); -#else - return this->impl ()->set_default_datareader_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Subscriber_i::get_default_datareader_qos ( - ::DDS::DataReaderQos & qos) - { - 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; - return retcode; -#else - return this->impl ()->get_default_datareader_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Subscriber_i::copy_from_topic_qos ( - ::DDS::DataReaderQos & a_datareader_qos, - const ::DDS::TopicQos & a_impl_qos) - { - 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; - - ccm_dds_qos <<= a_datareader_qos; - ccm_dds_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; - return retcode; -#else - return this->impl()->copy_from_topic_qos (a_datareader_qos, - a_impl_qos); -#endif - } - - DDSSubscriber * - CCM_DDS_Subscriber_i::get_impl (void) - { - return this->impl_; - } - - void - CCM_DDS_Subscriber_i::set_impl (DDSSubscriber * sub) - { - this->impl_ = sub; - } - - DDSSubscriber * - CCM_DDS_Subscriber_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/dds/Subscriber.h deleted file mode 100644 index b1a0d974572..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Subscriber.h +++ /dev/null @@ -1,176 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_SUBSCRIBER_H -#define DDS4CCM_SUBSCRIBER_H - -#include "tao/LocalObject.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" - -#include "tao/LocalObject.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -#include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::Subscriber DDSSubscriber; -typedef ::DDS::DataReaderListener DDSDataReaderListener; -typedef ::DDS::DataReader DDSDataReader; -typedef ::DDS::ContentFilteredTopic DDSContentFilteredTopic; -typedef ::DDS::Topic DDSTopic; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_Subscriber_i : - public virtual ::DDS::CCM_Subscriber, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - CCM_DDS_Subscriber_i (DDSSubscriber * sub); - - /// Destructor - virtual ~CCM_DDS_Subscriber_i (void); - - virtual ::DDS::ReturnCode_t enable (void); - - virtual ::DDS::StatusCondition_ptr get_statuscondition (void); - - virtual ::DDS::StatusMask get_status_changes (void); - - virtual ::DDS::InstanceHandle_t get_instance_handle (void); - - virtual ::DDS::DataReader_ptr create_datareader ( - ::DDS::TopicDescription_ptr a_topic, - const ::DDS::DataReaderQos & qos, - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - virtual ::DDS::DataReader_ptr - create_datareader_with_profile ( - ::DDS::TopicDescription_ptr a_topic, - const char* library_name, - const char *profile_name, - ::DDS::DataReaderListener_ptr a_listener, - ::DDS::StatusMask mask); -#endif - - virtual ::DDS::ReturnCode_t - delete_datareader ( - ::DDS::DataReader_ptr a_datareader); - - virtual ::DDS::ReturnCode_t delete_contained_entities (void); - - virtual ::DDS::DataReader_ptr lookup_datareader ( - const char * impl_name); - - virtual ::DDS::ReturnCode_t - get_datareaders ( - ::DDS::DataReaderSeq & readers, - ::DDS::SampleStateMask sample_states, - ::DDS::ViewStateMask view_states, - ::DDS::InstanceStateMask instance_states); - - virtual ::DDS::ReturnCode_t - notify_datareaders (void); - - virtual ::DDS::ReturnCode_t - set_qos ( - const ::DDS::SubscriberQos & qos); - - virtual ::DDS::ReturnCode_t - get_qos ( - ::DDS::SubscriberQos & qos); - - virtual ::DDS::ReturnCode_t - set_listener ( - ::DDS::SubscriberListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::SubscriberListener_ptr - get_listener (void); - - virtual ::DDS::ReturnCode_t - begin_access (void); - - virtual ::DDS::ReturnCode_t - end_access (void); - - virtual ::DDS::DomainParticipant_ptr - get_participant (void); - - virtual ::DDS::ReturnCode_t - set_default_datareader_qos ( - const ::DDS::DataReaderQos & qos); - - virtual ::DDS::ReturnCode_t - get_default_datareader_qos ( - ::DDS::DataReaderQos & qos); - - virtual ::DDS::ReturnCode_t - copy_from_topic_qos ( - ::DDS::DataReaderQos & a_datareader_qos, - const ::DDS::TopicQos & a_impl_qos); - - DDSSubscriber * get_impl (void); - - void set_impl (DDSSubscriber * sub); - - private: - DDSSubscriber *impl_; - - DDSSubscriber *impl (void); - - DDSDataReader * - create_datareader ( - DDSTopic * topic, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask, - const ::DDS::DataReaderQos & qos); - - DDSDataReader * - create_datareader ( - DDSContentFilteredTopic * topic, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask, - const ::DDS::DataReaderQos & qos); - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDataReader * - create_datareader_with_profile ( - DDSContentFilteredTopic * topic, - const char* library_name, - const char *profile_name, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask); -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDataReader * - create_datareader_with_profile ( - DDSTopic * topic, - const char* library_name, - const char *profile_name, - DDSDataReaderListener * ccm_dds_drl, - ::DDS::StatusMask mask); -#endif - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.cpp deleted file mode 100644 index 9d88d94f8ea..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.cpp +++ /dev/null @@ -1,178 +0,0 @@ -// $Id$ - -#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 "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_SubscriberListener_i::CCM_DDS_SubscriberListener_i (::DDS::SubscriberListener_ptr p) - : impl_ ( ::DDS::SubscriberListener::_duplicate (p)) - { - DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::CCM_DDS_SubscriberListener_i"); - } - - CCM_DDS_SubscriberListener_i::~CCM_DDS_SubscriberListener_i (void) - { - DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::~CCM_DDS_SubscriberListener_i"); - } - - void - CCM_DDS_SubscriberListener_i::on_data_on_readers ( - ::DDSSubscriber* the_subscriber) - { - DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_data_on_readers"); - - ::DDS::Subscriber_var sub = ::DDS::Subscriber::_nil (); - ACE_NEW (sub, - CCM_DDS_Subscriber_i (the_subscriber)); - this->impl_->on_data_on_readers (sub.in ()); - the_subscriber->notify_datareaders (); - } - - void - CCM_DDS_SubscriberListener_i::on_requested_deadline_missed ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedDeadlineMissedStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_requested_deadline_missed"); - - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::RequestedDeadlineMissedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus); -#else - this->impl_->on_requested_deadline_missed (dds_reader.in (), status); -#endif - } - - void - CCM_DDS_SubscriberListener_i::on_requested_incompatible_qos ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedIncompatibleQosStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_requested_incompatible_qos"); - - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::RequestedIncompatibleQosStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus); -#else - this->impl_->on_requested_incompatible_qos (dds_reader.in (), status); -#endif - } - - void - CCM_DDS_SubscriberListener_i::on_sample_rejected ( - ::DDSDataReader* the_reader, - const ::DDS_SampleRejectedStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_sample_rejected"); - - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::SampleRejectedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus); -#else - this->impl_->on_sample_rejected (dds_reader.in (), status); -#endif - } - - void - CCM_DDS_SubscriberListener_i::on_liveliness_changed ( - ::DDSDataReader* the_reader, - const ::DDS_LivelinessChangedStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_liveliness_changed"); - - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::LivelinessChangedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus); -#else - this->impl_->on_liveliness_changed (dds_reader.in (), status); -#endif - } - - void - CCM_DDS_SubscriberListener_i::on_data_available ( - ::DDSDataReader* the_reader) - { - DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_data_available"); - - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); - this->impl_->on_data_available (dds_reader.in ()); - } - - void - CCM_DDS_SubscriberListener_i::on_subscription_matched ( - ::DDSDataReader* the_reader, - const ::DDS_SubscriptionMatchedStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_subscription_matched"); - - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::SubscriptionMatchedStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus); -#else - this->impl_->on_subscription_matched (dds_reader.in (), status); -#endif - } - - void - CCM_DDS_SubscriberListener_i::on_sample_lost ( - ::DDSDataReader* the_reader, - const ::DDS_SampleLostStatus & status) - { - DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_sample_lost"); - - ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); - ACE_NEW (dds_reader, - CCM_DDS_DataReader_i (the_reader)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::SampleLostStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_sample_lost (dds_reader.in (), ddsstatus); -#else - this->impl_->on_sample_lost (dds_reader.in (), status); -#endif - } - - ::DDS::SubscriberListener_ptr - CCM_DDS_SubscriberListener_i::get_subscriber_listener (void) - { - return ::DDS::SubscriberListener::_duplicate (this->impl_.in ()); - } - } -} - - diff --git a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.h deleted file mode 100644 index 585744c9f93..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener.h +++ /dev/null @@ -1,94 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_SUBSCRIBERLISTENER_H -#define DDS4CCM_SUBSCRIBERLISTENER_H - -#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -#include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::SubscriberListener DDSSubscriberListener; -typedef ::DDS::DataReader DDSDataReader; -typedef ::DDS::Subscriber DDSSubscriber; -typedef ::DDS::RequestedDeadlineMissedStatus DDS_RequestedDeadlineMissedStatus; -typedef ::DDS::LivelinessChangedStatus DDS_LivelinessChangedStatus; -typedef ::DDS::RequestedIncompatibleQosStatus DDS_RequestedIncompatibleQosStatus; -typedef ::DDS::SampleRejectedStatus DDS_SampleRejectedStatus; -typedef ::DDS::SubscriptionMatchedStatus DDS_SubscriptionMatchedStatus; -typedef ::DDS::SampleLostStatus DDS_SampleLostStatus; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_SubscriberListener_i : - public virtual ::DDSSubscriberListener - { - public: - /// Constructor - CCM_DDS_SubscriberListener_i ( ::DDS::SubscriberListener_ptr s); - - /// Destructor - virtual ~CCM_DDS_SubscriberListener_i (void); - - virtual void - on_requested_deadline_missed ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedDeadlineMissedStatus & status); - - virtual void - on_requested_incompatible_qos ( - ::DDSDataReader* the_reader, - const ::DDS_RequestedIncompatibleQosStatus & status); - - virtual void - on_sample_rejected ( - ::DDSDataReader* the_reader, - const ::DDS_SampleRejectedStatus & status); - - virtual void - on_liveliness_changed ( - ::DDSDataReader* the_reader, - const ::DDS_LivelinessChangedStatus & status); - - virtual void - on_data_available ( - ::DDSDataReader* the_reader); - - virtual void - on_subscription_matched ( - ::DDSDataReader* the_reader, - const ::DDS_SubscriptionMatchedStatus & status); - - virtual void - on_sample_lost ( - ::DDSDataReader* the_reader, - const ::DDS_SampleLostStatus & status); - - virtual void - on_data_on_readers ( - ::DDSSubscriber* the_subscriber); - - ::DDS::SubscriberListener_ptr get_subscriber_listener (void); - private: - ::DDS::SubscriberListener_var impl_; - }; - } -} - -#endif - diff --git a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp deleted file mode 100644 index bd3e0ef7161..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp +++ /dev/null @@ -1,277 +0,0 @@ -// $Id$ -#include "dds4ccm/impl/dds/Utils.h" - -#include "dds4ccm/impl/dds/DataReader.h" -#include "dds4ccm/impl/logger/Log_Macros.h" -#include "dds4ccm/impl/dds/DDSCallbackStatusHandler.h" -#include "dds4ccm/impl/dds/Utils.h" -#include "tao/ORB_Core.h" - -template -CIAO::DDS4CCM::SubscriberListener_T::SubscriberListener_T ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ACE_Reactor* reactor) - : error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)), - reactor_ (reactor) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::SubscriberListener_T"); -} - -template -CIAO::DDS4CCM::SubscriberListener_T::~SubscriberListener_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::~SubscriberListener_T"); -} - -template -void -CIAO::DDS4CCM::SubscriberListener_T::on_requested_incompatible_qos ( - ::DDS::DataReader_ptr reader, - const ::DDS::RequestedIncompatibleQosStatus & status) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_requested_incompatible_qos"); - - DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO - ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ") - ACE_TEXT ("total count <%d> - total change <%d> - ") - ACE_TEXT ("last policy id <%d> - policies "), - status.total_count, status.total_count_change, - status.last_policy_id)); - for (CORBA::ULong i = 0; i < status.policies.length (); ++i) - { - DDS4CCM_DEBUG (10, (LM_DEBUG, - ACE_TEXT ("\t\tid <%d> - count <%d>\n"), - status.policies[i].policy_id, - status.policies[i].count)); - } - - if (!CORBA::is_nil (this->error_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnRequestedOncompatibleQosHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnRequestedOncompatibleQosHandler ( - this->error_listener_, reader, status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO - ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_requested_incompatible_qos (reader, status); - } - } - catch (...) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ") - ACE_TEXT ("DDS Exception caught\n"))); - } - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ") - ACE_TEXT ("No error listener connected\n"))); - } -} - -template -void -CIAO::DDS4CCM::SubscriberListener_T::on_unexpected_status ( - ::DDS::Entity_ptr entity, - ::DDS::StatusKind status_kind) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_unexpected_status"); - - if (!CORBA::is_nil (this->error_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnUnexpectedStatusHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnUnexpectedStatusHandler ( - this->error_listener_, entity, status_kind)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO - ACE_TEXT ("SubscriberListener_T::on_unexpected_status: ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_unexpected_status (entity, status_kind); - } - } - catch (...) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, - ACE_TEXT ("SubscriberListener_T::on_unexpected_status: ") - ACE_TEXT ("DDS Exception caught\n"))); - } - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ") - ACE_TEXT ("No error listener connected\n"))); - } -} - -template -void -CIAO::DDS4CCM::SubscriberListener_T::on_liveliness_changed ( - ::DDS::DataReader* reader, - const ::DDS::LivelinessChangedStatus& status) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_liveliness_changed"); - - DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO - ACE_TEXT ("SubscriberListener_T::on_liveliness_changed: ") - ACE_TEXT ("alive count <%d> - not alive count <%d> - ") - ACE_TEXT ("alive count change <%d> - not alive count change <%d> ") - ACE_TEXT ("last publication handle - isValid <%d>\n"), - status.alive_count, status.not_alive_count, - status.alive_count_change, status.not_alive_count_change, - status.last_publication_handle.length, - status.last_publication_handle.isValid)); - - this->on_unexpected_status (reader, ::DDS::LIVELINESS_CHANGED_STATUS); -} - -template -void -CIAO::DDS4CCM::SubscriberListener_T::on_sample_rejected ( - ::DDS::DataReader_ptr reader, - const ::DDS::SampleRejectedStatus& status) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_sample_rejected"); - - DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO - ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ") - ACE_TEXT ("total count <%d> - count change <%d> - ") - ACE_TEXT ("last reason <%C> - last instance handle ") - ACE_TEXT (" - isValid <%d>\n"), - status.total_count, status.total_count_change, - translate_rejectedstatuskind (status.last_reason), - status.last_instance_handle.length, - status.last_instance_handle.isValid)); - - if (!CORBA::is_nil (this->error_listener_)) - { - try - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnSampleRejectedHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnSampleRejectedHandler ( - this->error_listener_, reader, status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO - ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_sample_rejected (reader, status); - } - } - catch (...) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ") - ACE_TEXT ("DDS Exception caught\n"))); - } - } - else - { - DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO - ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ") - ACE_TEXT ("No error listener connected\n"))); - } -} - -template -void -CIAO::DDS4CCM::SubscriberListener_T::on_subscription_matched( - ::DDS::DataReader* reader, - const ::DDS::SubscriptionMatchedStatus& status) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_subscription_matched"); - - DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO - ACE_TEXT ("SubscriberListener_T::on_subscription_matched: ") - ACE_TEXT ("total count <%d> - count change <%d> - ") - ACE_TEXT ("current count <%d> - current count change <%d> ") - ACE_TEXT ("last publication handle - isValid <%d>\n"), - status.total_count, status.total_count_change, - status.current_count, status.current_count_change, - status.last_publication_handle.length, - status.last_publication_handle.isValid)); - - this->on_unexpected_status (reader, ::DDS::SUBSCRIPTION_MATCHED_STATUS); -} - -template -void -CIAO::DDS4CCM::SubscriberListener_T::on_data_on_readers( - ::DDS::Subscriber *) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_data_on_readers"); - //do nothing by design -} - -template -void -CIAO::DDS4CCM::SubscriberListener_T::on_requested_deadline_missed ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedDeadlineMissedStatus & ) -{ -} - -template -void -CIAO::DDS4CCM::SubscriberListener_T::on_data_available ( - ::DDS::DataReader_ptr ) -{ -} - -template -void -CIAO::DDS4CCM::SubscriberListener_T::on_sample_lost ( - ::DDS::DataReader_ptr , - const ::DDS::SampleLostStatus & ) -{ -} - -template -::DDS::StatusMask -CIAO::DDS4CCM::SubscriberListener_T::get_mask ( - ::CCM_DDS::ConnectorStatusListener_ptr csl) -{ - if (!CORBA::is_nil (csl) || CIAO_debug_level >= 10) - { - return ::DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS | - ::DDS::SAMPLE_REJECTED_STATUS | - ::DDS::LIVELINESS_CHANGED_STATUS | - ::DDS::SUBSCRIPTION_MATCHED_STATUS; - } - else - { - return 0; - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.h b/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.h deleted file mode 100644 index 7cdf42eb1a5..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.h +++ /dev/null @@ -1,87 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS_SUBSCRIBERLISTENER_T_H_ -#define DDS_SUBSCRIBERLISTENER_T_H_ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - namespace DDS4CCM - { - template - class SubscriberListener_T : - public ::DDS::CCM_SubscriberListener, - private ACE_Copy_Disabled - { - public: - /// Constructor - SubscriberListener_T ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ACE_Reactor* reactor); - - /// Destructor - virtual ~SubscriberListener_T (void); - - virtual void on_requested_incompatible_qos ( - ::DDS::DataReader_ptr reader, - const ::DDS::RequestedIncompatibleQosStatus & status); - - virtual void on_liveliness_changed( - ::DDS::DataReader* reader, - const ::DDS::LivelinessChangedStatus& status); - - virtual void on_sample_rejected( - ::DDS::DataReader* reader, - const ::DDS::SampleRejectedStatus& status); - - virtual void on_subscription_matched( - ::DDS::DataReader* reader, - const ::DDS::SubscriptionMatchedStatus& status); - - virtual void on_data_on_readers( - ::DDS::Subscriber* subscriber); - - virtual void on_requested_deadline_missed ( - ::DDS::DataReader_ptr , - const ::DDS::RequestedDeadlineMissedStatus & ); - - virtual void on_data_available ( - ::DDS::DataReader_ptr ); - - virtual void on_sample_lost ( - ::DDS::DataReader_ptr , - const ::DDS::SampleLostStatus & ); - - static ::DDS::StatusMask get_mask ( - ::CCM_DDS::ConnectorStatusListener_ptr csl); - - private: - typename CCM_TYPE::context_type::_var_type context_; - - virtual void on_unexpected_status( - ::DDS::Entity_ptr entity, - ::DDS::StatusKind status_kind); - - ::CCM_DDS::ConnectorStatusListener_var error_listener_; - - ACE_Reactor* reactor_; - }; - } -} - -#include "dds4ccm/impl/dds/SubscriberListener_T.cpp" - -#endif /* DDS_SUBSCRIBERLISTENER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/TimeUtilities.h b/CIAO/connectors/dds4ccm/impl/dds/TimeUtilities.h deleted file mode 100644 index e6f1050e518..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/TimeUtilities.h +++ /dev/null @@ -1,34 +0,0 @@ -// $Id$ - -//============================================================================= -/** - * @file TimeUtilities.h - * - * $Id$ - * - * @author Marcel Smit - */ -//============================================================================= - - -#ifndef DDS4CCM_TIME_UTILITIES_H -#define DDS4CCM_TIME_UTILITIES_H - -#include "ace/Time_Value.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" - -inline void -operator<<= (::DDS::Time_t & dds_time, const ::ACE_Time_Value & ace_time) -{ - dds_time.sec = static_cast < ::CORBA::Long> (ace_time.sec ()); - dds_time.nanosec = ace_time.usec () * 1000; -} - -inline void -operator<<= (::ACE_Time_Value & ace_time, const ::DDS::Time_t &dds_time) -{ - ace_time.sec (dds_time.sec); - ace_time.usec (dds_time.nanosec/1000); -} - -#endif /* DDS4CCM_TIME_UTILITIES_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/Topic.cpp b/CIAO/connectors/dds4ccm/impl/dds/Topic.cpp deleted file mode 100644 index 28f5c7d48b2..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Topic.cpp +++ /dev/null @@ -1,216 +0,0 @@ -// $Id$ - -#include "Topic.h" -#include "ContentFilteredTopic.h" -#include "StatusCondition.h" -#include "TopicListener.h" - -#include "ndds/InstanceHandle_t.h" -#include "ndds/InconsistentTopicStatus.h" -#include "ndds/TopicQos.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_Topic_i::CCM_DDS_Topic_i (DDSTopic* topic) - : impl_ (topic) - { - } - - CCM_DDS_Topic_i::~CCM_DDS_Topic_i (void) - { - } - - ::DDS::ReturnCode_t - CCM_DDS_Topic_i::set_qos (const ::DDS::TopicQos &qos) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_TopicQos ddsqos; - ddsqos <<= qos; - return this->impl ()->set_qos (ddsqos); -#else - return this->impl ()->set_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Topic_i::get_qos (::DDS::TopicQos &qos) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_TopicQos ddsqos; - ::DDS_ReturnCode_t const retval = this->impl ()->get_qos (ddsqos); - qos <<= ddsqos; - return retval; -#else - return this->impl ()->get_qos (qos); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Topic_i::set_listener ( - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask) - { - 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; - if (!CORBA::is_nil (a_listener)) - { - ACE_NEW_THROW_EX (ccm_dds_impl_list, - CCM_DDS_TopicListener_i (a_listener), - CORBA::NO_MEMORY ()); - } - return this->impl ()->set_listener (ccm_dds_impl_list, mask); -#else - return this->impl ()->set_listener (a_listener, mask); -#endif - } - - ::DDS::TopicListener_ptr - CCM_DDS_Topic_i::get_listener (void) - { - 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_topic_list); - if (!list_proxy) - { - DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Topic_i::get_listener - " - "DDS returned a NIL listener.\n")); - return ::DDS::TopicListener::_nil (); - } - return list_proxy->get_topiclistener (); -#else - return this->impl ()->get_listener (); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Topic_i::get_inconsistent_topic_status ( - ::DDS::InconsistentTopicStatus & a_status) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDS_InconsistentTopicStatus ddsstatus; - ::DDS::ReturnCode_t const retval = this->impl ()->get_inconsistent_topic_status (ddsstatus); - a_status <<= ddsstatus;; - return retval; -#else - return this->impl ()->get_inconsistent_topic_status (a_status); -#endif - } - - ::DDS::ReturnCode_t - CCM_DDS_Topic_i::enable (void) - { - return this->impl ()->enable (); - } - - ::DDS::StatusCondition_ptr - CCM_DDS_Topic_i::get_statuscondition (void) - { - ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSStatusCondition* sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); -#else - ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - ACE_NEW_THROW_EX (retval, - CCM_DDS_StatusCondition_i (sc.in ()), - CORBA::NO_MEMORY ()); -#endif - return retval._retn (); - } - - ::DDS::StatusMask - CCM_DDS_Topic_i::get_status_changes (void) - { - return this->impl ()->get_status_changes (); - } - - ::DDS::InstanceHandle_t - CCM_DDS_Topic_i::get_instance_handle (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); - ::DDS::InstanceHandle_t handle; - handle <<= rtihandle; - return handle; -#else - return this->impl ()->get_instance_handle (); -#endif - } - - char * - CCM_DDS_Topic_i::get_type_name (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - return CORBA::string_dup (this->impl ()->get_type_name ()); -#else - return this->impl ()->get_type_name (); -#endif - } - - char * - CCM_DDS_Topic_i::get_name (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - return CORBA::string_dup (this->impl ()->get_name ()); -#else - return this->impl ()->get_name (); -#endif - } - - ::DDS::DomainParticipant_ptr - CCM_DDS_Topic_i::get_participant (void) - { - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDomainParticipant* p = this->impl ()->get_participant (); - if (p) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_DomainParticipant_i (p), - CORBA::NO_MEMORY ()); - } -#else - ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); - if (!CORBA::is_nil (p.in ())) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_DomainParticipant_i (p.in ()), - CORBA::NO_MEMORY ()); - } -#endif - return retval._retn (); - } - - DDSTopic * - CCM_DDS_Topic_i::get_impl (void) - { - return this->impl_; - } - - void - CCM_DDS_Topic_i::set_impl (DDSTopic * topic) - { - this->impl_ = topic; - } - - DDSTopic * - CCM_DDS_Topic_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } - } -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/Topic.h b/CIAO/connectors/dds4ccm/impl/dds/Topic.h deleted file mode 100644 index b6a495ceecc..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Topic.h +++ /dev/null @@ -1,83 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef CIAO_NDDS_TOPIC_H -#define CIAO_NDDS_TOPIC_H - -#include "DomainParticipant.h" - -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" -#include "tao/LocalObject.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::Topic DDSTopic; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_Topic_i : - public virtual ::DDS::CCM_Topic, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - CCM_DDS_Topic_i (DDSTopic* topic); - - /// Destructor - virtual ~CCM_DDS_Topic_i (void); - - virtual ::DDS::ReturnCode_t set_qos (const ::DDS::TopicQos & qos); - - virtual ::DDS::ReturnCode_t get_qos (::DDS::TopicQos & qos); - - virtual ::DDS::ReturnCode_t set_listener ( - ::DDS::TopicListener_ptr a_listener, - ::DDS::StatusMask mask); - - virtual ::DDS::TopicListener_ptr get_listener (void); - - virtual ::DDS::ReturnCode_t get_inconsistent_topic_status ( - ::DDS::InconsistentTopicStatus & a_status); - - virtual - ::DDS::ReturnCode_t enable (void); - - virtual - ::DDS::StatusCondition_ptr get_statuscondition (void); - - virtual - ::DDS::StatusMask get_status_changes (void); - - virtual - ::DDS::InstanceHandle_t get_instance_handle (void); - - virtual - char * get_type_name (void); - - virtual - char * get_name (void); - - virtual - ::DDS::DomainParticipant_ptr get_participant (void); - - DDSTopic * get_impl (void); - - void set_impl (DDSTopic* topic); - - private: - DDSTopic * impl_; - - DDSTopic * impl (void); - }; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.cpp b/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.cpp deleted file mode 100644 index 95a71927d4c..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.cpp +++ /dev/null @@ -1,90 +0,0 @@ -// $Id$ - -#include "TopicDescription.h" -#include "DomainParticipant.h" - -#include "dds4ccm/idl/dds4ccm_BaseC.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_TopicDescription_i::CCM_DDS_TopicDescription_i ( - DDSTopicDescription * rc) : impl_ (rc) - { - } - - CCM_DDS_TopicDescription_i::~CCM_DDS_TopicDescription_i (void) - { - } - - char * - CCM_DDS_TopicDescription_i::get_type_name (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - return CORBA::string_dup (this->impl ()->get_type_name ()); -#else - return this->impl ()->get_type_name (); -#endif - } - - char * - CCM_DDS_TopicDescription_i::get_name (void) - { -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - return CORBA::string_dup (this->impl ()->get_name ()); -#else - return this->impl ()->get_name (); -#endif - } - - ::DDS::DomainParticipant_ptr - CCM_DDS_TopicDescription_i::get_participant (void) - { - ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - DDSDomainParticipant* p = this->impl ()->get_participant (); - if (p) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_DomainParticipant_i (p), - CORBA::NO_MEMORY ()); - } -#else - ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); - if (!CORBA::is_nil (p.in ())) - { - ACE_NEW_THROW_EX (retval, - CCM_DDS_DomainParticipant_i (p.in ()), - CORBA::NO_MEMORY ()); - } -#endif - return retval._retn (); - } - - DDSTopicDescription * - CCM_DDS_TopicDescription_i::get_impl (void) - { - return this->impl_; - } - - void - CCM_DDS_TopicDescription_i::set_impl (DDSTopicDescription * rc) - { - this->impl_ = rc; - } - - DDSTopicDescription * - CCM_DDS_TopicDescription_i::impl (void) - { - if (!this->impl_) - { - throw ::CORBA::BAD_INV_ORDER (); - } - return this->impl_; - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.h b/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.h deleted file mode 100644 index 63453d6c60e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.h +++ /dev/null @@ -1,63 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef CIAO_DDS4CCM_TOPICDESCRIPTION_H -#define CIAO_DDS4CCM_TOPICDESCRIPTION_H - -#include "tao/LocalObject.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -#include "ndds/ndds_cpp.h" -#endif - -#include "tao/LocalObject.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::TopicDescription DDSTopicDescription; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_TopicDescription_i : - public virtual ::DDS::CCM_TopicDescription, - public virtual ::CORBA::LocalObject - { - public: - /// Constructor - CCM_DDS_TopicDescription_i (DDSTopicDescription * rc); - - /// Destructor - virtual ~CCM_DDS_TopicDescription_i (void); - - virtual char * get_type_name (void); - - virtual char * get_name (void); - - virtual ::DDS::DomainParticipant_ptr get_participant (void); - - DDSTopicDescription * get_impl (void); - - void set_impl (DDSTopicDescription * rc); - - private: - DDSTopicDescription * impl_; - - DDSTopicDescription * impl (void); - }; - } -} - -#endif /* CIAO_DDS4CCM_TOPICDESCRIPTION_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicListener.cpp b/CIAO/connectors/dds4ccm/impl/dds/TopicListener.cpp deleted file mode 100644 index e6624770ec5..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicListener.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// $Id$ - -#include "TopicListener.h" -#include "Topic.h" - -#include "ndds/InconsistentTopicStatus.h" - -#include "dds4ccm/idl/dds4ccm_BaseC.h" - -#include "dds4ccm/impl/logger/Log_Macros.h" - -namespace CIAO -{ - namespace DDS4CCM - { - CCM_DDS_TopicListener_i::CCM_DDS_TopicListener_i (::DDS::TopicListener_ptr p) - : impl_ (::DDS::TopicListener::_duplicate (p)) - { - } - - CCM_DDS_TopicListener_i::~CCM_DDS_TopicListener_i (void) - { - } - - void - CCM_DDS_TopicListener_i::on_inconsistent_topic ( - ::DDSTopic* the_topic, - const ::DDS_InconsistentTopicStatus & status) - { - ::DDS::Topic_var dds_topic = ::DDS::Topic::_nil (); - ACE_NEW (dds_topic, - CCM_DDS_Topic_i (the_topic)); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ::DDS::InconsistentTopicStatus ddsstatus; - ddsstatus <<= status; - this->impl_->on_inconsistent_topic (dds_topic.in (), ddsstatus); -#else - this->impl_->on_inconsistent_topic (dds_topic.in (), status); -#endif - } - - ::DDS::TopicListener_ptr - CCM_DDS_TopicListener_i::get_topiclistener (void) - { - return ::DDS::TopicListener::_duplicate (this->impl_.in ()); - } - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicListener.h b/CIAO/connectors/dds4ccm/impl/dds/TopicListener.h deleted file mode 100644 index e991ac8257e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicListener.h +++ /dev/null @@ -1,52 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_TOPICLISTENER_H -#define DDS4CCM_TOPICLISTENER_H - -#include "tao/LocalObject.h" - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "dds4ccm_ndds_impl_export.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -# include "ndds/ndds_cpp.h" -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::TopicListener DDSTopicListener; -typedef ::DDS::Topic DDSTopic; -typedef ::DDS::InconsistentTopicStatus DDS_InconsistentTopicStatus; -#endif - -namespace CIAO -{ - namespace DDS4CCM - { - class DDS4CCM_NDDS_IMPL_Export CCM_DDS_TopicListener_i : - public virtual ::DDSTopicListener - { - public: - /// Constructor - CCM_DDS_TopicListener_i (::DDS::TopicListener_ptr p); - - /// Destructor - virtual ~CCM_DDS_TopicListener_i (void); - - virtual void on_inconsistent_topic( - ::DDSTopic* topic, - const ::DDS_InconsistentTopicStatus& status); - - ::DDS::TopicListener_ptr get_topiclistener (void); - private: - ::DDS::TopicListener_var impl_; - }; - } -} - -#endif /* DDS4CCM_TOPICLISTENER_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.cpp deleted file mode 100644 index 96b0a259cb8..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.cpp +++ /dev/null @@ -1,78 +0,0 @@ -// $Id$ -#include "dds4ccm/impl/dds/Utils.h" - -#include "dds4ccm/impl/dds/Topic.h" -#include "dds4ccm/impl/dds/DDSCallbackStatusHandler.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -template -CIAO::DDS4CCM::TopicListener_T::TopicListener_T ( - ::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ACE_Reactor* reactor) : - error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)), - reactor_ (reactor) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::TopicListener_T"); -} - -template -CIAO::DDS4CCM::TopicListener_T::~TopicListener_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::~TopicListener_T"); -} - -template -void -CIAO::DDS4CCM::TopicListener_T::on_inconsistent_topic ( - ::DDS::Topic_ptr the_topic, - const ::DDS::InconsistentTopicStatus & status) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::on_inconsistent_topic"); - - DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO - ACE_TEXT ("TopicListener_T::on_inconsistent_topic: ") - ACE_TEXT ("total count <%d> - total change <%d> - "), - status.total_count, status.total_count_change)); - - if (!CORBA::is_nil (this->error_listener_.in ())) - { - if (this->reactor_) - { - ::CIAO::DDS4CCM::OnInconsistentTopicHandler* rh = 0; - ACE_NEW (rh, - ::CIAO::DDS4CCM::OnInconsistentTopicHandler ( - this->error_listener_, - the_topic, - status)); - ACE_Event_Handler_var safe_handler (rh); - if (this->reactor_->notify (rh) != 0) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO - ACE_TEXT ("TopicListener_T::on_inconsistent_topic: ") - ACE_TEXT ("failed to use reactor.\n"))); - } - } - else - { - this->error_listener_->on_inconsistent_topic (the_topic, status); - } - } -} - -template -::DDS::StatusMask -CIAO::DDS4CCM::TopicListener_T::get_mask ( - CCM_DDS::ConnectorStatusListener_ptr error_listener) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::get_mask"); - - if (!CORBA::is_nil (error_listener) || CIAO_debug_level >= 10) - { - return ::DDS::INCONSISTENT_TOPIC_STATUS; - } - else - { - return 0; - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.h b/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.h deleted file mode 100644 index 609978767e8..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.h +++ /dev/null @@ -1,47 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Reactor; -ACE_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - namespace DDS4CCM - { - template - class TopicListener_T : - public ::DDS::TopicListener, - private ACE_Copy_Disabled - { - public: - /// Constructor - TopicListener_T (::CCM_DDS::ConnectorStatusListener_ptr error_listener, - ACE_Reactor* reactor); - - /// Destructor - virtual ~TopicListener_T (void); - - virtual void on_inconsistent_topic ( - ::DDS::Topic_ptr the_topic, - const ::DDS::InconsistentTopicStatus & status); - - static ::DDS::StatusMask get_mask ( - CCM_DDS::ConnectorStatusListener_ptr error_listener); - - private: - CCM_DDS::ConnectorStatusListener_var error_listener_; - ACE_Reactor* reactor_; - }; - } -} - -#include "dds4ccm/impl/dds/TopicListener_T.cpp" diff --git a/CIAO/connectors/dds4ccm/impl/dds/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/Updater_T.cpp deleted file mode 100644 index ee905982084..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Updater_T.cpp +++ /dev/null @@ -1,304 +0,0 @@ -// $Id$ - -#include "dds4ccm/impl/dds/DataWriter.h" -#include "dds4ccm/impl/dds/Utils.h" -#include "dds4ccm/impl/dds/Coherent_Changes_Guard.h" -#include "dds4ccm/impl/logger/Log_Macros.h" - -template -CIAO::DDS4CCM::Updater_T::Updater_T (void) - : InstanceHandleManager_T (), - is_global_scope_ (false), - is_coherent_write_ (false) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::Updater_T"); -} - -template -CIAO::DDS4CCM::Updater_T::~Updater_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::~Updater_T"); -} - -template -bool -CIAO::DDS4CCM::Updater_T::is_global_scope () -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_global_scope"); - return this->is_global_scope_; -} - -template -bool -CIAO::DDS4CCM::Updater_T::is_coherent_write () -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_coherent_write"); - return this->is_coherent_write_; -} - -template -void -CIAO::DDS4CCM::Updater_T::is_coherent_write (bool value) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_coherent_write"); - this->is_coherent_write_ = value; -} - -template -void -CIAO::DDS4CCM::Updater_T::create_i ( - const typename DDS_TYPE::value_type & an_instance, - ::CCM_DDS::DataNumber_t index) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_i"); - DDS_InstanceHandle_t const hnd = this->impl ()->register_instance (an_instance); - if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) - { - DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::Updater_T::create_i: ") - ACE_TEXT ("Unable to unregister instance, nil handle.\n"))); - throw CCM_DDS::InternalError (::DDS_RETCODE_ERROR, index); - } - ::DDS_ReturnCode_t const result = this->impl ()->write (an_instance, hnd); - if (result != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::Updater_T::create_i: ") - ACE_TEXT ("Unable to update data, error %C.\n"), - translate_retcode (result))); - throw CCM_DDS::InternalError (result, index); - } -} - -template -void -CIAO::DDS4CCM::Updater_T::create_one ( - const typename DDS_TYPE::value_type & an_instance) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_one"); - DDS_InstanceHandle_t const hnd = this->impl ()->lookup_instance (an_instance); - if (!DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) - { - throw CCM_DDS::AlreadyCreated (0); - } - - this->create_i (an_instance, 0); -} - -template -void -CIAO::DDS4CCM::Updater_T::update_i ( - const typename DDS_TYPE::value_type & an_instance, - const ::DDS::InstanceHandle_t & instance_handle, - ::CCM_DDS::DataNumber_t index) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_i"); - DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; - hnd <<= instance_handle; - ::DDS_ReturnCode_t const result = this->impl ()->write (an_instance, hnd); - if (result != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::Updater_T::update_i: ") - ACE_TEXT ("Unable to update data, error %C.\n"), - translate_retcode (result))); - throw CCM_DDS::InternalError (result, index); - } -} - -template -void -CIAO::DDS4CCM::Updater_T::update_one ( - const typename DDS_TYPE::value_type & an_instance, - const ::DDS::InstanceHandle_t & instance_handle) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_one"); - DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; - hnd <<= instance_handle; - if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) - { - hnd = this->impl ()->lookup_instance (an_instance); - } - else - { - // Check explicitly if the instance handle matches the instance, this - // is not checked by RTI DDS - DDS_InstanceHandle_t const instance_handle = - this->impl ()->lookup_instance (an_instance); - - if (!DDS_InstanceHandle_equals (&hnd, &instance_handle)) - { - throw CCM_DDS::InternalError (::DDS_RETCODE_BAD_PARAMETER, 0); - } - } - if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) - { - throw CCM_DDS::NonExistent (0); - } - this->update_i (an_instance, instance_handle, 0); -} - -template -void -CIAO::DDS4CCM::Updater_T::delete_i ( - const typename DDS_TYPE::value_type & an_instance, - const ::DDS::InstanceHandle_t & instance_handle, - ::CCM_DDS::DataNumber_t index) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_i"); - DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; - hnd <<= instance_handle; - ::DDS_ReturnCode_t result = this->impl ()->dispose (an_instance, hnd); - if (result != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::Updater_T::delete_i: ") - ACE_TEXT ("Unable to dispose instance, error %C.\n"), - translate_retcode (result))); - throw CCM_DDS::InternalError (result, index); - } - result = - this->impl ()->unregister_instance (an_instance, hnd); - if (result != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, - ACE_TEXT ("CIAO::DDS4CCM::Updater_T::delete_i: ") - ACE_TEXT ("Unable to unregister instance, error %C.\n"), - translate_retcode (result))); - throw CCM_DDS::InternalError (result, index); - } -} - -template -void -CIAO::DDS4CCM::Updater_T::delete_one ( - const typename DDS_TYPE::value_type & an_instance, - const ::DDS::InstanceHandle_t & instance_handle) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_one"); - DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; - hnd <<= instance_handle; - if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) - { - hnd = this->impl ()->lookup_instance (an_instance); - } - else - { - // Check explicitly if the instance handle matches the instance, this - // is not checked by RTI DDS - DDS_InstanceHandle_t const instance_handle = - this->impl ()->lookup_instance (an_instance); - - if (!DDS_InstanceHandle_equals (&hnd, &instance_handle)) - { - throw CCM_DDS::InternalError (::DDS_RETCODE_BAD_PARAMETER, 0); - } - } - if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) - { - throw CCM_DDS::NonExistent (0); - } - this->delete_i (an_instance, instance_handle, 0); -} - -template -void -CIAO::DDS4CCM::Updater_T::create_many ( - const typename CCM_TYPE::seq_type& data) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_many"); - - // Check for existance of instances - this->check_already_created (data); - - Coherent_Changes_Guard guard (this->impl ()->get_publisher(), - this->is_coherent_write_); - - for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) - { - this->create_i (data[index], index); - } -} - -template -void -CIAO::DDS4CCM::Updater_T::check_existent ( - const typename CCM_TYPE::seq_type& data) -{ - ::CCM_DDS::NonExistent exception; - for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) - { - DDS_InstanceHandle_t const hnd = this->impl ()->lookup_instance (data[index]); - if (::DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) - { - CORBA::ULong const length = exception.indexes.length (); - exception.indexes.length (length + 1); - exception.indexes[length] = index; - } - } - - if (exception.indexes.length () > 0) - { - throw exception; - } -} - -template -void -CIAO::DDS4CCM::Updater_T::check_already_created ( - const typename CCM_TYPE::seq_type& data) -{ - ::CCM_DDS::AlreadyCreated exception; - for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) - { - DDS_InstanceHandle_t const hnd = this->impl ()->lookup_instance (data[index]); - if (!::DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) - { - CORBA::ULong const length = exception.indexes.length (); - exception.indexes.length (length + 1); - exception.indexes[length] = index; - } - } - - if (exception.indexes.length () > 0) - { - throw exception; - } -} - -template -void -CIAO::DDS4CCM::Updater_T::update_many ( - const typename CCM_TYPE::seq_type& data) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_many"); - - // Check for existance of instances - this->check_existent (data); - - Coherent_Changes_Guard guard (this->impl ()->get_publisher(), this->is_coherent_write_); - - for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) - { - this->update_i (data[index], ::DDS::HANDLE_NIL, index); - } -} - -template -void -CIAO::DDS4CCM::Updater_T::delete_many ( - const typename CCM_TYPE::seq_type& data) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_many"); - - // Check for existance of instances - this->check_existent (data); - - Coherent_Changes_Guard guard (this->impl ()->get_publisher(), this->is_coherent_write_); - - for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) - { - this->delete_i (data[index], ::DDS::HANDLE_NIL, index); - } -} - diff --git a/CIAO/connectors/dds4ccm/impl/dds/Updater_T.h b/CIAO/connectors/dds4ccm/impl/dds/Updater_T.h deleted file mode 100644 index 376e333005e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Updater_T.h +++ /dev/null @@ -1,86 +0,0 @@ -/** - * @author Marcel Smit - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_UPDATER_H -#define DDS4CCM_UPDATER_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" -#include "InstanceHandleManager_T.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - class Updater_T : - public InstanceHandleManager_T - { - public: - /// Constructor - Updater_T (void); - - /// Destructor - virtual ~Updater_T (void); - - virtual void create_one ( - const typename DDS_TYPE::value_type& an_instance); - - virtual void update_one ( - const typename DDS_TYPE::value_type& an_instance, - const ::DDS::InstanceHandle_t & instance_handle); - - virtual void delete_one ( - const typename DDS_TYPE::value_type& an_instance, - const ::DDS::InstanceHandle_t & instance_handle); - - virtual void create_many ( - const typename CCM_TYPE::seq_type& data); - - virtual void update_many ( - const typename CCM_TYPE::seq_type& data); - - virtual void delete_many ( - const typename CCM_TYPE::seq_type& data); - - virtual bool is_global_scope (); - - virtual bool is_coherent_write (); - - virtual void is_coherent_write (bool value_); - - private: - void create_i ( - const typename DDS_TYPE::value_type& an_instance, - ::CCM_DDS::DataNumber_t index); - - void update_i ( - const typename DDS_TYPE::value_type& an_instance, - const ::DDS::InstanceHandle_t & instance_handle, - ::CCM_DDS::DataNumber_t index); - - void delete_i ( - const typename DDS_TYPE::value_type& an_instance, - const ::DDS::InstanceHandle_t & instance_handle, - ::CCM_DDS::DataNumber_t index); - - void check_existent ( - const typename CCM_TYPE::seq_type& data); - - void check_already_created ( - const typename CCM_TYPE::seq_type& data); - - bool is_global_scope_; - bool is_coherent_write_; - }; - } -} - -#include "dds4ccm/impl/dds/Updater_T.cpp" - -#endif /* DDS4CCM_UPDATER_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/Utils.cpp b/CIAO/connectors/dds4ccm/impl/dds/Utils.cpp deleted file mode 100644 index 0f270083afb..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Utils.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// $Id$ - -#include "Utils.h" - -namespace CIAO -{ - namespace DDS4CCM - { - } -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/Utils.h b/CIAO/connectors/dds4ccm/impl/dds/Utils.h deleted file mode 100644 index 5401a887ce1..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Utils.h +++ /dev/null @@ -1,90 +0,0 @@ -/** - * @file Utils.h - * @author William R. Otte - * - * $Id$ - * - * Misc utility classes for NDDS. - */ - -#ifndef NDDS_UTILS_H -#define NDDS_UTILS_H - -#include "dds4ccm_ndds_impl_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" - -namespace CIAO -{ - namespace DDS4CCM - { - inline const char * translate_retcode (::DDS::ReturnCode_t ret) - { -#define RTI_DDS_RETCODE(X) case X: return #X - switch (ret) - { - RTI_DDS_RETCODE (DDS::RETCODE_OK); - RTI_DDS_RETCODE (DDS::RETCODE_ERROR); - RTI_DDS_RETCODE (DDS::RETCODE_UNSUPPORTED); - RTI_DDS_RETCODE (DDS::RETCODE_BAD_PARAMETER); - RTI_DDS_RETCODE (DDS::RETCODE_PRECONDITION_NOT_MET); - RTI_DDS_RETCODE (DDS::RETCODE_OUT_OF_RESOURCES); - RTI_DDS_RETCODE (DDS::RETCODE_NOT_ENABLED); - RTI_DDS_RETCODE (DDS::RETCODE_IMMUTABLE_POLICY); - RTI_DDS_RETCODE (DDS::RETCODE_INCONSISTENT_POLICY); - RTI_DDS_RETCODE (DDS::RETCODE_ALREADY_DELETED); - RTI_DDS_RETCODE (DDS::RETCODE_TIMEOUT); - RTI_DDS_RETCODE (DDS::RETCODE_NO_DATA); - RTI_DDS_RETCODE (DDS::RETCODE_ILLEGAL_OPERATION); - } - return "***Unknown enum value, update RTI::translate_retcode()"; -#undef RTI_DDS_RETCODE - } - - inline const char * translate_statuskind (DDS::StatusKind ret) - { -#define RTI_DDS_RETCODE(X) case X: return #X - switch (ret) - { - RTI_DDS_RETCODE (DDS::INCONSISTENT_TOPIC_STATUS); - RTI_DDS_RETCODE (DDS::OFFERED_DEADLINE_MISSED_STATUS); - RTI_DDS_RETCODE (DDS::REQUESTED_DEADLINE_MISSED_STATUS); - RTI_DDS_RETCODE (DDS::OFFERED_INCOMPATIBLE_QOS_STATUS); - RTI_DDS_RETCODE (DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS); - RTI_DDS_RETCODE (DDS::SAMPLE_LOST_STATUS); - RTI_DDS_RETCODE (DDS::SAMPLE_REJECTED_STATUS); - RTI_DDS_RETCODE (DDS::DATA_ON_READERS_STATUS); - RTI_DDS_RETCODE (DDS::DATA_AVAILABLE_STATUS); - RTI_DDS_RETCODE (DDS::LIVELINESS_LOST_STATUS); - RTI_DDS_RETCODE (DDS::LIVELINESS_CHANGED_STATUS); - RTI_DDS_RETCODE (DDS::PUBLICATION_MATCHED_STATUS); - RTI_DDS_RETCODE (DDS::SUBSCRIPTION_MATCHED_STATUS); - //RTI_DDS_RETCODE (DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS); -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - RTI_DDS_RETCODE (DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS); -#endif - //RTI_DDS_RETCODE (DDS::DATA_WRITER_CACHE_STATUS); - //RTI_DDS_RETCODE (DDS::DATA_WRITER_PROTOCOL_STATUS); - //RTI_DDS_RETCODE (DDS::DATA_READER_CACHE_STATUS); - //RTI_DDS_RETCODE (DDS::DATA_READER_PROTOCOL_STATUS); - } - return "***Unknown enum value, update RTI::translate_statuskind()"; -#undef RTI_DDS_RETCODE - } - - inline const char * translate_rejectedstatuskind (DDS::SampleRejectedStatusKind ret) - { -#define RTI_DDS_RETCODE(X) case X: return #X - switch (ret) - { - RTI_DDS_RETCODE (DDS::NOT_REJECTED); - RTI_DDS_RETCODE (DDS::REJECTED_BY_INSTANCES_LIMIT); - RTI_DDS_RETCODE (DDS::REJECTED_BY_SAMPLES_LIMIT); - RTI_DDS_RETCODE (DDS::REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT); - } - return "***Unknown enum value, update RTI::translate_rejectedstatuskind()"; -#undef RTI_DDS_RETCODE - } - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/Writer_T.cpp deleted file mode 100644 index f7837a19975..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Writer_T.cpp +++ /dev/null @@ -1,98 +0,0 @@ -// $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/logger/Log_Macros.h" - -template -CIAO::DDS4CCM::Writer_T::Writer_T (void) - : InstanceHandleManager_T (), - is_coherent_write_ (false) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::Writer_T"); -} - -template -CIAO::DDS4CCM::Writer_T::~Writer_T (void) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::~Writer_T"); -} - -template -void -CIAO::DDS4CCM::Writer_T::write_i ( - const typename DDS_TYPE::value_type& datum, - const ::DDS::InstanceHandle_t& instance_handle, - ::CCM_DDS::DataNumber_t index) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_i"); - - ::DDS_InstanceHandle_t handle = ::DDS_HANDLE_NIL; - handle <<= instance_handle; - DDS_ReturnCode_t const retval = this->impl ()->write (datum, handle); - - if (retval != DDS_RETCODE_OK) - { - DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::Writer_T::write_i - " - "Write unsuccessful, received error code %C\n", - translate_retcode (retval))); - throw CCM_DDS::InternalError (retval, index); - } -} - -template -void -CIAO::DDS4CCM::Writer_T::write_one ( - const typename DDS_TYPE::value_type & an_instance, - const ::DDS::InstanceHandle_t & instance_handle) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_one"); - - this->write_i (an_instance, instance_handle, 0); - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::Writer_T::write_one - " - "Write successful\n")); -} - -template -void -CIAO::DDS4CCM::Writer_T::write_many ( - const typename CCM_TYPE::seq_type& instances) -{ - DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_many"); - - Coherent_Changes_Guard guard (this->impl ()->get_publisher(), - this->is_coherent_write_); - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::Writer_T::write_many - " - "Preparing to write to DDS\n")); - - for (typename CCM_TYPE::seq_type::size_type index = 0; - index < instances.length(); - index++) - { - this->write_i (instances[index], ::DDS::HANDLE_NIL, index); - } - - DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::Writer_T::write_many - " - "Write successful\n")); -} - -template -::CORBA::Boolean -CIAO::DDS4CCM::Writer_T::is_coherent_write (void) -{ - return this->is_coherent_write_; -} - -template -void -CIAO::DDS4CCM::Writer_T::is_coherent_write ( - ::CORBA::Boolean value) -{ - this->is_coherent_write_ = value; -} diff --git a/CIAO/connectors/dds4ccm/impl/dds/Writer_T.h b/CIAO/connectors/dds4ccm/impl/dds/Writer_T.h deleted file mode 100644 index d38887768c5..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/Writer_T.h +++ /dev/null @@ -1,55 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef WRITER_T_H -#define WRITER_T_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" -#include "InstanceHandleManager_T.h" - -namespace CIAO -{ - namespace DDS4CCM - { - template - class Writer_T : - public InstanceHandleManager_T - { - public: - /// Constructor - Writer_T (void); - - /// Destructor - virtual ~Writer_T (void); - - virtual void write_one ( - const typename DDS_TYPE::value_type& an_instance, - const ::DDS::InstanceHandle_t & instance_handle); - - virtual void write_many ( - const typename CCM_TYPE::seq_type& instances); - - virtual ::CORBA::Boolean is_coherent_write (void); - - virtual void is_coherent_write ( ::CORBA::Boolean value); - - private: - void write_i (const typename DDS_TYPE::value_type& datum, - const ::DDS::InstanceHandle_t& instance_handle, - ::CCM_DDS::DataNumber_t index); - - bool is_coherent_write_; - }; - } -} - -#include "dds4ccm/impl/dds/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/dds/dds4ccm_ndds_impl_export.h deleted file mode 100644 index 7ca68d771eb..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/dds4ccm_ndds_impl_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl DDS4CCM_NDDS_IMPL -// ------------------------------ -#ifndef DDS4CCM_NDDS_IMPL_EXPORT_H -#define DDS4CCM_NDDS_IMPL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_NDDS_IMPL_HAS_DLL) -# define DDS4CCM_NDDS_IMPL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_NDDS_IMPL_HAS_DLL */ - -#if !defined (DDS4CCM_NDDS_IMPL_HAS_DLL) -# define DDS4CCM_NDDS_IMPL_HAS_DLL 1 -#endif /* ! DDS4CCM_NDDS_IMPL_HAS_DLL */ - -#if defined (DDS4CCM_NDDS_IMPL_HAS_DLL) && (DDS4CCM_NDDS_IMPL_HAS_DLL == 1) -# if defined (DDS4CCM_NDDS_IMPL_BUILD_DLL) -# define DDS4CCM_NDDS_IMPL_Export ACE_Proper_Export_Flag -# define DDS4CCM_NDDS_IMPL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define DDS4CCM_NDDS_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* DDS4CCM_NDDS_IMPL_BUILD_DLL */ -# define DDS4CCM_NDDS_IMPL_Export ACE_Proper_Import_Flag -# define DDS4CCM_NDDS_IMPL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define DDS4CCM_NDDS_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* DDS4CCM_NDDS_IMPL_BUILD_DLL */ -#else /* DDS4CCM_NDDS_IMPL_HAS_DLL == 1 */ -# define DDS4CCM_NDDS_IMPL_Export -# define DDS4CCM_NDDS_IMPL_SINGLETON_DECLARATION(T) -# define DDS4CCM_NDDS_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* DDS4CCM_NDDS_IMPL_HAS_DLL == 1 */ - -// Set DDS4CCM_NDDS_IMPL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DDS4CCM_NDDS_IMPL_NTRACE) -# if (ACE_NTRACE == 1) -# define DDS4CCM_NDDS_IMPL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DDS4CCM_NDDS_IMPL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DDS4CCM_NDDS_IMPL_NTRACE */ - -#if (DDS4CCM_NDDS_IMPL_NTRACE == 1) -# define DDS4CCM_NDDS_IMPL_TRACE(X) -#else /* (DDS4CCM_NDDS_IMPL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DDS4CCM_NDDS_IMPL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DDS4CCM_NDDS_IMPL_NTRACE == 1) */ - -#endif /* DDS4CCM_NDDS_IMPL_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h deleted file mode 100644 index 1f4b4fd18b4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h +++ /dev/null @@ -1,26 +0,0 @@ - /** - * @author Marcel Smit - * - * $Id$ - * - */ - -#ifndef BUILTINTOPICKEY_T_H -#define BUILTINTOPICKEY_T_H - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::BuiltinTopicKey_t &ddsbuiltintopickey, const ::DDS_BuiltinTopicKey_t & builtintopickey) -{ - ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value)); -} - -inline void -operator<<= (::DDS_BuiltinTopicKey_t &ddsbuiltintopickey, const ::DDS::BuiltinTopicKey_t & builtintopickey) -{ - ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value)); -} - -#endif - -#endif /* BUILTINTOPICKEY_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h deleted file mode 100644 index 3b493392c1b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h +++ /dev/null @@ -1,66 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DATAREADERQOS_H -#define DDS4CCM_DATAREADERQOS_H - -#include "DurabilityQosPolicy.h" -#include "DeadlineQosPolicy.h" -#include "LatencyBudgetQosPolicy.h" -#include "LivelinessQosPolicy.h" -#include "ReliabilityQosPolicy.h" -#include "DestinationOrderQosPolicy.h" -#include "HistoryQosPolicy.h" -#include "ResourceLimitsQosPolicy.h" -#include "UserDataQosPolicy.h" -#include "OwnershipQosPolicy.h" -#include "TimeBasedFilterQosPolicy.h" -#include "ReaderDataLifecycleQosPolicy.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DataReaderQos DDS_DataReaderQos; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::DataReaderQos &ddsqos, const ::DDS_DataReaderQos & qos) -{ - 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<<= (::DDS_DataReaderQos &ddsqos, const ::DDS::DataReaderQos & qos) -{ - 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/ndds/DataWriterQos.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h deleted file mode 100644 index 346792c62b9..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h +++ /dev/null @@ -1,75 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DATAWRITERQOS_H -#define DDS4CCM_DATAWRITERQOS_H - -#include "DurabilityQosPolicy.h" -#include "DurabilityServiceQosPolicy.h" -#include "DeadlineQosPolicy.h" -#include "LatencyBudgetQosPolicy.h" -#include "LivelinessQosPolicy.h" -#include "ReliabilityQosPolicy.h" -#include "DestinationOrderQosPolicy.h" -#include "HistoryQosPolicy.h" -#include "ResourceLimitsQosPolicy.h" -#include "TransportPriorityQosPolicy.h" -#include "LifespanQosPolicy.h" -#include "UserDataQosPolicy.h" -#include "OwnershipQosPolicy.h" -#include "OwnershipStrengthQosPolicy.h" -#include "WriterDataLifecycleQosPolicy.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DataWriterQos DDS_DataWriterQos; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::DataWriterQos &ddsqos, const ::DDS_DataWriterQos & qos) -{ - 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<<= (::DDS_DataWriterQos &ddsqos, const ::DDS::DataWriterQos & qos) -{ - 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/dds/ndds/DeadlineQosPolicy.h deleted file mode 100644 index f981bc47c83..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DEADLINEQOSPOLICY_H -#define DDS4CCM_DEADLINEQOSPOLICY_H - -#include "Duration_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DeadlineQosPolicy DDS_DeadlineQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::DeadlineQosPolicy &ddsqos, const ::DDS_DeadlineQosPolicy & qos) -{ - ddsqos.period <<= qos.period; -} - -inline void -operator<<= (::DDS_DeadlineQosPolicy &ddsqos, const ::DDS::DeadlineQosPolicy & qos) -{ - 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/dds/ndds/DestinationOrderQosPolicy.h deleted file mode 100644 index d0ca02ec1ba..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DESTINATIONORDERQOSPOLICY_H -#define DDS4CCM_DESTINATIONORDERQOSPOLICY_H - -#include "Duration_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DestinationOrderQosPolicy DDS_DestinationOrderQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::DestinationOrderQosPolicy &ddsqos, const ::DDS_DestinationOrderQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS::DestinationOrderQosPolicyKind> (qos.kind); -} - -inline void -operator<<= (::DDS_DestinationOrderQosPolicy &ddsqos, const ::DDS::DestinationOrderQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS_DestinationOrderQosPolicyKind> (qos.kind); -} - -#endif - -#endif /* DDS4CCM_DESTINATIONORDERQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h deleted file mode 100644 index 4abb893ee4b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H -#define DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H - -#include "EntityFactoryQosPolicy.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DomainParticipantFactoryQos DDS_DomainParticipantFactoryQos; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::DomainParticipantFactoryQos &ddsqos, const ::DDS_DomainParticipantFactoryQos & qos) -{ - ddsqos.entity_factory <<= qos.entity_factory; -} - -inline void -operator<<= (::DDS_DomainParticipantFactoryQos &ddsqos, const ::DDS::DomainParticipantFactoryQos & qos) -{ - ddsqos.entity_factory <<= qos.entity_factory; -} - -#endif - -#endif /* DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h deleted file mode 100644 index 26922038746..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H -#define DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H - -#include "UserDataQosPolicy.h" -#include "EntityFactoryQosPolicy.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DomainParticipantQos DDS_DomainParticipantQos; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::DomainParticipantQos &ddsqos, const ::DDS_DomainParticipantQos & qos) -{ - ddsqos.user_data <<= qos.user_data; - ddsqos.entity_factory <<= qos.entity_factory; -} - -inline void -operator<<= (::DDS_DomainParticipantQos &ddsqos, const ::DDS::DomainParticipantQos & qos) -{ - 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/dds/ndds/DurabilityQosPolicy.h deleted file mode 100644 index 4154ce750d4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DURABILITYQOSPOLICY_H -#define DDS4CCM_DURABILITYQOSPOLICY_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DurabilityQosPolicy DDS_DurabilityQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::DurabilityQosPolicy &ddsqos, const ::DDS_DurabilityQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS::DurabilityQosPolicyKind> (qos.kind); -} - -inline void -operator<<= (::DDS_DurabilityQosPolicy &ddsqos, const ::DDS::DurabilityQosPolicy & qos) -{ - 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/dds/ndds/DurabilityServiceQosPolicy.h deleted file mode 100644 index 2c0486fdc82..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DURABILITYSERVICEQOSPOLICY_H -#define DDS4CCM_DURABILITYSERVICEQOSPOLICY_H - -#include "Duration_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::DurabilityServiceQosPolicy DDS_DurabilityServiceQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::DurabilityServiceQosPolicy &ddsqos, const ::DDS_DurabilityServiceQosPolicy & qos) -{ - 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<<= (::DDS_DurabilityServiceQosPolicy &ddsqos, const ::DDS::DurabilityServiceQosPolicy & qos) -{ - 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/dds/ndds/Duration_t.h deleted file mode 100644 index 73e8eef0cfa..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/Duration_t.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_DURATION_T_H -#define DDS4CCM_DURATION_T_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::Duration_t DDS_Duration_t; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::Duration_t &ddsduration, const ::DDS_Duration_t & duration) -{ - ddsduration.sec = duration.sec; - ddsduration.nanosec = duration.nanosec; -} - -inline void -operator<<= (::DDS_Duration_t &ddsduration, const ::DDS::Duration_t & duration) -{ - 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/dds/ndds/EntityFactoryQosPolicy.h deleted file mode 100644 index afa363c243a..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_ENTITYFACTORYQOSPOLICY_H -#define DDS4CCM_ENTITYFACTORYQOSPOLICY_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::EntityFactoryQosPolicy DDS_EntityFactoryQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::EntityFactoryQosPolicy &ddsqos, const ::DDS_EntityFactoryQosPolicy & qos) -{ - ddsqos.autoenable_created_entities = qos.autoenable_created_entities; -} - -inline void -operator<<= (::DDS_EntityFactoryQosPolicy &ddsqos, const ::DDS::EntityFactoryQosPolicy & qos) -{ - ddsqos.autoenable_created_entities = qos.autoenable_created_entities; -} - -#endif - -#endif /* DDS4CCM_ENTITYFACTORYQOSPOLICY_H */ 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 - * - * $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/HistoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h deleted file mode 100644 index e463616de9a..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_HISTORYQOSPOLICY_H -#define DDS4CCM_HISTORYQOSPOLICY_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::HistoryQosPolicy DDS_HistoryQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::HistoryQosPolicy &ddsqos, const ::DDS_HistoryQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS::HistoryQosPolicyKind> (qos.kind); - ddsqos.depth = qos.depth; -} - -inline void -operator<<= (::DDS_HistoryQosPolicy &ddsqos, const ::DDS::HistoryQosPolicy & qos) -{ - 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/dds/ndds/InconsistentTopicStatus.h deleted file mode 100644 index a87e5dfaa96..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_INCONSISTENTTOPICSTATUS_H -#define DDS4CCM_INCONSISTENTTOPICSTATUS_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::InconsistentTopicStatus DDS_InconsistentTopicStatus; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::InconsistentTopicStatus &ddsstatus, const ::DDS_InconsistentTopicStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; -} - -inline void -operator<<= (::DDS_InconsistentTopicStatus &ddsstatus, const ::DDS::InconsistentTopicStatus & status) -{ - 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/ndds/InstanceHandleSeq.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h deleted file mode 100644 index 4e4f65dede1..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h +++ /dev/null @@ -1,47 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_INSTANCEHANDLESEQ_H -#define DDS4CCM_INSTANCEHANDLESEQ_H - -#include "InstanceHandle_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::InstanceHandleSeq DDS_InstanceHandleSeq; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -template -void convert_dds_to_corba_sequence(corbaseq & target, const ddsseq& source) { - target.length (source.length ()); - for (::DDS_Long index = 0; index < source.length (); index++) - { - target[index] <<= source[index]; - } -} - -inline void -operator<<= (::DDS::InstanceHandleSeq &ddsinstancehandleseqseq, const ::DDS_InstanceHandleSeq & instancehandleseq) -{ - convert_dds_to_corba_sequence (ddsinstancehandleseqseq, instancehandleseq); -} - -inline void -operator<<= (::DDS_InstanceHandleSeq &ddsinstancehandleseqseq, const ::DDS::InstanceHandleSeq & instancehandleseq) -{ - ddsinstancehandleseqseq.length (instancehandleseq.length ()); - for (::DDS::InstanceHandleSeq::size_type index = 0; index < instancehandleseq.length (); index++) - { - ddsinstancehandleseqseq[index] <<= instancehandleseq[index]; - } -} - -#endif - -#endif /* DDS4CCM_INSTANCEHANDLESEQ_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h deleted file mode 100644 index b3c37b61e8d..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h +++ /dev/null @@ -1,90 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_INSTANCEHANDLE_T_H -#define DDS4CCM_INSTANCEHANDLE_T_H - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -#include "ndds/ndds_cpp.h" -#define DDS_INSTANCE_HANDLE_T_IN const ::DDS::InstanceHandle_t & -#define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t -#endif - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -#define DDS_INSTANCE_HANDLE_T_IN ::DDS::InstanceHandle_t -#define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::InstanceHandle_t &ddsinstancehandle, const ::DDS_InstanceHandle_t & instancehandle) -{ - ACE_OS::memcpy (ddsinstancehandle.value, instancehandle.keyHash.value, sizeof (instancehandle.keyHash.value)); - ddsinstancehandle.length = instancehandle.keyHash.length; - ddsinstancehandle.isValid = instancehandle.isValid; -} - -inline void -operator<<= (::DDS_InstanceHandle_t &ddsinstancehandle, const ::DDS::InstanceHandle_t & instancehandle) -{ - 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) -{ - return instancehandle1.length == instancehandle2.length && - instancehandle1.isValid == instancehandle2.isValid && - ACE_OS::memcmp (instancehandle1.value, instancehandle2.value, sizeof (instancehandle1.value)) == 0; -} - -inline bool -operator== (const DDS_InstanceHandle_t & dds_instancehandle, const ::DDS::InstanceHandle_t & ccm_instancehandle) -{ - return dds_instancehandle.keyHash.length == ccm_instancehandle.length && - static_cast(dds_instancehandle.isValid) == ccm_instancehandle.isValid && - ACE_OS::memcmp (dds_instancehandle.keyHash.value, ccm_instancehandle.value, sizeof (dds_instancehandle.keyHash.value)) == 0; -} - -inline bool -operator== (const ::DDS::InstanceHandle_t & ccm_instancehandle, const DDS_InstanceHandle_t & dds_instancehandle) -{ - return ccm_instancehandle.length == dds_instancehandle.keyHash.length && - ccm_instancehandle.isValid == static_cast(dds_instancehandle.isValid) && - ACE_OS::memcmp (ccm_instancehandle.value, dds_instancehandle.keyHash.value, sizeof (ccm_instancehandle.value)) == 0; -} - -inline bool -operator!= (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2) -{ - return instancehandle1.length != instancehandle2.length || - instancehandle1.isValid != instancehandle2.isValid || - ACE_OS::memcmp (instancehandle1.value, instancehandle2.value, sizeof (instancehandle1.value)) != 0; -} - -inline bool -operator!= (const DDS_InstanceHandle_t & dds_instancehandle, const ::DDS::InstanceHandle_t & ccm_instancehandle) -{ - return dds_instancehandle.keyHash.length != ccm_instancehandle.length || - static_cast(dds_instancehandle.isValid) != ccm_instancehandle.isValid || - ACE_OS::memcmp (dds_instancehandle.keyHash.value, ccm_instancehandle.value, sizeof (dds_instancehandle.keyHash.value)) != 0; -} - -inline bool -operator!= (const ::DDS::InstanceHandle_t & ccm_instancehandle, const DDS_InstanceHandle_t & dds_instancehandle) -{ - return ccm_instancehandle.length != dds_instancehandle.keyHash.length || - ccm_instancehandle.isValid != static_cast(dds_instancehandle.isValid) || - ACE_OS::memcmp (ccm_instancehandle.value, dds_instancehandle.keyHash.value, sizeof (ccm_instancehandle.value)) != 0; -} -#endif - -#endif /* DDS4CCM_INSTANCEHANDLE_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h deleted file mode 100644 index 51cced4320c..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_LATENCYBUDGETQOSPOLICY_H -#define DDS4CCM_LATENCYBUDGETQOSPOLICY_H - -#include "Duration_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::LatencyBudgetQosPolicy DDS_LatencyBudgetQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::LatencyBudgetQosPolicy &ddsqos, const ::DDS_LatencyBudgetQosPolicy & qos) -{ - ddsqos.duration <<= qos.duration; -} - -inline void -operator<<= (::DDS_LatencyBudgetQosPolicy &ddsqos, const ::DDS::LatencyBudgetQosPolicy & qos) -{ - 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/dds/ndds/LifespanQosPolicy.h deleted file mode 100644 index ab15e75a5d4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_LIFESPANQOSPOLICY_H -#define DDS4CCM_LIFESPANQOSPOLICY_H - -#include "Duration_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::LifespanQosPolicy DDS_LifespanQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::LifespanQosPolicy &ddsqos, const ::DDS_LifespanQosPolicy & qos) -{ - ddsqos.duration <<= qos.duration; -} - -inline void -operator<<= (::DDS_LifespanQosPolicy &ddsqos, const ::DDS::LifespanQosPolicy & qos) -{ - 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/dds/ndds/LivelinessChangedStatus.h deleted file mode 100644 index e57ecde72a5..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_LIVELINESSCHANGEDSTATUS_H -#define DDS4CCM_LIVELINESSCHANGEDSTATUS_H - -#include "InstanceHandle_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::LivelinessChangedStatus DDS_LivelinessChangedStatus; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::LivelinessChangedStatus &ddsstatus, const ::DDS_LivelinessChangedStatus & status) -{ - 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<<= (::DDS_LivelinessChangedStatus &ddsstatus, const ::DDS::LivelinessChangedStatus & status) -{ - 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/dds/ndds/LivelinessLostStatus.h deleted file mode 100644 index 4c4f5199c92..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_LIVELINESSLOSTSTATUS_H -#define DDS4CCM_LIVELINESSLOSTSTATUS_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::LivelinessLostStatus DDS_LivelinessLostStatus; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::LivelinessLostStatus &ddsstatus, const ::DDS_LivelinessLostStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; -} - -inline void -operator<<= (::DDS_LivelinessLostStatus &ddsstatus, const ::DDS::LivelinessLostStatus & status) -{ - 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/dds/ndds/LivelinessQosPolicy.h deleted file mode 100644 index e760d16737e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_LIVELINESSQOSPOLICY_H -#define DDS4CCM_LIVELINESSQOSPOLICY_H - -#include "Duration_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::LivelinessQosPolicy DDS_LivelinessQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::LivelinessQosPolicy &ddsqos, const ::DDS_LivelinessQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS::LivelinessQosPolicyKind> (qos.kind); - ddsqos.lease_duration <<= qos.lease_duration; -} - -inline void -operator<<= (::DDS_LivelinessQosPolicy &ddsqos, const ::DDS::LivelinessQosPolicy & qos) -{ - 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/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 - * - * $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/OfferedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h deleted file mode 100644 index ec60fe1d145..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h +++ /dev/null @@ -1,38 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H -#define DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H - -#include "InstanceHandle_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::OfferedDeadlineMissedStatus DDS_OfferedDeadlineMissedStatus; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::OfferedDeadlineMissedStatus &ddsstatus, const ::DDS_OfferedDeadlineMissedStatus & status) -{ - 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<<= (::DDS_OfferedDeadlineMissedStatus &ddsstatus, const ::DDS::OfferedDeadlineMissedStatus & status) -{ - 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/dds/ndds/OfferedIncompatibleQosStatus.h deleted file mode 100644 index c1e190ea35e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H -#define DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H - -#include "QosPolicyCountSeq.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::OfferedIncompatibleQosStatus DDS_OfferedIncompatibleQosStatus; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::OfferedIncompatibleQosStatus &ddsstatus, const ::DDS_OfferedIncompatibleQosStatus & status) -{ - 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<<= (::DDS_OfferedIncompatibleQosStatus &ddsstatus, const ::DDS::OfferedIncompatibleQosStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.last_policy_id = static_cast (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/dds/ndds/OwnershipQosPolicy.h deleted file mode 100644 index c7983adc110..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_OWNERSHIPQOSPOLICY_H -#define DDS4CCM_OWNERSHIPQOSPOLICY_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::OwnershipQosPolicy DDS_OwnershipQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::OwnershipQosPolicy &ddsqos, const ::DDS_OwnershipQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS::OwnershipQosPolicyKind> (qos.kind); -} - -inline void -operator<<= (::DDS_OwnershipQosPolicy &ddsqos, const ::DDS::OwnershipQosPolicy & qos) -{ - 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/dds/ndds/OwnershipStrengthQosPolicy.h deleted file mode 100644 index 84b7471d47f..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H -#define DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::OwnershipStrengthQosPolicy DDS_OwnershipStrengthQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::OwnershipStrengthQosPolicy &ddsqos, const ::DDS_OwnershipStrengthQosPolicy & qos) -{ - ddsqos.value = qos.value; -} - -inline void -operator<<= (::DDS_OwnershipStrengthQosPolicy &ddsqos, const ::DDS::OwnershipStrengthQosPolicy & qos) -{ - 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/dds/ndds/PartitionQosPolicy.h deleted file mode 100644 index e9425c13a71..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_PARTITIONQOSPOLICY_H -#define DDS4CCM_PARTITIONQOSPOLICY_H - -#include "StringSeq.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::PartitionQosPolicy DDS_PartitionQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::PartitionQosPolicy &ddsqos, const ::DDS_PartitionQosPolicy & qos) -{ - ddsqos.name <<= qos.name; -} - -inline void -operator<<= (::DDS_PartitionQosPolicy &ddsqos, const ::DDS::PartitionQosPolicy & qos) -{ - ddsqos.name <<= qos.name; -} - -#endif - -#endif /* DDS4CCM_PARTITIONQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h deleted file mode 100644 index c9456173af1..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_PRESENTATIONQOSPOLICY_H -#define DDS4CCM_PRESENTATIONQOSPOLICY_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::PresentationQosPolicy DDS_PresentationQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::PresentationQosPolicy &ddsqos, const ::DDS_PresentationQosPolicy & qos) -{ - 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<<= (::DDS_PresentationQosPolicy &ddsqos, const ::DDS::PresentationQosPolicy & qos) -{ - 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/dds/ndds/PublicationBuiltinTopicData.h deleted file mode 100644 index 52ba73ee8ce..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h +++ /dev/null @@ -1,79 +0,0 @@ -/** - * @author Marcel Smit - * - * $Id$ - * - */ - -#ifndef PUBLICATIONBUILTINTOPICDATA_H_ -#define PUBLICATIONBUILTINTOPICDATA_H_ - -#include "BuiltinTopicKey_t.h" -#include "DurabilityQosPolicy.h" -#include "DurabilityServiceQosPolicy.h" -#include "DeadlineQosPolicy.h" -#include "LatencyBudgetQosPolicy.h" -#include "LivelinessQosPolicy.h" -#include "ReliabilityQosPolicy.h" -#include "LifespanQosPolicy.h" -#include "UserDataQosPolicy.h" -#include "OwnershipQosPolicy.h" -#include "OwnershipStrengthQosPolicy.h" -#include "DestinationOrderQosPolicy.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::PublicationBuiltinTopicData &ddstopicdata, const ::DDS_PublicationBuiltinTopicData & 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.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<<= (::DDS_PublicationBuiltinTopicData & ddstopicdata, const ::DDS::PublicationBuiltinTopicData & 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.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/dds/ndds/PublicationMatchedStatus.h deleted file mode 100644 index a3fe72f1e62..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_PUBLICATIONMATCHEDSTATUS_H -#define DDS4CCM_PUBLICATIONMATCHEDSTATUS_H - -#include "InstanceHandle_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::PublicationMatchedStatus DDS_PublicationMatchedStatus; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::PublicationMatchedStatus &ddsstatus, const ::DDS_PublicationMatchedStatus & status) -{ - 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<<= (::DDS_PublicationMatchedStatus &ddsstatus, const ::DDS::PublicationMatchedStatus & status) -{ - 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/ndds/PublisherQos.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/PublisherQos.h deleted file mode 100644 index 0b074b1e368..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/PublisherQos.h +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_PUBLISHERQOS_H -#define DDS4CCM_PUBLISHERQOS_H - -#include "PresentationQosPolicy.h" -#include "PartitionQosPolicy.h" -#include "GroupDataQosPolicy.h" -#include "EntityFactoryQosPolicy.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::PublisherQos DDS_PublisherQos; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::PublisherQos &ddsqos, const ::DDS_PublisherQos & qos) -{ - ddsqos.presentation <<= qos.presentation; - ddsqos.partition <<= qos.partition; - ddsqos.group_data <<= qos.group_data; - ddsqos.entity_factory <<= qos.entity_factory; -} - -inline void -operator<<= (::DDS_PublisherQos &ddsqos, const ::DDS::PublisherQos & qos) -{ - 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/dds/ndds/QosPolicyCountSeq.h deleted file mode 100644 index ebe11431d1e..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_QOSPOLICYCOUNTSEQ_H -#define DDS4CCM_QOSPOLICYCOUNTSEQ_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::QosPolicyCountSeq DDS_QosPolicyCountSeq; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::QosPolicyCountSeq & ddspolicycount, const ::DDS_QosPolicyCountSeq & policycount) -{ - 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<<= (::DDS_QosPolicyCountSeq & ddspolicycount, const ::DDS::QosPolicyCountSeq & policycount) -{ - ddspolicycount.length (policycount.length ()); - for (::CORBA::ULong i = 0 ; i < policycount.length (); ++i) - { - ddspolicycount[i].policy_id = static_cast (policycount[i].policy_id); - ddspolicycount[i].count = policycount[i].count; - } -} - -#endif - -#endif /* DDS4CCM_QOSPOLICYCOUNTSEQ_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h deleted file mode 100644 index b7fe64725a1..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H -#define DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -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) -{ - ddsqos.autopurge_nowriter_samples_delay <<= qos.autopurge_nowriter_samples_delay; - ddsqos.autopurge_disposed_samples_delay <<= qos.autopurge_disposed_samples_delay; -} - -inline void -operator<<= (::DDS_ReaderDataLifecycleQosPolicy &ddsqos, const ::DDS::ReaderDataLifecycleQosPolicy & qos) -{ - 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/ndds/ReliabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h deleted file mode 100644 index 68b94c506d1..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_RELIABILITYSQOSPOLICY_H -#define DDS4CCM_RELIABILITYSQOSPOLICY_H - -#include "Duration_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::ReliabilityQosPolicy DDS_ReliabilityQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::ReliabilityQosPolicy &ddsqos, const ::DDS_ReliabilityQosPolicy & qos) -{ - ddsqos.kind = static_cast < ::DDS::ReliabilityQosPolicyKind> (qos.kind); - ddsqos.max_blocking_time <<= qos.max_blocking_time; -} - -inline void -operator<<= (::DDS_ReliabilityQosPolicy &ddsqos, const ::DDS::ReliabilityQosPolicy & qos) -{ - 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/dds/ndds/RequestedDeadlineMissedStatus.h deleted file mode 100644 index 3491e007a36..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h +++ /dev/null @@ -1,38 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H -#define DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H - -#include "InstanceHandle_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::RequestedDeadlineMissedStatus DDS_RequestedDeadlineMissedStatus; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::RequestedDeadlineMissedStatus &ddsstatus, const ::DDS_RequestedDeadlineMissedStatus & status) -{ - 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<<= (::DDS_RequestedDeadlineMissedStatus &ddsstatus, const ::DDS::RequestedDeadlineMissedStatus & status) -{ - 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/dds/ndds/RequestedIncompatibleQosStatus.h deleted file mode 100644 index 7aa47631de4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H -#define DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H - -#include "QosPolicyCountSeq.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::RequestedIncompatibleQosStatus DDS_RequestedIncompatibleQosStatus; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::RequestedIncompatibleQosStatus &ddsstatus, const ::DDS_RequestedIncompatibleQosStatus & status) -{ - 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<<= (::DDS_RequestedIncompatibleQosStatus &ddsstatus, const ::DDS::RequestedIncompatibleQosStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; - ddsstatus.last_policy_id = static_cast (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/dds/ndds/ResourceLimitsQosPolicy.h deleted file mode 100644 index 3666c21ecd5..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_RESOURCELIMITSQOSPOLICY_H -#define DDS4CCM_RESOURCELIMITSQOSPOLICY_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::ResourceLimitsQosPolicy DDS_ResourceLimitsQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::ResourceLimitsQosPolicy &ddsqos, const ::DDS_ResourceLimitsQosPolicy & qos) -{ - 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<<= (::DDS_ResourceLimitsQosPolicy &ddsqos, const ::DDS::ResourceLimitsQosPolicy & qos) -{ - 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/dds/ndds/SampleInfo.h deleted file mode 100644 index 8d3d816576d..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleInfo.h +++ /dev/null @@ -1,69 +0,0 @@ -/** - * @author Marcel Smit - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef SAMPLE_INFO_H -#define SAMPLE_INFO_H - -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "Time_t.h" -#include "InstanceHandle_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::SampleStateKind DDS_SampleStateKind; -typedef ::DDS::SampleInfo DDS_SampleInfo; -#endif - -inline void -operator<<= (::CCM_DDS::AccessStatus & access_status, const ::DDS_SampleStateKind & sample_state) -{ - if (sample_state == ::DDS::NOT_READ_SAMPLE_STATE) - { - access_status = ::CCM_DDS::FRESH_INFO; - } - else if (sample_state == ::DDS::READ_SAMPLE_STATE) - { - access_status = ::CCM_DDS::ALREADY_SEEN; - } -} - -inline void -operator<<= (::CCM_DDS::ReadInfo& ccm_dds_readinfo, const ::DDS_SampleInfo& sample_info) -{ -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ccm_dds_readinfo.source_timestamp <<= sample_info.source_timestamp; -#else - ccm_dds_readinfo.source_timestamp = sample_info.source_timestamp; -#endif - ccm_dds_readinfo.access_status <<= sample_info.sample_state; -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) - ccm_dds_readinfo.instance_handle <<= sample_info.instance_handle; -#else - ccm_dds_readinfo.instance_handle = sample_info.instance_handle; -#endif - - if (sample_info.instance_state == ::DDS::ALIVE_INSTANCE_STATE && - sample_info.view_state == ::DDS::NEW_VIEW_STATE) - { - // Instance_status new - ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_CREATED; - } - else if (sample_info.instance_state == ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE) - { - // Instance_status deleted - ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_DELETED; - } - else if ((sample_info.instance_state == ::DDS::ALIVE_INSTANCE_STATE && - sample_info.view_state == ::DDS::NOT_NEW_VIEW_STATE) || - sample_info.instance_state == ::DDS::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) - { - // Instance_status updated - ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_UPDATED; - } -} - -#endif diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h deleted file mode 100644 index 920f4051bd4..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_SAMPLELOSTSTATUS_H -#define DDS4CCM_SAMPLELOSTSTATUS_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::SampleLostStatus DDS_SampleLostStatus; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::SampleLostStatus &ddsstatus, const ::DDS_SampleLostStatus & status) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; -} - -inline void -operator>>= (const ::DDS_SampleLostStatus &status, ::DDS::SampleLostStatus & ddsstatus) -{ - ddsstatus.total_count = status.total_count; - ddsstatus.total_count_change = status.total_count_change; -} -#endif - -#endif /* DDS4CCM_SAMPLELOSTSTATUS_H */ - diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h deleted file mode 100644 index 1623d9b3ce8..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_SAMPLEREJECTEDSTATUS_H -#define DDS4CCM_SAMPLEREJECTEDSTATUS_H - -#include "InstanceHandle_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::SampleRejectedStatus DDS_SampleRejectedStatus; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::SampleRejectedStatus &ddsstatus, const ::DDS_SampleRejectedStatus & status) -{ - 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<<= (::DDS_SampleRejectedStatus &ddsstatus, const ::DDS::SampleRejectedStatus & status) -{ - 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/ndds/StringSeq.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/StringSeq.h deleted file mode 100644 index 6f75683fd3f..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/StringSeq.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @author Marcel Smit - * @author Johnny Willemsen - * - * $Id$ - * - */ - -#ifndef DDS4CCM_STRINGSEQ_T_H -#define DDS4CCM_STRINGSEQ_T_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::StringSeq DDS_StringSeq; -typedef long DDS_Long; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::StringSeq & string_seq, const ::DDS_StringSeq & dds_string_seq) -{ - string_seq.length (dds_string_seq.length ()); - for (::DDS_Long i = 0 ; i < dds_string_seq.length(); ++i) - { - string_seq[i] = CORBA::string_dup (dds_string_seq[i]); - } -} - -inline void -operator<<= (::DDS_StringSeq & dds_string_seq, const ::DDS::StringSeq & string_seq) -{ - const char** parameterlist = new const char*[string_seq.length ()]; - - for (CORBA::ULong i = 0; i < string_seq.length (); ++i) - { - parameterlist[i] = string_seq[i].in (); - } - dds_string_seq.length (string_seq.length ()); - dds_string_seq.from_array (parameterlist, string_seq.length ()); - delete [] parameterlist; -} -#endif - -#endif /* DDS4CCM_STRINGSEQ_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h deleted file mode 100644 index 9ccabb98f45..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_SUBSCRIBERQOS_H -#define DDS4CCM_SUBSCRIBERQOS_H - -#include "EntityFactoryQosPolicy.h" -#include "GroupDataQosPolicy.h" -#include "PartitionQosPolicy.h" -#include "PresentationQosPolicy.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::SubscriberQos DDS_SubscriberQos; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::SubscriberQos &ddsqos, const ::DDS_SubscriberQos & qos) -{ - ddsqos.presentation <<= qos.presentation; - ddsqos.partition <<= qos.partition; - ddsqos.group_data <<= qos.group_data; - ddsqos.entity_factory <<= qos.entity_factory; -} - -inline void -operator<<= (::DDS_SubscriberQos &ddsqos, const ::DDS::SubscriberQos & qos) -{ - 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/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 - * - * $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/SubscriptionMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h deleted file mode 100644 index 0658188dace..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H -#define DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H - -#include "InstanceHandle_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::SubscriptionMatchedStatus DDS_SubscriptionMatchedStatus; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::SubscriptionMatchedStatus &ddsstatus, const ::DDS_SubscriptionMatchedStatus & status) -{ - 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<<= (::DDS_SubscriptionMatchedStatus &ddsstatus, const ::DDS::SubscriptionMatchedStatus & status) -{ - 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/dds/ndds/TimeBasedFilterQosPolicy.h deleted file mode 100644 index 96da82f6f33..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H -#define DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H - -#include "Duration_t.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::TimeBasedFilterQosPolicy DDS_TimeBasedFilterQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::TimeBasedFilterQosPolicy &ddsqos, const ::DDS_TimeBasedFilterQosPolicy & qos) -{ - ddsqos.minimum_separation <<= qos.minimum_separation; -} - -inline void -operator<<= (::DDS_TimeBasedFilterQosPolicy &ddsqos, const ::DDS::TimeBasedFilterQosPolicy & qos) -{ - ddsqos.minimum_separation <<= qos.minimum_separation; -} - -#endif - -#endif /* DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/Time_t.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/Time_t.h deleted file mode 100644 index 118b46d68cf..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/Time_t.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @author William R. Otte - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_TIME_T_H -#define DDS4CCM_TIME_T_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::Time_t DDS_Time_t; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::Time_t &ddstime, const ::DDS_Time_t & time) -{ - ddstime.sec = time.sec; - ddstime.nanosec = time.nanosec; -} - -inline void -operator<<= (::DDS_Time_t &ddstime, const ::DDS::Time_t & time) -{ - ddstime.sec = time.sec; - ddstime.nanosec = time.nanosec; -} - -#endif - -#endif /* DDS4CCM_TIME_T_H */ - diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h deleted file mode 100644 index 0a792fcb9f9..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#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 - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::TopicDataQosPolicy &ddsqos, const ::DDS_TopicDataQosPolicy & qos) -{ - ddsqos.value <<= qos.value; -} - -inline void -operator<<= (::DDS_TopicDataQosPolicy &ddsqos, const ::DDS::TopicDataQosPolicy & qos) -{ - ddsqos.value <<= qos.value; -} - -#endif - -#endif /* DDS4CCM_TOPICDATAQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicQos.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicQos.h deleted file mode 100644 index e5ee0fe199b..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TopicQos.h +++ /dev/null @@ -1,69 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_TOPICQOS_H -#define DDS4CCM_TOPICQOS_H - -#include "TopicDataQosPolicy.h" -#include "DurabilityQosPolicy.h" -#include "DurabilityServiceQosPolicy.h" -#include "DeadlineQosPolicy.h" -#include "LatencyBudgetQosPolicy.h" -#include "LivelinessQosPolicy.h" -#include "ReliabilityQosPolicy.h" -#include "DestinationOrderQosPolicy.h" -#include "HistoryQosPolicy.h" -#include "ResourceLimitsQosPolicy.h" -#include "TransportPriorityQosPolicy.h" -#include "LifespanQosPolicy.h" -#include "OwnershipQosPolicy.h" - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::TopicQos DDS_TopicQos; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::TopicQos &ddsqos, const ::DDS_TopicQos & qos) -{ - 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<<= (::DDS_TopicQos &ddsqos, const ::DDS::TopicQos & qos) -{ - 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/dds/ndds/TransportPriorityQosPolicy.h deleted file mode 100644 index 6a318a7b4ad..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H -#define DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::TransportPriorityQosPolicy DDS_TransportPriorityQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::TransportPriorityQosPolicy &ddsqos, const ::DDS_TransportPriorityQosPolicy & qos) -{ - ddsqos.value = qos.value; -} - -inline void -operator<<= (::DDS_TransportPriorityQosPolicy &ddsqos, const ::DDS::TransportPriorityQosPolicy & qos) -{ - ddsqos.value = qos.value; -} - -#endif - -#endif /* DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_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 - * - * $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/WriterDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h deleted file mode 100644 index ef084365142..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @author Johnny Willemsen - * - * $Id$ - * - * Wrapper facade for NDDS. - */ - -#ifndef DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H -#define DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H - -#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) -typedef ::DDS::WriterDataLifecycleQosPolicy DDS_WriterDataLifecycleQosPolicy; -#endif - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) -inline void -operator<<= (::DDS::WriterDataLifecycleQosPolicy &ddsqos, const ::DDS_WriterDataLifecycleQosPolicy & qos) -{ - ddsqos.autodispose_unregistered_instances = qos.autodispose_unregistered_instances; -} - -inline void -operator<<= (::DDS_WriterDataLifecycleQosPolicy &ddsqos, const ::DDS::WriterDataLifecycleQosPolicy & qos) -{ - ddsqos.autodispose_unregistered_instances = qos.autodispose_unregistered_instances; -} - -#endif - -#endif /* DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H */ diff --git a/CIAO/connectors/dds4ccm/impl/dds/ndds_impl.mpc b/CIAO/connectors/dds4ccm/impl/dds/ndds_impl.mpc deleted file mode 100644 index a447300384f..00000000000 --- a/CIAO/connectors/dds4ccm/impl/dds/ndds_impl.mpc +++ /dev/null @@ -1,42 +0,0 @@ -// $Id$ - -project(CIAO_DDS4CCM_NDDS_Impl) : dds4ccm_skel, taolib, ciao_output, ccm_stub, ciao_logger { - - after += DDS4CCM_lem_stub - libs += DDS4CCM_lem_stub - - dynamicflags = DDS4CCM_NDDS_IMPL_BUILD_DLL - macros += BUILDING_NDDS_LIB - Header_Files { - *.h - ndds/*.h - } - - Template_Files { - *_T.cpp - } - - Source_Files { - Coherent_Changes_Guard.cpp - DataWriter.cpp - DataWriterListener.cpp - DataReader.cpp - DataReaderListener.cpp - DomainParticipant.cpp - DomainParticipantListener.cpp - DomainParticipantFactory.cpp - ContentFilteredTopic.cpp - Topic.cpp - TopicDescription.cpp - Publisher.cpp - PublisherListener.cpp - Subscriber.cpp - SubscriberListener.cpp - StatusCondition.cpp - ReadCondition.cpp - QueryCondition.cpp - Utils.cpp - TopicListener.cpp - DDSCallbackStatusHandler.cpp - } -} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h b/CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h new file mode 100644 index 00000000000..3c12b7008f9 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h @@ -0,0 +1,38 @@ + /** + * @author Marcel Smit + * + * $Id$ + * + */ + +#ifndef BUILTINTOPICKEY_T_H +#define BUILTINTOPICKEY_T_H + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::BuiltinTopicKey_t &ddsbuiltintopickey, const ::DDS_BuiltinTopicKey_t & builtintopickey) +{ + ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value)); +} + +inline void +operator<<= (::DDS_BuiltinTopicKey_t &ddsbuiltintopickey, const ::DDS::BuiltinTopicKey_t & builtintopickey) +{ + 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/ndds/Coherent_Changes_Guard.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp new file mode 100644 index 00000000000..9fd0fd752f2 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp @@ -0,0 +1,19 @@ +// $Id$ +#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) +{ + if (this->coherent_write_) + { + p_->begin_coherent_changes (); + } +} + +CIAO::DDS4CCM::Coherent_Changes_Guard::~Coherent_Changes_Guard () +{ + if (this->coherent_write_) + { + this->p_->end_coherent_changes (); + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h new file mode 100644 index 00000000000..8a02245aed1 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h @@ -0,0 +1,43 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef _CIAO_COHERENT_CHANGES_GUARD +#define _CIAO_COHERENT_CHANGES_GUARD + +#include "ace/Copy_Disabled.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +# include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +# include "dds/DdsDcpsC.h" +typedef ::DDS::Publisher DDSPublisher; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export Coherent_Changes_Guard : + private ACE_Copy_Disabled + { + public: + Coherent_Changes_Guard (::DDSPublisher* p, bool coherent_write); + ~Coherent_Changes_Guard (); + private: + ::DDSPublisher* p_; + bool const coherent_write_; + }; + } +} + +#endif /* _CIAO_COHERENT_CHANGES_GUARD */ + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp new file mode 100644 index 00000000000..9bdfb36e72d --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp @@ -0,0 +1,142 @@ +// $Id$ + +#include "ContentFilteredTopic.h" +#include "Topic.h" +#include "StringSeq.h" + +#include "dds4ccm/impl/logger/Log_Macros.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_ContentFilteredTopic_i::CCM_DDS_ContentFilteredTopic_i ( + DDSContentFilteredTopic * dw) : impl_ (dw) + { + } + + CCM_DDS_ContentFilteredTopic_i::~CCM_DDS_ContentFilteredTopic_i (void) + { + } + + char * + CCM_DDS_ContentFilteredTopic_i::get_filter_expression (void) + { + DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::get_filter_expression"); + return CORBA::string_dup (this->impl ()->get_filter_expression ()); + } + + ::DDS::ReturnCode_t + CCM_DDS_ContentFilteredTopic_i::get_expression_parameters ( + ::DDS::StringSeq & expression_parameters) + { + DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::get_expression_parameters"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDS_StringSeq parameters; + ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters ( + parameters); + expression_parameters <<= parameters; +#else + ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters ( + expression_parameters); +#endif + return retval; + } + + ::DDS::ReturnCode_t + CCM_DDS_ContentFilteredTopic_i::set_expression_parameters ( + const ::DDS::StringSeq & expression_parameters) + { + DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::set_expression_parameters"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDS_StringSeq parameters; + parameters <<= expression_parameters; + return this->impl ()->set_expression_parameters (parameters); +#else + return this->impl ()->set_expression_parameters (expression_parameters); +#endif + } + + ::DDS::Topic_ptr + CCM_DDS_ContentFilteredTopic_i::get_related_topic (void) + { + DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::get_related_topic"); + + ::DDS::Topic_var retval = ::DDS::Topic::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSTopic *topic = this->impl ()->get_related_topic (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Topic_i (topic), + CORBA::NO_MEMORY ()); + return retval._retn (); +#else + ::DDS::Topic_var topic = this->impl ()->get_related_topic (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Topic_i (topic.in ()), + CORBA::NO_MEMORY ()); + return retval._retn (); +#endif + } + + char * + CCM_DDS_ContentFilteredTopic_i::get_type_name (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + return CORBA::string_dup (this->impl ()->get_type_name ()); +#else + return this->impl ()->get_type_name (); +#endif + } + + char * + CCM_DDS_ContentFilteredTopic_i::get_name (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + return CORBA::string_dup (this->impl ()->get_name ()); +#else + return this->impl ()->get_name (); +#endif + } + + ::DDS::DomainParticipant_ptr + CCM_DDS_ContentFilteredTopic_i::get_participant (void) + { + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDomainParticipant* p = this->impl ()->get_participant (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p), + CORBA::NO_MEMORY ()); +#else + ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p.in ()), + CORBA::NO_MEMORY ()); +#endif + return retval._retn (); + } + + DDSContentFilteredTopic * + CCM_DDS_ContentFilteredTopic_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_ContentFilteredTopic_i::set_impl (DDSContentFilteredTopic * dw) + { + this->impl_ = dw; + } + + DDSContentFilteredTopic * + CCM_DDS_ContentFilteredTopic_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; + } + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h new file mode 100644 index 00000000000..13208ca50e4 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h @@ -0,0 +1,71 @@ +/** + * @author Marcel Smit + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef CIAO_NDDS_CONTENFILTEREDTOPIC_H +#define CIAO_NDDS_CONTENFILTEREDTOPIC_H + +#include "DomainParticipant.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" +#include "tao/LocalObject.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::ContentFilteredTopic DDSContentFilteredTopic; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_ContentFilteredTopic_i : + public virtual ::DDS::CCM_ContentFilteredTopic, + public virtual ::CORBA::LocalObject + { + public: + /// Constructor + CCM_DDS_ContentFilteredTopic_i (DDSContentFilteredTopic * dw); + + /// Destructor + virtual ~CCM_DDS_ContentFilteredTopic_i (void); + + virtual char * get_filter_expression (void); + + virtual + ::DDS::ReturnCode_t get_expression_parameters ( + ::DDS::StringSeq & expression_parameters); + + virtual + ::DDS::ReturnCode_t set_expression_parameters ( + const ::DDS::StringSeq & expression_parameters); + + virtual + ::DDS::Topic_ptr get_related_topic (void); + + virtual + char * get_type_name (void); + + virtual + char * get_name (void); + + virtual + ::DDS::DomainParticipant_ptr get_participant (void); + + DDSContentFilteredTopic * get_impl (void); + + void set_impl (DDSContentFilteredTopic * dw); + + private: + DDSContentFilteredTopic * impl_; + + DDSContentFilteredTopic * impl (void); + }; + } +} + +#endif /* CIAO_NDDS_CONTENFILTEREDTOPIC_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h new file mode 100644 index 00000000000..5e4fcb003a4 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h @@ -0,0 +1,69 @@ +/** + * @file DDS4CCM_Traits.h + * @author William R. Otte + * + * $Id$ + * + * Traits necessary for various bits and pieces of the DDS4CCM infrastructure. + */ + +#ifndef DDS4CCM_TRAITS_H +#define DDS4CCM_TRAITS_H + +namespace CIAO +{ + namespace DDS4CCM + { + template + + struct Connector_Traits + { + typedef BASE_TYPE base_type; + typedef SEQ_TYPE seq_type; + typedef WRITER_TYPE writer_type; + typedef UPDATER_TYPE updater_type; + typedef GETTER_TYPE getter_type; + typedef READER_TYPE reader_type; + typedef CONTEXT_TYPE context_type; + typedef LISTENER_TYPE listener_type; + typedef STATELISTENER_TYPE statelistener_type; + typedef CONNECTORSTATUSLISTENER_TYPE connectorstatuslistener_type; + }; + + namespace RTI + { + /** + * @struct Type_Traits + * @brief Convenience traits struct. + * + * This is a convenience struct that is used by most of the + * DDS4CCM infrastructure; it is not necessary to use this exact + * struct, so long as all of the needed fields are filled in. + */ + template + struct Type_Traits + { + typedef VALUE_TYPE value_type; + typedef DDS_SEQ_TYPE dds_seq_type; + typedef TYPE_SUPPORT type_support; + typedef DATA_WRITER data_writer; + typedef DATA_READER data_reader; + }; + } + } +} +#endif /* DDS4CCM_TRAITS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp new file mode 100644 index 00000000000..4cd20753f9f --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp @@ -0,0 +1,263 @@ +// $Id$ + +#include "dds4ccm/impl/ndds/Utils.h" +#include "dds4ccm/impl/ndds/DDSCallbackStatusHandler.h" +#include "dds4ccm/impl/logger/Log_Macros.h" + +//============================================================ +// On_Unexpected_Status_Handler +//============================================================ +namespace CIAO +{ + namespace DDS4CCM + { + OnUnexpectedStatusHandler::OnUnexpectedStatusHandler ( + ::CCM_DDS::ConnectorStatusListener_ptr error_listener, + ::DDS::Entity_ptr entity, + ::DDS::StatusKind status_kind) : + error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)), + entity_ (::DDS::Entity::_duplicate (entity)), + status_kind_ (status_kind) + { + this->reference_counting_policy ().value + (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); + } + + OnUnexpectedStatusHandler::~OnUnexpectedStatusHandler (void) + { + } + + int + OnUnexpectedStatusHandler::handle_exception (ACE_HANDLE) + { + try + { + this->error_listener_->on_unexpected_status (this->entity_, this->status_kind_); + } + catch (...) + { + } + return 0; + } + + //============================================================ + // OnRequestedOncompatibleQosHandler + //============================================================ + OnRequestedOncompatibleQosHandler::OnRequestedOncompatibleQosHandler ( + ::CCM_DDS::ConnectorStatusListener_ptr csl, + ::DDS::DataReader_ptr dr, + const ::DDS::RequestedIncompatibleQosStatus &status) : + csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), + dr_ (::DDS::DataReader::_duplicate (dr)), + status_ (status) + { + this->reference_counting_policy ().value + (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); + } + + OnRequestedOncompatibleQosHandler::~OnRequestedOncompatibleQosHandler (void) + { + } + + int + OnRequestedOncompatibleQosHandler::handle_exception (ACE_HANDLE) + { + try + { + this->csl_->on_requested_incompatible_qos (this->dr_, this->status_); + } + catch (...) + { + } + return 0; + } + + //============================================================ + // OnSampleRejectedHandler + //============================================================ + OnSampleRejectedHandler::OnSampleRejectedHandler ( + ::CCM_DDS::ConnectorStatusListener_ptr csl, + ::DDS::DataReader_ptr dr, + const ::DDS::SampleRejectedStatus &status) : + csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), + dr_ (::DDS::DataReader::_duplicate (dr)), + status_ (status) + { + this->reference_counting_policy ().value + (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); + } + + OnSampleRejectedHandler::~OnSampleRejectedHandler (void) + { + } + + int + OnSampleRejectedHandler::handle_exception (ACE_HANDLE) + { + try + { + this->csl_->on_sample_rejected (this->dr_, this->status_); + } + catch (...) + { + } + return 0; + } + + //============================================================ + // OnInconsistentTopicHandler + //============================================================ + OnInconsistentTopicHandler::OnInconsistentTopicHandler ( + ::CCM_DDS::ConnectorStatusListener_ptr csl, + ::DDS::Topic_ptr tp, + const ::DDS::InconsistentTopicStatus &status) : + csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), + tp_ (::DDS::Topic::_duplicate (tp)), + status_ (status) + { + this->reference_counting_policy ().value + (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); + } + + OnInconsistentTopicHandler::~OnInconsistentTopicHandler (void) + { + } + + int + OnInconsistentTopicHandler::handle_exception (ACE_HANDLE) + { + try + { + this->csl_->on_inconsistent_topic (this->tp_, this->status_); + } + catch (...) + { + } + return 0; + } + + //============================================================ + // OnOfferedDeadlineMissedHandler + //============================================================ + OnOfferedDeadlineMissedHandler::OnOfferedDeadlineMissedHandler ( + ::CCM_DDS::ConnectorStatusListener_ptr csl, + ::DDS::DataWriter_ptr dw, + const ::DDS::OfferedDeadlineMissedStatus &status) : + csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), + dw_ (::DDS::DataWriter::_duplicate (dw)), + status_ (status) + { + this->reference_counting_policy ().value + (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); + } + + OnOfferedDeadlineMissedHandler::~OnOfferedDeadlineMissedHandler (void) + { + } + + int + OnOfferedDeadlineMissedHandler::handle_exception (ACE_HANDLE) + { + try + { + this->csl_->on_offered_deadline_missed (this->dw_, this->status_); + } + catch (...) + { + } + return 0; + } + + //============================================================ + // OnOfferedIncompatibleQoSHandler + //============================================================ + OnOfferedIncompatibleQoSHandler::OnOfferedIncompatibleQoSHandler ( + ::CCM_DDS::ConnectorStatusListener_ptr csl, + ::DDS::DataWriter_ptr dw, + const ::DDS::OfferedIncompatibleQosStatus &status) : + csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)), + dw_ (::DDS::DataWriter::_duplicate (dw)), + status_ (status) + { + this->reference_counting_policy ().value + (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); + } + + OnOfferedIncompatibleQoSHandler::~OnOfferedIncompatibleQoSHandler (void) + { + } + + int + OnOfferedIncompatibleQoSHandler::handle_exception (ACE_HANDLE) + { + try + { + this->csl_->on_offered_incompatible_qos (this->dw_, this->status_); + } + catch (...) + { + } + return 0; + } + + //============================================================ + // OnRequestedDeadlineMissedHandler + //============================================================ + OnRequestedDeadlineMissedHandler::OnRequestedDeadlineMissedHandler ( + ::CCM_DDS::PortStatusListener_ptr psl, + ::DDS::DataReader_ptr dr, + const ::DDS::RequestedDeadlineMissedStatus & status) : + psl_ (::CCM_DDS::PortStatusListener::_duplicate (psl)), + dr_ (::DDS::DataReader::_duplicate (dr)), + status_ (status) + { + } + + OnRequestedDeadlineMissedHandler::~OnRequestedDeadlineMissedHandler () + { + } + + int + OnRequestedDeadlineMissedHandler::handle_exception (ACE_HANDLE) + { + try + { + this->psl_->on_requested_deadline_missed (this->dr_, this->status_); + } + catch (...) + { + } + return 0; + } + + //============================================================ + // OnSampleLostHandler + //============================================================ + OnSampleLostHandler::OnSampleLostHandler ( + ::CCM_DDS::PortStatusListener_ptr psl, + ::DDS::DataReader_ptr dr, + const ::DDS::SampleLostStatus & status) : + psl_ (::CCM_DDS::PortStatusListener::_duplicate (psl)), + dr_ (::DDS::DataReader::_duplicate (dr)), + status_ (status) + { + } + + OnSampleLostHandler::~OnSampleLostHandler () + { + } + + int + OnSampleLostHandler::handle_exception (ACE_HANDLE) + { + try + { + this->psl_->on_sample_lost (this->dr_, this->status_); + } + catch (...) + { + } + return 0; + } + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.h b/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.h new file mode 100644 index 00000000000..b2d7d525001 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.h @@ -0,0 +1,155 @@ +// $Id$ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Eventhandler on orb thread, handling the + * received data from DDS. + */ + +#ifndef CIAO_DDS_CALLBACK_STATUS_HANDLER +#define CIAO_DDS_CALLBACK_STATUS_HANDLER + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/dds4ccm_ConnectorStatusListenerC.h" +#include "dds4ccm/idl/dds4ccm_PortStatusListenerC.h" +#include "ace/Event_Handler.h" +#include "dds4ccm_ndds_impl_export.h" + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export OnUnexpectedStatusHandler : + public ACE_Event_Handler + { + public: + OnUnexpectedStatusHandler ( + ::CCM_DDS::ConnectorStatusListener_ptr error_listener, + ::DDS::Entity_ptr entity, + ::DDS::StatusKind status_kind); + virtual ~OnUnexpectedStatusHandler (); + + virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); + private: + ::CCM_DDS::ConnectorStatusListener_var error_listener_; + ::DDS::Entity_var entity_; + ::DDS::StatusKind status_kind_; + }; + + class DDS4CCM_NDDS_IMPL_Export OnRequestedOncompatibleQosHandler : + public ACE_Event_Handler + { + public: + OnRequestedOncompatibleQosHandler ( + ::CCM_DDS::ConnectorStatusListener_ptr csl, + ::DDS::DataReader_ptr dr, + const ::DDS::RequestedIncompatibleQosStatus &status); + virtual ~OnRequestedOncompatibleQosHandler (); + virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); + private: + ::CCM_DDS::ConnectorStatusListener_var csl_; + ::DDS::DataReader_var dr_; + ::DDS::RequestedIncompatibleQosStatus const status_; + }; + + class DDS4CCM_NDDS_IMPL_Export OnSampleRejectedHandler : + public ACE_Event_Handler + { + public: + OnSampleRejectedHandler ( + ::CCM_DDS::ConnectorStatusListener_ptr csl, + ::DDS::DataReader_ptr dr, + const ::DDS::SampleRejectedStatus &status); + virtual ~OnSampleRejectedHandler (); + virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); + private: + ::CCM_DDS::ConnectorStatusListener_var csl_; + ::DDS::DataReader_var dr_; + ::DDS::SampleRejectedStatus const status_; + }; + + class DDS4CCM_NDDS_IMPL_Export OnInconsistentTopicHandler : + public ACE_Event_Handler + { + public: + OnInconsistentTopicHandler ( + ::CCM_DDS::ConnectorStatusListener_ptr csl, + ::DDS::Topic_ptr tp, + const ::DDS::InconsistentTopicStatus &status); + virtual ~OnInconsistentTopicHandler (); + virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); + private: + ::CCM_DDS::ConnectorStatusListener_var csl_; + ::DDS::Topic_var tp_; + ::DDS::InconsistentTopicStatus const status_; + }; + + class DDS4CCM_NDDS_IMPL_Export OnOfferedDeadlineMissedHandler : + public ACE_Event_Handler + { + public: + OnOfferedDeadlineMissedHandler ( + ::CCM_DDS::ConnectorStatusListener_ptr csl, + ::DDS::DataWriter_ptr dw, + const ::DDS::OfferedDeadlineMissedStatus &status); + virtual ~OnOfferedDeadlineMissedHandler (); + virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); + private: + ::CCM_DDS::ConnectorStatusListener_var csl_; + ::DDS::DataWriter_var dw_; + ::DDS::OfferedDeadlineMissedStatus const status_; + }; + + class DDS4CCM_NDDS_IMPL_Export OnOfferedIncompatibleQoSHandler : + public ACE_Event_Handler + { + public: + OnOfferedIncompatibleQoSHandler ( + ::CCM_DDS::ConnectorStatusListener_ptr csl, + ::DDS::DataWriter_ptr dw, + const ::DDS::OfferedIncompatibleQosStatus &status); + virtual ~OnOfferedIncompatibleQoSHandler (); + virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); + private: + ::CCM_DDS::ConnectorStatusListener_var csl_; + ::DDS::DataWriter_var dw_; + ::DDS::OfferedIncompatibleQosStatus const status_; + }; + + class DDS4CCM_NDDS_IMPL_Export OnRequestedDeadlineMissedHandler : + public ACE_Event_Handler + { + public: + OnRequestedDeadlineMissedHandler ( + ::CCM_DDS::PortStatusListener_ptr psl, + ::DDS::DataReader_ptr dr, + const ::DDS::RequestedDeadlineMissedStatus &status); + virtual ~OnRequestedDeadlineMissedHandler (); + virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); + private: + ::CCM_DDS::PortStatusListener_var psl_; + ::DDS::DataReader_var dr_; + ::DDS::RequestedDeadlineMissedStatus const status_; + }; + + class DDS4CCM_NDDS_IMPL_Export OnSampleLostHandler : + public ACE_Event_Handler + { + public: + OnSampleLostHandler ( + ::CCM_DDS::PortStatusListener_ptr psl, + ::DDS::DataReader_ptr dr, + const ::DDS::SampleLostStatus &status); + virtual ~OnSampleLostHandler (); + virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); + private: + ::CCM_DDS::PortStatusListener_var psl_; + ::DDS::DataReader_var dr_; + ::DDS::SampleLostStatus const status_; + }; + } +} + +#endif /* CIAO_DDS_CALLBACK_STATUS_HANDLER */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp new file mode 100644 index 00000000000..2b28c2ac952 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp @@ -0,0 +1,228 @@ +// -*- C++ -*- +// $Id$ + +#include "dds4ccm/impl/logger/Log_Macros.h" +#include "dds4ccm/impl/ndds/DomainParticipantFactory.h" +#include "dds4ccm/impl/ndds/DomainParticipant.h" +#include "ace/Tokenizer_T.h" +#include "ace/Env_Value_T.h" + +template +DDS_Base_Connector_T::DDS_Base_Connector_T (void) + : domain_id_ (0) + , configuration_complete_ (false) + , library_name_ (0) + , profile_name_ (0) +{ + ACE_Env_Value id (ACE_TEXT("DDS4CCM_DEFAULT_DOMAIN_ID"), this->domain_id_); + this->domain_id_ = id; +} + +template +DDS_Base_Connector_T::~DDS_Base_Connector_T (void) +{ +} + +template +::DDS::DomainId_t +DDS_Base_Connector_T::domain_id (void) +{ + DDS4CCM_TRACE ("DDS_Base_Connector_T::domain_id"); + + return this->domain_id_; +} + +template +void +DDS_Base_Connector_T::domain_id ( + ::DDS::DomainId_t domain_id) +{ + DDS4CCM_TRACE ("DDS_Base_Connector_T::domain_id"); + + if (this->configuration_complete_) + { + throw ::CCM_DDS::NonChangeable (); + } + else + { + this->domain_id_ = domain_id; + } +} + +template +char * +DDS_Base_Connector_T::qos_profile (void) +{ + DDS4CCM_TRACE ("DDS_Base_Connector_T::qos_profile"); + + return CORBA::string_dup (this->qos_profile_.in ()); +} + +template +void +DDS_Base_Connector_T::qos_profile ( + const char * qos_profile) +{ + DDS4CCM_TRACE ("DDS_Base_Connector_T::qos_profile"); + + if (this->configuration_complete_) + { + throw ::CCM_DDS::NonChangeable (); + } + else + { + this->qos_profile_ = qos_profile; + } +} + +template +void +DDS_Base_Connector_T::init_default_domain (void) +{ + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "DDS_Base_Connector_T::init_default_domain - " + "Configuring default domain <%d>\n", + this->domain_id_)); + try + { + ACE_Env_Value verbosity (ACE_TEXT("DDS4CCM_NDDS_LOG_VERBOSITY"), + NDDS_CONFIG_LOG_VERBOSITY_SILENT); + + NDDS_Config_LogVerbosity n_verbosity = + static_cast (verbosity.operator int()); + NDDSConfigLogger::get_instance()->set_verbosity (n_verbosity); + + // Generic code + if (this->qos_profile_.in ()) + { + char* buf = ACE_OS::strdup (this->qos_profile_.in ()); + ACE_Tokenizer_T tok (buf); + tok.delimiter_replace ('#', 0); + for (char *p = tok.next (); p; p = tok.next ()) + { + if (!this->library_name_) + { + this->library_name_ = p; + } + else if (!this->profile_name_) + { + this->profile_name_ = p; + } + } + } + if (this->library_name_ && this->profile_name_) + { + DPFACTORY->set_default_participant_qos_with_profile ( + this->library_name_, + this->profile_name_); + this->domain_participant_ = + DPFACTORY->create_participant_with_profile ( + this->domain_id_, + this->library_name_, + this->profile_name_, + ::DDS::DomainParticipantListener::_nil (), + 0); + } + else + { + ::DDS::DomainParticipantQos qos; + this->domain_participant_ = + DPFACTORY->create_participant ( + this->domain_id_, + qos, + ::DDS::DomainParticipantListener::_nil (), + 0); + } + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_Base_Connector_T::init_default_domain: " + "Caught unknown C++ exception while configuring default domain <%d>\n", + this->domain_id_)); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Base_Connector_T::set_session_context ( + ::Components::SessionContext_ptr ctx) +{ + DDS4CCM_TRACE ("DDS_Base_Connector_T::set_session_context"); + + typename CCM_TYPE::context_type::_var_type lctx = + CCM_TYPE::context_type::_narrow (ctx); + + if (::CORBA::is_nil (lctx.in ())) + { + throw ::CORBA::INTERNAL (); + } + + this->context_ = lctx; +} + +template +void +DDS_Base_Connector_T::configuration_complete (void) +{ + DDS4CCM_TRACE ("DDS_Base_Connector_T::configuration_complete"); + this->init_default_domain (); + this->configuration_complete_ = true; +} + +template +void +DDS_Base_Connector_T::ccm_activate (void) +{ + DDS4CCM_TRACE ("DDS_Base_Connector_T::ccm_activate"); + try + { + if (CORBA::is_nil (this->domainparticipantlistener_.in ())) + { + ACE_NEW_THROW_EX (this->domainparticipantlistener_, + DomainParticipantListener( + this->context_-> + get_connection_error_listener ()), + CORBA::NO_MEMORY ()); + } + this->domain_participant_->set_listener ( + this->domainparticipantlistener_.in (), + ::CIAO::DDS4CCM::DomainParticipantListener_T::get_mask ()); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_Base_Connector_T::ccm_activate: " + "Caught unknown C++ exception while configuring default domain\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Base_Connector_T::ccm_passivate (void) +{ + DDS4CCM_TRACE ("DDS_Base_Connector_T::ccm_passivate"); + try + { + this->domain_participant_->set_listener ( + ::DDS::DomainParticipantListener::_nil (), + 0); + this->domainparticipantlistener_ = ::DDS::DomainParticipantListener::_nil (); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_Base_Connector_T::ccm_passivate: " + "Caught unknown C++ exception while configuring default domain\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Base_Connector_T::ccm_remove (void) +{ + DDS4CCM_TRACE ("DDS_Base_Connector_T::ccm_remove"); + + DPFACTORY->delete_participant ( + this->domain_participant_.in ()); + this->domain_participant_ = ::DDS::DomainParticipant::_nil (); +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h new file mode 100644 index 00000000000..cb798ddf337 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h @@ -0,0 +1,59 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + */ +#ifndef DDS_BASE_CONNECTOR_T_H +#define DDS_BASE_CONNECTOR_T_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Copy_Disabled.h" +#include "tao/LocalObject.h" +#include "dds4ccm/impl/ndds/DomainParticipantListener_T.h" + +template +class DDS_Base_Connector_T + : public virtual CCM_TYPE::base_type, + public virtual ::CORBA::LocalObject, + private virtual ACE_Copy_Disabled +{ +public: + DDS_Base_Connector_T (void); + virtual ~DDS_Base_Connector_T (void); + + virtual ::DDS::DomainId_t domain_id (void); + + virtual void domain_id (::DDS::DomainId_t domain_id); + + virtual char *qos_profile (void); + + virtual void qos_profile (const char * qos_profile); + + virtual void set_session_context (::Components::SessionContext_ptr ctx); + + virtual void configuration_complete (void); + virtual void ccm_remove (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + +protected: + void init_default_domain (void); + + DDS::DomainId_t domain_id_; + CORBA::String_var qos_profile_; + bool configuration_complete_; + const char* library_name_; + const char* profile_name_; + + ::DDS::DomainParticipant_var domain_participant_; + ::DDS::DomainParticipantListener_var domainparticipantlistener_; + typename CCM_TYPE::context_type::_var_type context_; + + ::CCM_DDS::ConnectorStatusListener_var error_listener_; + + typedef ::CIAO::DDS4CCM::DomainParticipantListener_T DomainParticipantListener; +}; + +#include "dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp" + +#endif /* CONNECTOR_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp new file mode 100644 index 00000000000..a5cad0cbda6 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp @@ -0,0 +1,169 @@ +// -*- C++ -*- +// $Id$ + +#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" + +template +DDS_Event_Connector_T::DDS_Event_Connector_T (void) : + DDS_TopicBase_Connector_T() +{ +} + +template +DDS_Event_Connector_T::~DDS_Event_Connector_T (void) +{ +} + +template +typename CCM_TYPE::writer_type::_ptr_type +DDS_Event_Connector_T::get_supplier_data (void) +{ + DDS4CCM_TRACE ("DDS_Event_Connector_T::get_supplier_data"); + + return this->supplier_.get_data (); +} + +template +::DDS::CCM_DataWriter_ptr +DDS_Event_Connector_T::get_supplier_dds_entity (void) +{ + DDS4CCM_TRACE ("DDS_Event_Connector_T::get_supplier_dds_entity"); + + return this->supplier_.get_dds_entity (); +} + +template +typename CCM_TYPE::getter_type::_ptr_type +DDS_Event_Connector_T::get_pull_consumer_fresh_data (void) +{ + DDS4CCM_TRACE ("DDS_Event_Connector_T::get_pull_consumer_fresh_data"); + + return this->pull_consumer_.get_fresh_data (); +} + +template +typename CCM_TYPE::reader_type::_ptr_type +DDS_Event_Connector_T::get_push_consumer_data (void) +{ + DDS4CCM_TRACE ("DDS_Event_Connector_T::get_push_consumer_data"); + + return this->push_consumer_.get_data (); +} + +template +typename CCM_TYPE::reader_type::_ptr_type +DDS_Event_Connector_T::get_pull_consumer_data (void) +{ + DDS4CCM_TRACE ("DDS_Event_Connector_T::get_pull_consumer_data"); + + return this->pull_consumer_.get_data (); +} + +template +::CCM_DDS::CCM_DataListenerControl_ptr +DDS_Event_Connector_T::get_push_consumer_data_control (void) +{ + DDS4CCM_TRACE ("DDS_Event_Connector_T::get_push_consumer_data_control"); + + return this->push_consumer_.get_data_control (); +} + +template +::DDS::CCM_DataReader_ptr +DDS_Event_Connector_T::get_pull_consumer_dds_entity (void) +{ + DDS4CCM_TRACE ("DDS_Event_Connector_T::get_pull_consumer_dds_entity"); + + return this->pull_consumer_.get_dds_entity (); +} + +template +::DDS::CCM_DataReader_ptr +DDS_Event_Connector_T::get_push_consumer_dds_entity (void) +{ + DDS4CCM_TRACE ("DDS_Event_Connector_T::get_push_consumer_dds_entity"); + + return this->push_consumer_.get_dds_entity (); +} + +template +void +DDS_Event_Connector_T::configuration_complete (void) +{ + DDS4CCM_TRACE ("DDS_Event_Connector_T::configuration_complete"); + + DDS_TopicBase_Connector_T::configuration_complete (); + + this->push_consumer_.configuration_complete ( + this->topic_.in (), + this->subscriber_.in (), + this->library_name_, + this->profile_name_); + + this->supplier_.configuration_complete( + this->topic_.in (), + this->publisher_.in (), + this->library_name_, + this->profile_name_); + + this->pull_consumer_.configuration_complete ( + this->topic_.in (), + this->subscriber_.in (), + this->library_name_, + this->profile_name_); +} + +template +void +DDS_Event_Connector_T::ccm_activate (void) +{ + DDS4CCM_TRACE ("DDS_Event_Connector_T::ccm_activate"); + ACE_Reactor* reactor = 0; +#if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) + reactor = this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor (); +#endif + DDS_TopicBase_Connector_T::ccm_activate (reactor); + + this->push_consumer_.activate ( + this->context_->get_connection_push_consumer_data_listener (), + this->context_->get_connection_push_consumer_status (), + reactor); + + this->supplier_.activate (); + + this->pull_consumer_.activate ( + this->context_->get_connection_pull_consumer_status (), + reactor); +} + +template +void +DDS_Event_Connector_T::ccm_passivate (void) +{ + DDS4CCM_TRACE ("DDS_Event_Connector_T::ccm_passivate"); + + this->push_consumer_.passivate (); + this->supplier_.passivate (); + this->pull_consumer_.passivate (); + DDS_TopicBase_Connector_T::ccm_passivate (); +} + +template +void +DDS_Event_Connector_T::ccm_remove (void) +{ + DDS4CCM_TRACE ("DDS_Event_Connector_T::ccm_remove"); + + this->push_consumer_.remove (this->subscriber_.in ()); + this->supplier_.remove (this->publisher_.in ()); + this->pull_consumer_.remove (this->subscriber_.in ()); + DDS_TopicBase_Connector_T::ccm_remove (); +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h new file mode 100644 index 00000000000..e58317060cb --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h @@ -0,0 +1,89 @@ +/** + * @author Marcel Smit + * + * $Id$ + * + * Wrapper facade for NDDS. + */ +#ifndef DDS_EVENT_CONNECTOR_T_H_ +#define DDS_EVENT_CONNECTOR_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 +class DDS_Event_Connector_T + : public virtual DDS_TopicBase_Connector_T +{ +public: + DDS_Event_Connector_T (void); + virtual ~DDS_Event_Connector_T (void); + + /** + * @name DDS_Write + * DDS_Write operations + */ + //@{ + virtual typename CCM_TYPE::writer_type::_ptr_type get_supplier_data (void); + + virtual ::DDS::CCM_DataWriter_ptr get_supplier_dds_entity (void); + //@} + + /** + * @name DDS_Get + * DDS_Get operations + */ + //@{ + virtual typename CCM_TYPE::reader_type::_ptr_type get_pull_consumer_data (void); + + virtual typename CCM_TYPE::getter_type::_ptr_type get_pull_consumer_fresh_data (void); + + virtual ::DDS::CCM_DataReader_ptr get_pull_consumer_dds_entity (void); + //@} + + /** + * @name DDS_Listen + * DDS_Listen operations + */ + //@{ + virtual typename CCM_TYPE::reader_type::_ptr_type get_push_consumer_data (void); + + virtual ::CCM_DDS::CCM_DataListenerControl_ptr get_push_consumer_data_control (void); + + virtual ::DDS::CCM_DataReader_ptr get_push_consumer_dds_entity (void); + //@} + + virtual void configuration_complete (void); + + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + +private: + /** + * DDS_Write supplier + */ + //@{ + DDS_Write_T supplier_; + //@} + + /** + * DDS_Listen push_consumer + */ + //@{ + DDS_Listen_T push_consumer_; + //@} + + /** + * DDS_Get pull_consumer + */ + //@{ + DDS_Get_T pull_consumer_; + //@} +}; + +#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp" + +#endif /* DDS_EVENT_CONNECTOR_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp new file mode 100644 index 00000000000..e65491d078d --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp @@ -0,0 +1,165 @@ +// -*- C++ -*- +// $Id$ + +#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 +DDS_Get_T::DDS_Get_T (void) : + rti_reader_ (0) +{ +} + +template +DDS_Get_T::~DDS_Get_T (void) +{ +} + +template +void +DDS_Get_T::configuration_complete ( + ::DDS::Topic_ptr topic, + ::DDS::Subscriber_ptr subscriber, + const char* library_name, + const char* profile_name) +{ + DDS4CCM_TRACE ("DDS_Get_T::configuration_complete"); + + try + { + if (CORBA::is_nil (this->data_reader_.in ())) + { + ::DDS::DataReader_var reader; + if (profile_name && library_name) + { + reader = subscriber->create_datareader_with_profile ( + topic, + library_name, + profile_name, + ::DDS::DataReaderListener::_nil (), + 0); + } + else + { + ::DDS::DataReaderQos drqos; + reader = subscriber->create_datareader ( + topic, + drqos, + ::DDS::DataReaderListener::_nil (), + 0); + } + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd = + dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ()); + 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); + this->dds_read_.set_qos (topic, library_name, profile_name); + } + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::configuration_complete: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Get_T::activate ( + ::CCM_DDS::PortStatusListener_ptr listener, + ACE_Reactor* reactor) +{ + DDS4CCM_TRACE ("DDS_Get_T::activate"); + try + { + if (CORBA::is_nil (this->status_.in ())) + { + ACE_NEW_THROW_EX (this->status_, + PortStatusListener (listener, reactor), + CORBA::NO_MEMORY ()); + } + this->rti_reader_.set_listener ( + this->status_.in (), + ::CIAO::DDS4CCM::PortStatusListener_T::get_mask ( + listener)); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::activate: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Get_T::passivate (void) +{ + DDS4CCM_TRACE ("DDS_Get_T::passivate"); + try + { + this->dds_get_.passivate (); + this->rti_reader_.set_listener ( + ::DDS::DataReaderListener::_nil (), + 0); + this->status_ = ::DDS::DataReaderListener::_nil (); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::passivate: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Get_T::remove ( + ::DDS::Subscriber_ptr subscriber) +{ + DDS4CCM_TRACE ("DDS_Get_T::remove"); + try + { + subscriber->delete_datareader (this->data_reader_.in ()); + this->data_reader_ = ::DDS::CCM_DataReader::_nil (); + this->dds_get_.set_impl (0); + this->dds_read_.set_impl (0); + this->rti_reader_.set_impl (0); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::remove: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +typename CCM_TYPE::getter_type::_ptr_type +DDS_Get_T::get_fresh_data (void) +{ + DDS4CCM_TRACE ("DDS_Get_T::get_fresh_data"); + + return &this->dds_get_; +} + +template +typename CCM_TYPE::reader_type::_ptr_type +DDS_Get_T::get_data (void) +{ + DDS4CCM_TRACE ("DDS_Get_T::get_data"); + + return &this->dds_read_; +} + +template +::DDS::CCM_DataReader_ptr +DDS_Get_T::get_dds_entity (void) +{ + DDS4CCM_TRACE ("DDS_Get_T::get_dds_entity"); + + return &this->rti_reader_; +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h new file mode 100644 index 00000000000..3ed0f519fe8 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h @@ -0,0 +1,66 @@ +/** + * @author Marcel Smit + * + * $Id$ + * + * Wrapper facade for NDDS. + */ +#ifndef DDS_GET_T_H_ +#define DDS_GET_T_H_ + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/impl/ndds/Reader_T.h" +#include "dds4ccm/impl/ndds/Getter_T.h" +#include "dds4ccm/impl/ndds/PortStatusListener_T.h" + +template +class DDS_Get_T +{ +public: + DDS_Get_T (void); + ~DDS_Get_T (void); + + /** + * @name DDS_Get + * DDS_Get operations + */ + //@{ + typename CCM_TYPE::reader_type::_ptr_type get_data (void); + + typename CCM_TYPE::getter_type::_ptr_type get_fresh_data (void); + + ::DDS::CCM_DataReader_ptr get_dds_entity (void); + //@} + + void configuration_complete ( + ::DDS::Topic_ptr topic, + ::DDS::Subscriber_ptr subscriber, + const char* library_name, + const char* profile_name); + + void activate ( + ::CCM_DDS::PortStatusListener_ptr listener, + ACE_Reactor* reactor); + + void passivate (void); + + void remove (::DDS::Subscriber_ptr subscriber); + +private: + /** + * DDS_Get + */ + //@{ + ::DDS::CCM_DataReader_var data_reader_; + ::DDS::DataReaderListener_var status_; + ::CIAO::DDS4CCM::RTI::Getter_T dds_get_; + ::CIAO::DDS4CCM::RTI::Reader_T dds_read_; + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_; + //@} + + typedef ::CIAO::DDS4CCM::PortStatusListener_T PortStatusListener; +}; + +#include "dds4ccm/impl/ndds/DDS_Get_T.cpp" + +#endif /* DDS_GET_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp new file mode 100644 index 00000000000..afdabd65774 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp @@ -0,0 +1,175 @@ +// -*- C++ -*- +// $Id$ + +#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" + +template +DDS_Listen_T::DDS_Listen_T (void) : + data_control_ (new CCM_DDS_DataListenerControl_T + < ::CCM_DDS::CCM_DataListenerControl> ()), + rti_reader_ (0) +{ +} + +template +DDS_Listen_T::~DDS_Listen_T (void) +{ +} + +template +void +DDS_Listen_T::configuration_complete ( + ::DDS::Topic_ptr topic, + ::DDS::Subscriber_ptr subscriber, + const char* library_name, + const char* profile_name) +{ + DDS4CCM_TRACE ("DDS_Listen_T::configuration_complete"); + + try + { + if (CORBA::is_nil (this->data_reader_.in ())) + { + ::DDS::DataReader_var reader; + if (library_name && profile_name) + { + reader = subscriber->create_datareader_with_profile ( + topic, + library_name, + profile_name, + ::DDS::DataReaderListener::_nil (), + 0); + } + else + { + ::DDS::DataReaderQos drqos; + reader = subscriber->create_datareader ( + topic, + drqos, + ::DDS::DataReaderListener::_nil (), + 0); + } + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd = + dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ()); + 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); + } + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::configuration_complete: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Listen_T::activate ( + typename CCM_TYPE::listener_type::_ptr_type listener, + ::CCM_DDS::PortStatusListener_ptr status, + ACE_Reactor* reactor) +{ + DDS4CCM_TRACE ("DDS_Listen_T::activate"); + try + { + if (CORBA::is_nil (this->data_listener_.in ())) + { + ACE_NEW_THROW_EX (this->data_listener_, + DataReaderListener ( + listener, + status, + this->data_control_.in (), + reactor), + CORBA::NO_MEMORY ()); + } + this->rti_reader_.set_listener ( + this->data_listener_.in (), + ::CIAO::DDS4CCM::DataReaderListener_T::get_mask ( + listener)); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::activate: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Listen_T::passivate () +{ + DDS4CCM_TRACE ("DDS_Listen_T::passivate"); + try + { + this->rti_reader_.set_listener ( + ::DDS::DataReaderListener::_nil (), + 0); + this->data_listener_= ::DDS::DataReaderListener::_nil (); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::passivate: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Listen_T::remove ( + ::DDS::Subscriber_ptr subscriber) +{ + DDS4CCM_TRACE ("DDS_Listen_T::remove"); + try + { + subscriber->delete_datareader (this->data_reader_.in ()); + this->rti_reader_.set_impl (0); + this->data_reader_ = ::DDS::CCM_DataReader::_nil (); + this->dds_read_.set_impl (0); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::remove: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + + +template +typename CCM_TYPE::reader_type::_ptr_type +DDS_Listen_T::get_data (void) +{ + DDS4CCM_TRACE ("DDS_Listen_T::get_data"); + + return &this->dds_read_; +} + +template +::DDS::CCM_DataReader_ptr +DDS_Listen_T::get_dds_entity (void) +{ + DDS4CCM_TRACE ("DDS_Listen_T::get_dds_entity"); + + return &this->rti_reader_; +} + +template +::CCM_DDS::CCM_DataListenerControl_ptr +DDS_Listen_T::get_data_control (void) +{ + DDS4CCM_TRACE ("DDS_Listen_T::get_data_control"); + + return ::CCM_DDS::CCM_DataListenerControl::_duplicate (this->data_control_.in ()); +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h new file mode 100644 index 00000000000..1787e9319db --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h @@ -0,0 +1,66 @@ +/** + * @author Marcel Smit + * + * $Id$ + * + * Wrapper facade for NDDS. + */ +#ifndef DDS_LISTEN_T_H_ +#define DDS_LISTEN_T_H_ + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL +class ACE_Reactor; +ACE_END_VERSIONED_NAMESPACE_DECL + +template +class DDS_Listen_T +{ +public: + DDS_Listen_T (void); + ~DDS_Listen_T (void); + + /** + * @name DDS_Listen + * DDS_Listen operations + */ + //@{ + typename CCM_TYPE::reader_type::_ptr_type get_data (void); + + ::CCM_DDS::CCM_DataListenerControl_ptr get_data_control (void); + + ::DDS::CCM_DataReader_ptr get_dds_entity (void); + //@} + + void configuration_complete ( + ::DDS::Topic_ptr topic, + ::DDS::Subscriber_ptr subscriber, + const char* library_name, + const char* profile_name); + + void activate ( + typename CCM_TYPE::listener_type::_ptr_type listener, + ::CCM_DDS::PortStatusListener_ptr status, + ACE_Reactor* reactor); + + void passivate (void); + + void remove ( + ::DDS::Subscriber_ptr subscriber); + +private: + /** + * DDS_Listen + */ + //@{ + ::DDS::CCM_DataReader_var data_reader_; + ::CCM_DDS::CCM_DataListenerControl_var data_control_; + ::DDS::DataReaderListener_var data_listener_; + ::CIAO::DDS4CCM::RTI::Reader_T dds_read_; + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_; + //@} + typedef ::CIAO::DDS4CCM::DataReaderListener_T DataReaderListener; +}; + +#include "dds4ccm/impl/ndds/DDS_Listen_T.cpp" + +#endif /* DDS_LISTEN_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp new file mode 100644 index 00000000000..9de3be9e328 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp @@ -0,0 +1,156 @@ +// -*- C++ -*- +// $Id$ + +#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 +DDS_Read_T::DDS_Read_T (void) : + rti_reader_ (0) +{ +} + +template +DDS_Read_T::~DDS_Read_T (void) +{ +} + +template +void +DDS_Read_T::configuration_complete ( + ::DDS::Topic_ptr topic, + ::DDS::Subscriber_ptr subscriber, + const char* library_name, + const char* profile_name) +{ + DDS4CCM_TRACE ("DDS_Read_T::configuration_complete"); + + try + { + if (CORBA::is_nil (this->data_.in ())) + { + ::DDS::DataReader_var reader; + if (profile_name && library_name) + { + reader = subscriber->create_datareader_with_profile ( + topic, + library_name, + profile_name, + ::DDS::DataReaderListener::_nil (), + 0); + } + else + { + ::DDS::DataReaderQos drqos; + reader = subscriber->create_datareader ( + topic, + drqos, + ::DDS::DataReaderListener::_nil (), + 0); + } + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd = + dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ()); + 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); + } + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::configuration_complete: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Read_T::activate ( + ::CCM_DDS::PortStatusListener_ptr listener, + ACE_Reactor* reactor) +{ + DDS4CCM_TRACE ("DDS_Read_T::activate"); + + try + { + if (CORBA::is_nil (this->status_.in ())) + { + ACE_NEW_THROW_EX (this->status_, + PortStatusListener (listener, reactor), + CORBA::NO_MEMORY ()); + } + this->rti_reader_.set_listener ( + this->status_.in (), + ::CIAO::DDS4CCM::PortStatusListener_T::get_mask ( + listener)); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::activate: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Read_T::passivate () +{ + DDS4CCM_TRACE ("DDS_Read_T::passivate"); + + try + { + this->rti_reader_.set_listener (::DDS::DataReaderListener::_nil (), 0); + this->status_ = ::DDS::DataReaderListener::_nil (); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::passivate: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Read_T::remove ( + ::DDS::Subscriber_ptr subscriber) +{ + DDS4CCM_TRACE ("DDS_Read_T::remove"); + + try + { + subscriber->delete_datareader (this->data_.in ()); + this->rti_reader_.set_impl (0); + this->data_ = ::DDS::CCM_DataReader::_nil (); + this->dds_read_.set_impl (0); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::remove: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +typename CCM_TYPE::reader_type::_ptr_type +DDS_Read_T::get_data (void) +{ + DDS4CCM_TRACE ("DDS_Read_T::get_data"); + + return &this->dds_read_; +} + +template +::DDS::CCM_DataReader_ptr +DDS_Read_T::get_dds_entity (void) +{ + DDS4CCM_TRACE ("DDS_Read_T::get_dds_entity"); + + return &this->rti_reader_; +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h new file mode 100644 index 00000000000..54ce6b30926 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h @@ -0,0 +1,60 @@ +/** + * @author Marcel Smit + * + * $Id$ + * + * Wrapper facade for NDDS. + */ +#ifndef DDS_READ_T_H_ +#define DDS_READ_T_H_ + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" + +template +class DDS_Read_T +{ +public: + DDS_Read_T (void); + ~DDS_Read_T (void); + + /** + * @name DDS_Read + * DDS_Read operations + */ + //@{ + typename CCM_TYPE::reader_type::_ptr_type get_data (void); + + ::DDS::CCM_DataReader_ptr get_dds_entity (void); + //@} + + void configuration_complete ( + ::DDS::Topic_ptr topic, + ::DDS::Subscriber_ptr subscriber, + const char* library_name, + const char* profile_name); + + void activate ( + ::CCM_DDS::PortStatusListener_ptr listener, + ACE_Reactor* reactor); + + void passivate (void); + + void remove ( + ::DDS::Subscriber_ptr subscriber); + +private: + /** + * DDS_Read + */ + //@{ + ::DDS::CCM_DataReader_var data_; + ::DDS::DataReaderListener_var status_; + ::CIAO::DDS4CCM::RTI::Reader_T dds_read_; + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_; + //@} + typedef ::CIAO::DDS4CCM::PortStatusListener_T PortStatusListener; +}; + +#include "dds4ccm/impl/ndds/DDS_Read_T.cpp" + +#endif /* DDS_READ_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp new file mode 100644 index 00000000000..01acfc8df28 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp @@ -0,0 +1,170 @@ +// -*- C++ -*- +// $Id$ + +#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" + +template +DDS_StateListen_T::DDS_StateListen_T (void) : + data_control_ (new CCM_DDS_StateListenerControl_T + < ::CCM_DDS::CCM_StateListenerControl> ()), + rti_reader_ (0) +{ +} + +template +DDS_StateListen_T::~DDS_StateListen_T (void) +{ +} + +template +void +DDS_StateListen_T::configuration_complete ( + ::DDS::Topic_ptr topic, + ::DDS::Subscriber_ptr subscriber, + const char* library_name, + const char* profile_name) +{ + DDS4CCM_TRACE ("DDS_StateListen_T::configuration_complete"); + + try + { + if (CORBA::is_nil (this->data_reader_.in ())) + { + ::DDS::DataReader_var reader; + if (library_name && profile_name) + { + reader = subscriber->create_datareader_with_profile ( + topic, + library_name, + profile_name, + ::DDS::DataReaderListener::_nil (), + 0); + } + else + { + ::DDS::DataReaderQos drqos; + reader = subscriber->create_datareader ( + topic, + drqos, + ::DDS::DataReaderListener::_nil (), + 0); + } + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd = + dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ()); + 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 ()); + } + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::configuration_complete: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_StateListen_T::activate ( + typename CCM_TYPE::statelistener_type::_ptr_type listener, + ::CCM_DDS::PortStatusListener_ptr status, + ACE_Reactor* reactor) +{ + DDS4CCM_TRACE ("DDS_StateListen_T::activate"); + + try + { + if (CORBA::is_nil (this->data_listener_.in ())) + { + ACE_NEW_THROW_EX (this->data_listener_, + DataReaderStateListener ( + listener, + status, + data_control_.in (), + reactor), + CORBA::NO_MEMORY ()); + } + this->rti_reader_.set_listener ( + this->data_listener_.in (), + ::CIAO::DDS4CCM::DataReaderStateListener_T::get_mask ( + listener)); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::activate: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_StateListen_T::passivate (void) +{ + DDS4CCM_TRACE ("DDS_StateListen_T::passivate"); + try + { + this->rti_reader_.set_listener ( + ::DDS::DataReaderListener::_nil (), + 0); + this->data_listener_ = ::DDS::DataReaderListener::_nil (); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::passivate: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_StateListen_T::remove ( + ::DDS::Subscriber_ptr subscriber) +{ + DDS4CCM_TRACE ("DDS_StateListen_T::remove"); + try + { + subscriber->delete_datareader (this->data_reader_.in ()); + this->rti_reader_.set_impl (0); + this->data_reader_ = ::DDS::CCM_DataReader::_nil (); + this->dds_read_.set_impl (0); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::remove: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +typename CCM_TYPE::reader_type::_ptr_type +DDS_StateListen_T::get_data (void) +{ + DDS4CCM_TRACE ("DDS_StateListen_T::get_data"); + + return &this->dds_read_; +} + +template +::DDS::CCM_DataReader_ptr +DDS_StateListen_T::get_dds_entity (void) +{ + DDS4CCM_TRACE ("DDS_StateListen_T::get_dds_entity"); + + return &this->rti_reader_; +} + +template +::CCM_DDS::CCM_StateListenerControl_ptr +DDS_StateListen_T::get_data_control (void) +{ + DDS4CCM_TRACE ("DDS_StateListen_T::get_data_control"); + + return ::CCM_DDS::CCM_StateListenerControl::_duplicate ( + this->data_control_.in ()); +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h new file mode 100644 index 00000000000..2692ccd3bf5 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h @@ -0,0 +1,63 @@ +/** + * @author Marcel Smit + * + * $Id$ + * + * Wrapper facade for NDDS. + */ +#ifndef DDS_STATELISTEN_T_H_ +#define DDS_STATELISTEN_T_H_ + +template +class DDS_StateListen_T +{ +public: + DDS_StateListen_T (void); + ~DDS_StateListen_T (void); + + /** + * @name DDS_Listen + * DDS_Listen operations + */ + //@{ + typename CCM_TYPE::reader_type::_ptr_type get_data (void); + + ::CCM_DDS::CCM_StateListenerControl_ptr get_data_control (void); + + ::DDS::CCM_DataReader_ptr get_dds_entity (void); + //@} + + void configuration_complete ( + ::DDS::Topic_ptr topic, + ::DDS::Subscriber_ptr subscriber, + const char* library_name, + const char* profile_name); + + void activate ( + typename CCM_TYPE::statelistener_type::_ptr_type listener, + ::CCM_DDS::PortStatusListener_ptr status, + ACE_Reactor* reactor); + + void passivate (void); + + void remove ( + ::DDS::Subscriber_ptr subscriber); + + +private: + /** + * DDS_Listen + */ + //@{ + ::DDS::CCM_DataReader_var data_reader_; + ::CCM_DDS::CCM_StateListenerControl_var data_control_; + ::DDS::DataReaderListener_var data_listener_; + ::CIAO::DDS4CCM::RTI::Reader_T dds_read_; + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_; + //@} + typedef ::CIAO::DDS4CCM::DataReaderStateListener_T DataReaderStateListener; +}; + +#include "dds4ccm/impl/ndds/DDS_StateListen_T.cpp" + +#endif /* DDS_STATELISTEN_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp new file mode 100644 index 00000000000..7bd64199729 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp @@ -0,0 +1,208 @@ +// -*- C++ -*- +// $Id$ + +#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" + +template +DDS_State_Connector_T::DDS_State_Connector_T (void) : + DDS_TopicBase_Connector_T () +{ +} + +template +DDS_State_Connector_T::~DDS_State_Connector_T (void) +{ +} + +template +typename CCM_TYPE::updater_type::_ptr_type +DDS_State_Connector_T::get_observable_data (void) +{ + return this->observable_.get_data (); +} + +template +::DDS::CCM_DataWriter_ptr +DDS_State_Connector_T::get_observable_dds_entity (void) +{ + return this->observable_.get_dds_entity (); +} + +template +typename CCM_TYPE::reader_type::_ptr_type +DDS_State_Connector_T::get_passive_observer_data (void) +{ + return this->passive_observer_.get_data (); +} + +template +::DDS::CCM_DataReader_ptr +DDS_State_Connector_T::get_passive_observer_dds_entity (void) +{ + return this->passive_observer_.get_dds_entity (); +} + +template +typename CCM_TYPE::reader_type::_ptr_type +DDS_State_Connector_T::get_pull_observer_data (void) +{ + return this->pull_observer_.get_data (); +} + +template +typename CCM_TYPE::getter_type::_ptr_type +DDS_State_Connector_T::get_pull_observer_fresh_data (void) +{ + return this->pull_observer_.get_fresh_data (); +} + +template +::DDS::CCM_DataReader_ptr +DDS_State_Connector_T::get_pull_observer_dds_entity (void) +{ + return this->pull_observer_.get_dds_entity (); +} + +template +typename CCM_TYPE::reader_type::_ptr_type +DDS_State_Connector_T::get_push_observer_data (void) +{ + return this->push_observer_.get_data (); +} + +template +::CCM_DDS::CCM_DataListenerControl_ptr +DDS_State_Connector_T::get_push_observer_data_control (void) +{ + return this->push_observer_.get_data_control (); +} + +template +::DDS::CCM_DataReader_ptr +DDS_State_Connector_T::get_push_observer_dds_entity (void) +{ + return this->push_observer_.get_dds_entity (); +} + +template +typename CCM_TYPE::reader_type::_ptr_type +DDS_State_Connector_T::get_push_state_observer_data (void) +{ + return this->push_state_observer_.get_data (); +} + +template +::CCM_DDS::CCM_StateListenerControl_ptr +DDS_State_Connector_T::get_push_state_observer_data_control (void) +{ + return this->push_state_observer_.get_data_control (); +} + +template +::DDS::CCM_DataReader_ptr +DDS_State_Connector_T::get_push_state_observer_dds_entity (void) +{ + return this->push_state_observer_.get_dds_entity (); +} + +template +void +DDS_State_Connector_T::configuration_complete (void) +{ + DDS_TopicBase_Connector_T::configuration_complete (); + this->observable_.configuration_complete ( + this->topic_.in (), + this->publisher_.in (), + this->library_name_, + this->profile_name_); + + this->push_observer_.configuration_complete ( + this->topic_.in (), + this->subscriber_.in (), + this->library_name_, + this->profile_name_); + + this->push_state_observer_.configuration_complete ( + this->topic_.in (), + this->subscriber_.in (), + this->library_name_, + this->profile_name_); + + this->pull_observer_.configuration_complete ( + this->topic_.in (), + this->subscriber_.in (), + this->library_name_, + this->profile_name_); + + this->passive_observer_.configuration_complete ( + this->topic_.in (), + this->subscriber_.in (), + this->library_name_, + this->profile_name_); +} + +template +void +DDS_State_Connector_T::ccm_activate (void) +{ + ACE_Reactor* reactor = 0; +#if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1) + reactor = this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor (); +#endif + DDS_TopicBase_Connector_T::ccm_activate (reactor); + + this->observable_.activate (); + + this->push_observer_.activate ( + this->context_->get_connection_push_observer_data_listener (), + this->context_->get_connection_push_observer_status (), + reactor); + + this->push_state_observer_.activate ( + this->context_->get_connection_push_state_observer_data_listener (), + this->context_->get_connection_push_state_observer_status (), + reactor); + + this->pull_observer_.activate ( + this->context_->get_connection_pull_observer_status (), + reactor); + + this->passive_observer_.activate ( + this->context_->get_connection_passive_observer_status (), + reactor); +} + +template +void +DDS_State_Connector_T::ccm_passivate (void) +{ + this->observable_.passivate (); + this->push_observer_.passivate (); + this->push_state_observer_.passivate (); + this->pull_observer_.passivate (); + this->passive_observer_.passivate (); + DDS_TopicBase_Connector_T::ccm_passivate (); +} + +template +void +DDS_State_Connector_T::ccm_remove (void) +{ + this->observable_.remove (this->publisher_.in ()); + this->push_observer_.remove (this->subscriber_.in ()); + this->push_state_observer_.remove (this->subscriber_.in ()); + this->pull_observer_.remove (this->subscriber_.in ()); + this->passive_observer_.remove (this->subscriber_.in ()); + DDS_TopicBase_Connector_T::ccm_remove (); +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h new file mode 100644 index 00000000000..89cacaf4a5b --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h @@ -0,0 +1,110 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ +#ifndef DDS_STATE_CONNECTOR_T_H_ +#define DDS_STATE_CONNECTOR_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 +class DDS_State_Connector_T + : public virtual DDS_TopicBase_Connector_T +{ +public: + DDS_State_Connector_T (void); + virtual ~DDS_State_Connector_T (void); + + virtual typename CCM_TYPE::updater_type::_ptr_type + get_observable_data (void); + + virtual ::DDS::CCM_DataWriter_ptr + get_observable_dds_entity (void); + + virtual typename CCM_TYPE::reader_type::_ptr_type + get_passive_observer_data (void); + + virtual ::DDS::CCM_DataReader_ptr + get_passive_observer_dds_entity (void); + + virtual typename CCM_TYPE::reader_type::_ptr_type + get_pull_observer_data (void); + + virtual typename CCM_TYPE::getter_type::_ptr_type + get_pull_observer_fresh_data (void); + + virtual ::DDS::CCM_DataReader_ptr + get_pull_observer_dds_entity (void); + + virtual typename CCM_TYPE::reader_type::_ptr_type + get_push_observer_data (void); + + virtual ::CCM_DDS::CCM_DataListenerControl_ptr + get_push_observer_data_control (void); + + virtual ::DDS::CCM_DataReader_ptr + get_push_observer_dds_entity (void); + + virtual typename CCM_TYPE::reader_type::_ptr_type + get_push_state_observer_data (void); + + virtual ::CCM_DDS::CCM_StateListenerControl_ptr + get_push_state_observer_data_control (void); + + virtual ::DDS::CCM_DataReader_ptr + get_push_state_observer_dds_entity (void); + + virtual void configuration_complete (void); + + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + +private: + /** + * DDS_Update observable + */ + //@{ + DDS_Update_T observable_; + //@} + + /** + * DDS_Read passive_observer + */ + //@{ + DDS_Read_T passive_observer_; + //@} + + /** + * DDS_Get pull_observer + */ + //@{ + DDS_Get_T pull_observer_; + //@} + + /** + * DDS_Listen push_observer + */ + //@{ + DDS_Listen_T push_observer_; + //@} + + /** + * DDS_StateListen push_state_observer + */ + //@{ + DDS_StateListen_T push_state_observer_; + //@} +}; + +#include "dds4ccm/impl/ndds/DDS_State_Connector_T.cpp" + +#endif /* DDS_STATE_CONNECTOR_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp new file mode 100644 index 00000000000..5fb5b21411d --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp @@ -0,0 +1,464 @@ +// -*- C++ -*- +// $Id$ + +#include "dds4ccm/impl/logger/Log_Macros.h" + +template +DDS_TopicBase_Connector_T::DDS_TopicBase_Connector_T (void) : + DDS_Base_Connector_T() +{ +} + +template +DDS_TopicBase_Connector_T::~DDS_TopicBase_Connector_T (void) +{ +} + +template +void +DDS_TopicBase_Connector_T::configuration_complete (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::configuration_complete"); + DDS_Base_Connector_T::configuration_complete (); + this->init_default_topic (); + this->init_subscriber (); + this->init_publisher (); +} + +template +void +DDS_TopicBase_Connector_T::ccm_activate (ACE_Reactor* reactor) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::ccm_activate"); + DDS_Base_Connector_T::ccm_activate (); + this->activate_default_topic (reactor); + this->activate_subscriber (reactor); + this->activate_publisher (reactor); +} + +template +void +DDS_TopicBase_Connector_T::ccm_passivate (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::ccm_passivate"); + this->passivate_default_topic (); + this->passivate_subscriber (); + this->passivate_publisher (); + DDS_Base_Connector_T::ccm_passivate (); +} + +template +void +DDS_TopicBase_Connector_T::ccm_remove (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::ccm_remove"); + this->remove_default_topic (); + this->remove_subscriber (); + this->remove_publisher (); + DDS_Base_Connector_T::ccm_remove (); +} + +template +char * +DDS_TopicBase_Connector_T::topic_name (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::topic_name"); + return CORBA::string_dup (this->topic_name_.in ()); +} + +template +void +DDS_TopicBase_Connector_T::topic_name ( + const char * topic_name) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::topic_name"); + if (this->configuration_complete_) + { + throw ::CCM_DDS::NonChangeable (); + } + else + { + this->topic_name_ = topic_name; + } +} + +template +void +DDS_TopicBase_Connector_T::key_fields ( + const ::DDS::StringSeq & key_fields) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::key_fields"); + if (this->configuration_complete_) + { + throw ::CCM_DDS::NonChangeable (); + } + else + { + this->key_fields_.length (key_fields.length ()); + for (CORBA::ULong i = 0; i < key_fields.length (); ++i) + { + this->key_fields_.operator [](i) = CORBA::string_dup (key_fields[i]); + } + } +} + +template +::DDS::StringSeq * +DDS_TopicBase_Connector_T::key_fields (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::key_fields"); +/* + For future use, DDS_TYPE doesn't have get_typecode yet + ::DDS_TypeCode* ptr = ::DDS_TYPE::type_support::get_typecode (); + DDS_ExceptionCode_t ex; + DDS_UnsignedLong const number = ptr->member_count (ex); + for (DDS_UnsignedLong i = 0; i < number; i++) + { + if (ptr->is_member_key (i, ex)) + { + const char* name = ptr->member_name (i, ex); + printf ("Name: %s\n", name); + } + } + */ + ::DDS::StringSeq_var retval = 0; + ACE_NEW_THROW_EX (retval, + ::DDS::StringSeq (this->key_fields_.length ()), + CORBA::NO_MEMORY ()); + retval->length (this->key_fields_.length ()); + + for (CORBA::ULong i = 0; i < this->key_fields_.length (); ++i) + { + (*retval)[i] = CORBA::string_dup (this->key_fields_[i]); + } + return retval._retn (); +} + +template +void +DDS_TopicBase_Connector_T::init_default_topic (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::init_default_topic"); + + if (CORBA::is_nil (this->topic_)) + { + try + { + CIAO::DDS4CCM::CCM_DDS_DomainParticipant_i *part = + dynamic_cast< CIAO::DDS4CCM::CCM_DDS_DomainParticipant_i * > ( + this->domain_participant_.in ()); + DDS_ReturnCode_t const retcode = DDS_TYPE::type_support::register_type( + part->get_impl (), DDS_TYPE::type_support::get_type_name ()); + + if (retcode == DDS_RETCODE_OK) + { + if (this->library_name_ && this->profile_name_) + { + this->topic_ = + this->domain_participant_->create_topic_with_profile ( + this->topic_name_.in (), + DDS_TYPE::type_support::get_type_name (), + this->library_name_, + this->profile_name_, + ::DDS::TopicListener::_nil (), + 0); + } + else + { + ::DDS::TopicQos tqos; + this->topic_ = + this->domain_participant_->create_topic ( + this->topic_name_.in (), + DDS_TYPE::type_support::get_type_name (), + tqos, + ::DDS::TopicListener::_nil (), + 0); + } + } + else + { + throw CCM_DDS::InternalError (retcode, 0); + } + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::init_default_topic: " + "Caught unknown C++ exception.\n")); + throw CORBA::INTERNAL (); + } + } +} + +template +void +DDS_TopicBase_Connector_T::init_subscriber (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::init_subscriber"); + + if (CORBA::is_nil (this->subscriber_.in ())) + { + try + { + if (this->library_name_ && this->profile_name_) + { + this->subscriber_ = this->domain_participant_-> + create_subscriber_with_profile ( + this->library_name_, + this->profile_name_, + ::DDS::SubscriberListener::_nil (), + 0); + } + else + { + ::DDS::SubscriberQos sqos; + this->subscriber_ = this->domain_participant_-> + create_subscriber ( + sqos, + ::DDS::SubscriberListener::_nil (), + 0); + } + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::init_subscriber: " + "Caught unknown C++ exception.\n")); + throw CORBA::INTERNAL (); + } + } +} + +template +void +DDS_TopicBase_Connector_T::init_publisher (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::init_publisher"); + + if (CORBA::is_nil (this->publisher_.in ())) + { + if (this->library_name_ && this->profile_name_) + { + this->publisher_ = this->domain_participant_-> + create_publisher_with_profile ( + this->library_name_, + this->profile_name_, + ::DDS::PublisherListener::_nil (), + 0); + } + else + { + ::DDS::PublisherQos pqos; + this->publisher_ = this->domain_participant_-> + create_publisher ( + pqos, + ::DDS::PublisherListener::_nil (), + 0); + } + } +} + +template +void +DDS_TopicBase_Connector_T::activate_default_topic (ACE_Reactor* reactor) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::activate_default_topic"); + try + { + if (CORBA::is_nil (this->topiclistener_.in ())) + { + ACE_NEW_THROW_EX (this->topiclistener_, + TopicListener ( + this->context_->get_connection_error_listener (), + reactor), + CORBA::NO_MEMORY ()); + } + this->topic_->set_listener ( + this->topiclistener_.in (), + ::CIAO::DDS4CCM::TopicListener_T::get_mask ( + this->context_->get_connection_error_listener ())); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::activate_default_topic: " + "Caught unknown C++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_TopicBase_Connector_T::activate_subscriber (ACE_Reactor* reactor) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::activate_subscriber"); + + try + { + if (CORBA::is_nil (this->subscriber_listener_.in ())) + { + ACE_NEW_THROW_EX (this->subscriber_listener_, + SubscriberListener ( + this->context_->get_connection_error_listener (), + reactor), + CORBA::NO_MEMORY ()); + } + this->subscriber_->set_listener ( + this->subscriber_listener_.in (), + ::CIAO::DDS4CCM::SubscriberListener_T::get_mask ( + this->context_->get_connection_error_listener ())); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::activate_subscriber: " + "Caught unknown C++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_TopicBase_Connector_T::activate_publisher (ACE_Reactor* reactor) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::activate_publisher"); + + try + { + if (CORBA::is_nil (this->publisher_listener_.in ())) + { + ACE_NEW_THROW_EX (this->publisher_listener_, + PublisherListener ( + this->context_->get_connection_error_listener (), + reactor), + CORBA::NO_MEMORY ()); + } + this->publisher_->set_listener ( + this->publisher_listener_.in (), + ::CIAO::DDS4CCM::PublisherListener_T::get_mask ( + this->context_->get_connection_error_listener ())); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::activate_publisher: " + "Caught unknown C++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_TopicBase_Connector_T::passivate_default_topic (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::passivate_default_topic"); + + try + { + this->topic_->set_listener ( + ::DDS::TopicListener::_nil (), + 0); + + this->topiclistener_ = ::DDS::TopicListener::_nil (); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::passivate_default_topic: " + "Caught unknown C++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_TopicBase_Connector_T::passivate_subscriber (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::passivate_subscriber"); + + try + { + this->subscriber_->set_listener ( + ::DDS::SubscriberListener::_nil (), + 0); + this->subscriber_listener_ = ::DDS::SubscriberListener::_nil (); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::passivate_subscriber: " + "Caught unknown C++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_TopicBase_Connector_T::passivate_publisher (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::passivate_publisher"); + + try + { + this->publisher_->set_listener ( + ::DDS::PublisherListener::_nil (), + 0); + this->publisher_listener_ = ::DDS::PublisherListener::_nil (); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::passivate_default_topic: " + "Caught unknown C++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_TopicBase_Connector_T::remove_default_topic (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::remove_default_topic"); + + try + { + this->domain_participant_->delete_topic (this->topic_.in ()); + this->topic_ = ::DDS::Topic::_nil (); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::remove_default_topic: " + "Caught unknown C++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_TopicBase_Connector_T::remove_subscriber (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::remove_subscriber"); + + try + { + this->domain_participant_->delete_subscriber (this->subscriber_.in ()); + this->subscriber_ = ::DDS::Subscriber::_nil (); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::remove_subscriber: " + "Caught unknown C++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_TopicBase_Connector_T::remove_publisher (void) +{ + DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::remove_publisher"); + + try + { + this->domain_participant_->delete_publisher (this->publisher_.in ()); + this->publisher_ = ::DDS::Publisher::_nil (); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::remove_publisher: " + "Caught unknown C++ exception.\n")); + throw CORBA::INTERNAL (); + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h new file mode 100644 index 00000000000..69af82224f6 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h @@ -0,0 +1,73 @@ +/** + * @author Marcel Smit + * + * $Id$ + * + * Wrapper facade for NDDS. + */ +#ifndef DDS_TOPIC_BASE_CONNECTOR_H +#define DDS_TOPIC_BASE_CONNECTOR_H + +#include "ace/Copy_Disabled.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 +class DDS_TopicBase_Connector_T + : public virtual DDS_Base_Connector_T +{ +public: + DDS_TopicBase_Connector_T (void); + virtual ~DDS_TopicBase_Connector_T (void); + + virtual char *topic_name (void); + + virtual void topic_name (const char * topic_name); + + virtual ::DDS::StringSeq *key_fields (void); + + virtual void key_fields (const ::DDS::StringSeq & key_fields); + + virtual void configuration_complete (void); + virtual void ccm_remove (void); + virtual void ccm_activate (ACE_Reactor* reactor); + virtual void ccm_passivate (void); + +protected: + void init_default_topic (void); + void init_publisher (void); + void init_subscriber (void); + + void activate_default_topic (ACE_Reactor* reactor); + void activate_publisher (ACE_Reactor* reactor); + void activate_subscriber (ACE_Reactor* reactor); + + void passivate_default_topic (void); + void passivate_publisher (void); + void passivate_subscriber (void); + + void remove_default_topic (void); + void remove_publisher (void); + void remove_subscriber (void); + + CORBA::String_var topic_name_; + DDS::StringSeq key_fields_; + + ::DDS::Topic_var topic_; + ::DDS::TopicListener_var topiclistener_; + + ::DDS::Publisher_var publisher_; + ::DDS::PublisherListener_var publisher_listener_; + ::DDS::Subscriber_var subscriber_; + ::DDS::SubscriberListener_var subscriber_listener_; + +typedef ::CIAO::DDS4CCM::TopicListener_T TopicListener; +typedef ::CIAO::DDS4CCM::SubscriberListener_T SubscriberListener; +typedef ::CIAO::DDS4CCM::PublisherListener_T PublisherListener; +}; + +#include "dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp" + +#endif /* DDS_TOPIC_BASE_CONNECTOR_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp new file mode 100644 index 00000000000..9d36a15099b --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp @@ -0,0 +1,144 @@ +// -*- C++ -*- +// $Id$ + +#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 +DDS_Update_T::DDS_Update_T (void) : + rti_writer_ (0) +{ +} + +template +DDS_Update_T::~DDS_Update_T (void) +{ +} + +template +void +DDS_Update_T::configuration_complete ( + ::DDS::Topic_ptr topic, + ::DDS::Publisher_ptr publisher, + const char* library_name, + const char* profile_name) +{ + DDS4CCM_TRACE ("DDS_Update_T::configuration_complete"); + if (CORBA::is_nil (this->data_writer_.in ())) + { + try + { + ::DDS::DataWriter_var dwv_tmp; + if (library_name && profile_name) + { + dwv_tmp = publisher->create_datawriter_with_profile ( + topic, + library_name, + profile_name, + ::DDS::DataWriterListener::_nil (), + 0); + } + else + { + ::DDS::DataWriterQos dwqos; + dwv_tmp = publisher->create_datawriter ( + topic, + dwqos, + ::DDS::DataWriterListener::_nil (), + 0); + } + ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rw = + dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dwv_tmp.in ()); + this->rti_writer_.set_impl (rw->get_impl ()); + this->data_writer_ = ::DDS::CCM_DataWriter::_narrow (dwv_tmp); + this->dds_update_.set_impl (dwv_tmp); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::configuration_complete: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } + } +} + +template +void +DDS_Update_T::activate () +{ + DDS4CCM_TRACE ("DDS_Update_T::activate"); + try + { + if (CORBA::is_nil (this->data_listener_.in ())) + { + ACE_NEW_THROW_EX (this->data_listener_, + DataWriterListener (), + CORBA::NO_MEMORY ()); + } + this->rti_writer_.set_listener ( + this->data_listener_.in (), + ::CIAO::DDS4CCM::DataWriterListener_T::get_mask ()); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::activate: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Update_T::passivate () +{ + DDS4CCM_TRACE ("DDS_Update_T::passivate"); + try + { + this->rti_writer_.set_listener ( + ::DDS::DataWriterListener::_nil (), + 0); + this->data_listener_ = ::DDS::DataWriterListener::_nil (); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::passivate: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Update_T::remove ( + ::DDS::Publisher_ptr publisher) +{ + DDS4CCM_TRACE ("DDS_Update_T::remove"); + try + { + publisher->delete_datawriter (this->data_writer_.in ()); + this->rti_writer_.set_impl (0); + this->data_writer_ = ::DDS::CCM_DataWriter::_nil (); + this->dds_update_.set_impl (0); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::remove: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +typename CCM_TYPE::updater_type::_ptr_type +DDS_Update_T::get_data (void) +{ + return &this->dds_update_; +} + +template +::DDS::CCM_DataWriter_ptr +DDS_Update_T::get_dds_entity (void) +{ + return &this->rti_writer_; +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h new file mode 100644 index 00000000000..0aa579e9446 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h @@ -0,0 +1,52 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ +#ifndef DDS_UPDATE_T_H +#define DDS_UPDATE_T_H + +#include "dds4ccm/impl/ndds/Updater_T.h" + +template +class DDS_Update_T +{ +public: + DDS_Update_T (void); + ~DDS_Update_T (void); + + typename CCM_TYPE::updater_type::_ptr_type get_data (void); + + ::DDS::CCM_DataWriter_ptr get_dds_entity (void); + + void configuration_complete ( + ::DDS::Topic_ptr topic, + ::DDS::Publisher_ptr publisher, + const char* library_name, + const char* profile_name); + + void activate (void); + + void passivate (void); + + void remove ( + ::DDS::Publisher_ptr publisher); + +private: + /** + * DDS_Update + */ + //@{ + ::DDS::CCM_DataWriter_var data_writer_; + ::DDS::DataWriterListener_var data_listener_; + ::CIAO::DDS4CCM::Updater_T dds_update_; + ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i rti_writer_; + //@} + typedef ::CIAO::DDS4CCM::DataWriterListener_T DataWriterListener; +}; + +#include "dds4ccm/impl/ndds/DDS_Update_T.cpp" + +#endif /* DDS_UPDATE_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp new file mode 100644 index 00000000000..4f0b6fdf0bb --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp @@ -0,0 +1,149 @@ +// -*- C++ -*- +// $Id$ + +#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" + +template +DDS_Write_T::DDS_Write_T (void) : + ccm_dds_writer_i (0) +{ +} + +template +DDS_Write_T::~DDS_Write_T (void) +{ +} + +template +void +DDS_Write_T::configuration_complete ( + ::DDS::Topic_ptr topic, + ::DDS::Publisher_ptr publisher, + const char* library_name, + const char* profile_name) +{ + DDS4CCM_TRACE ("DDS_Write_T::configuration_complete"); + + try + { + if (CORBA::is_nil (this->data_writer_.in ())) + { + ::DDS::DataWriter_var dwv_tmp; + if (library_name && profile_name) + { + dwv_tmp = publisher->create_datawriter_with_profile ( + topic, + library_name, + profile_name, + ::DDS::DataWriterListener::_nil (), + 0); + } + else + { + ::DDS::DataWriterQos dwqos; + dwv_tmp = publisher->create_datawriter ( + topic, + dwqos, + ::DDS::DataWriterListener::_nil (), + 0); + } + ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rw = + dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dwv_tmp.in ()); + this->ccm_dds_writer_i.set_impl (rw->get_impl ()); + this->data_writer_ = ::DDS::CCM_DataWriter::_narrow (dwv_tmp); + this->writer_t_.set_impl (dwv_tmp); + } + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::configuration_complete: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} +template +void +DDS_Write_T::activate () +{ + DDS4CCM_TRACE ("DDS_Write_T::activate"); + try + { + if (CORBA::is_nil (this->data_listener_.in ())) + { + ACE_NEW_THROW_EX (this->data_listener_, + DataWriterListener (), + CORBA::NO_MEMORY ()); + } + this->ccm_dds_writer_i.set_listener ( + this->data_listener_.in (), + ::CIAO::DDS4CCM::DataWriterListener_T::get_mask ()); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::activate: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Write_T::passivate () +{ + DDS4CCM_TRACE ("DDS_Write_T::passivate"); + try + { + this->ccm_dds_writer_i.set_listener ( + ::DDS::DataWriterListener::_nil (), + 0); + this->data_listener_ = ::DDS::DataWriterListener::_nil (); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::passivate: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + +template +void +DDS_Write_T::remove ( + ::DDS::Publisher_ptr publisher) +{ + DDS4CCM_TRACE ("DDS_Write_T::remove"); + try + { + publisher->delete_datawriter (this->data_writer_.in ()); + this->ccm_dds_writer_i.set_impl (0); + this->data_writer_ = ::DDS::CCM_DataWriter::_nil (); + this->writer_t_.set_impl (0); + } + catch (...) + { + DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::remove: Caught unknown c++ exception.\n")); + throw CORBA::INTERNAL (); + } +} + + +template +typename CCM_TYPE::writer_type::_ptr_type +DDS_Write_T::get_data (void) +{ + DDS4CCM_TRACE ("DDS_Write_T::get_data"); + + return &this->writer_t_; +} + +template +::DDS::CCM_DataWriter_ptr +DDS_Write_T::get_dds_entity (void) +{ + DDS4CCM_TRACE ("DDS_Write_T::get_dds_entity"); + + return &this->ccm_dds_writer_i; +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h new file mode 100644 index 00000000000..d42f824e608 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h @@ -0,0 +1,60 @@ +/** + * @author Marcel Smit + * + * $Id$ + * + * Wrapper facade for NDDS. + */ +#ifndef DDS_WRITE_T_H_ +#define DDS_WRITE_T_H_ + +#include "dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h" +#include "dds4ccm/impl/ndds/Writer_T.h" + +template +class DDS_Write_T +{ +public: + DDS_Write_T (void); + ~DDS_Write_T (void); + + /** + * @name DDS_Write + * DDS_Write operations + */ + //@{ + typename CCM_TYPE::writer_type::_ptr_type get_data (void); + + ::DDS::CCM_DataWriter_ptr get_dds_entity (void); + //@} + + void configuration_complete ( + ::DDS::Topic_ptr topic, + ::DDS::Publisher_ptr publisher, + const char* library_name, + const char* profile_name); + + void activate (void); + + void passivate (void); + + void remove ( + ::DDS::Publisher_ptr publisher); + +private: + /** + * DDS_Write + */ + //@{ + ::DDS::CCM_DataWriter_var data_writer_; + ::DDS::DataWriterListener_var data_listener_; + ::CIAO::DDS4CCM::Writer_T writer_t_; + ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i ccm_dds_writer_i; + //@} + + typedef ::CIAO::DDS4CCM::DataWriterListener_T DataWriterListener; +}; + +#include "dds4ccm/impl/ndds/DDS_Write_T.cpp" + +#endif /* DDS_WRITE_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp new file mode 100644 index 00000000000..627cec340b4 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp @@ -0,0 +1,50 @@ +// -*- C++ -*- +// $Id$ + +template +CCM_DDS_DataListenerControl_T::CCM_DDS_DataListenerControl_T (void) : + mode_ (::CCM_DDS::NOT_ENABLED), + max_delivered_data_ (0) +{ + DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::CCM_DDS_DataListenerControl_T"); +} + +template +CCM_DDS_DataListenerControl_T::~CCM_DDS_DataListenerControl_T (void) +{ + DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::~CCM_DDS_DataListenerControl_T"); +} + +template +::CCM_DDS::ListenerMode +CCM_DDS_DataListenerControl_T::mode (void) +{ + DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::mode"); + return this->mode_.value (); +} + +template +void +CCM_DDS_DataListenerControl_T::mode (::CCM_DDS::ListenerMode mode) +{ + DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::mode"); + this->mode_ = mode; +} + +template +::CCM_DDS::DataNumber_t +CCM_DDS_DataListenerControl_T::max_delivered_data (void) +{ + DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::max_delivered_data"); + return this->max_delivered_data_.value (); +} + +template +void +CCM_DDS_DataListenerControl_T::max_delivered_data ( + ::CCM_DDS::DataNumber_t max_delivered_data) +{ + DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::max_delivered_data"); + this->max_delivered_data_ = max_delivered_data; +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.h new file mode 100644 index 00000000000..c0aa0db8272 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.h @@ -0,0 +1,48 @@ +// -*- C++ -*- +// $Id$ + +#ifndef DDS4CCM_DATALISTENERCONTROLI_H_ +#define DDS4CCM_DATALISTENERCONTROLI_H_ + +#include "dds4ccm/idl/dds4ccm_DataListenerControlEC.h" +#include "tao/LocalObject.h" +#include "ace/Copy_Disabled.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +template +class CCM_DDS_DataListenerControl_T + : public virtual BASE_TYPE, + public virtual ::CORBA::LocalObject, + private ACE_Copy_Disabled +{ +public: + /// Constructor + CCM_DDS_DataListenerControl_T (void); + + /// Destructor + virtual ~CCM_DDS_DataListenerControl_T (void); + + /// Set the mode + virtual ::CCM_DDS::ListenerMode mode (void); + + /// Get the mode + virtual void mode (::CCM_DDS::ListenerMode mode); + + /// Set the max_delivered_data + virtual ::CCM_DDS::DataNumber_t max_delivered_data (void); + + /// Get the max_delivered_data + virtual void max_delivered_data (::CCM_DDS::DataNumber_t max_delivered_data); + +protected: + ACE_Atomic_Op mode_; + ACE_Atomic_Op max_delivered_data_; +}; + +#include "dds4ccm/impl/ndds/DataListenerControl_T.cpp" + +#endif /* DDS4CCM_DATALISTENERCONTROLI_H_ */ + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp new file mode 100644 index 00000000000..d7d963d912d --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp @@ -0,0 +1,437 @@ +// $Id$ + +#include "DataReader.h" +#include "DataReaderListener.h" +#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 "DataReaderQos.h" +#include "StringSeq.h" + +#include "dds4ccm/impl/logger/Log_Macros.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_DataReader_i::CCM_DDS_DataReader_i (DDSDataReader * dr) + : impl_ (dr) + { + } + + CCM_DDS_DataReader_i::~CCM_DDS_DataReader_i (void) + { + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::enable (void) + { + return this->impl ()->enable (); + } + + ::DDS::StatusCondition_ptr + CCM_DDS_DataReader_i::get_statuscondition (void) + { + ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSStatusCondition* sc = this->impl ()->get_statuscondition (); + if (sc) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc), + CORBA::NO_MEMORY ()); + } +#else + ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); + if (!CORBA::is_nil (sc.in ())) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc.in ()), + CORBA::NO_MEMORY ()); + } +#endif + return retval._retn (); + } + + ::DDS::StatusMask + CCM_DDS_DataReader_i::get_status_changes (void) + { + return this->impl ()->get_status_changes (); + } + + DDS_INSTANCE_HANDLE_T_RETN + CCM_DDS_DataReader_i::get_instance_handle (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS::InstanceHandle_t handle; + handle <<= rtihandle; + return handle; +#else + return this->impl ()->get_instance_handle (); +#endif + } + + ::DDS::ReadCondition_ptr + CCM_DDS_DataReader_i::create_readcondition ( + ::DDS::SampleStateMask sample_states, + ::DDS::ViewStateMask view_states, + ::DDS::InstanceStateMask instance_states) + { + ::DDS::ReadCondition_var retval = ::DDS::ReadCondition::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSReadCondition* rc = this->impl ()->create_readcondition (sample_states, view_states, instance_states); + if (rc) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_ReadCondition_i (rc), + CORBA::NO_MEMORY ()); + } +#else + ::DDS::ReadCondition_var rc = this->impl ()->create_readcondition (sample_states, view_states, instance_states); + if (!CORBA::is_nil (rc.in ())) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc.in ()), + CORBA::NO_MEMORY ()); + } +#endif + return retval._retn (); + } + + ::DDS::QueryCondition_ptr + CCM_DDS_DataReader_i::create_querycondition ( + ::DDS::SampleStateMask sample_states, + ::DDS::ViewStateMask view_states, + ::DDS::InstanceStateMask instance_states, + const char * query_expression, + const ::DDS::StringSeq & query_parameters) + { + ::DDS::QueryCondition_var retval = ::DDS::QueryCondition::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDS_StringSeq parameters; + parameters <<= query_parameters; + DDSQueryCondition* qc = this->impl ()->create_querycondition ( + sample_states, + view_states, + instance_states, + query_expression, + parameters); + + if (qc) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_QueryCondition_i (qc), + CORBA::NO_MEMORY ()); + } +#else + ::DDS::QueryCondition_var qc = this->impl ()->create_querycondition ( + sample_states, + view_states, + instance_states, + query_expression, + query_parameters); + + if (!CORBA::is_nil (qc.in ())) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_QueryCondition_i (qc.in ()), + CORBA::NO_MEMORY ()); + } +#endif + return retval._retn (); + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::delete_readcondition ( + ::DDS::ReadCondition_ptr a_condition) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + CCM_DDS_ReadCondition_i *rc = dynamic_cast< CCM_DDS_ReadCondition_i *> (a_condition); + if (!rc) + { + return ::DDS::RETCODE_BAD_PARAMETER; + } + return this->impl ()->delete_readcondition (rc->get_impl ()); +#else + return this->impl ()->delete_readcondition (a_condition); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::delete_contained_entities (void) + { + return this->impl ()->delete_contained_entities (); + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::set_qos ( + const ::DDS::DataReaderQos &qos) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_DataReaderQos ddsqos; + ddsqos <<= qos; + return this->impl ()->set_qos (ddsqos); +#else + return this->impl ()->set_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_qos ( + ::DDS::DataReaderQos &qos) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_DataReaderQos ddsqos; + ::DDS_ReturnCode_t const retval = this->impl ()->get_qos (ddsqos); + qos <<= ddsqos; + return retval; +#else + return this->impl ()->get_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::set_listener ( + ::DDS::DataReaderListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_DataReader_i::set_listener"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + CCM_DDS_DataReaderListener_i *rti_drl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_drl, + CCM_DDS_DataReaderListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + return this->impl ()->set_listener (rti_drl, mask); +#else + return this->impl ()->set_listener (a_listener, mask); +#endif + } + + ::DDS::DataReaderListener_ptr + CCM_DDS_DataReader_i::get_listener (void) + { + DDS4CCM_TRACE ("CCM_DDS_DataReader_i::get_listener"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDataReaderListener *drl = this->impl ()->get_listener (); + CCM_DDS_DataReaderListener_i *rti_drl = dynamic_cast (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 rti_drl->get_datareaderlistener (); +#else + return this->impl ()->get_listener (); +#endif + } + + ::DDS::TopicDescription_ptr + CCM_DDS_DataReader_i::get_topicdescription (void) + { + ::DDS::TopicDescription_var dds_td = ::DDS::TopicDescription::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDSTopicDescription* td = this->impl ()->get_topicdescription (); + ACE_NEW_THROW_EX (dds_td, + CCM_DDS_TopicDescription_i (td), + CORBA::NO_MEMORY ()); +#else + ::DDS::TopicDescription_var td = this->impl ()->get_topicdescription (); + ACE_NEW_THROW_EX (dds_td, + CCM_DDS_TopicDescription_i (td.in ()), + CORBA::NO_MEMORY ()); +#endif + return dds_td._retn (); + } + + ::DDS::Subscriber_ptr + CCM_DDS_DataReader_i::get_subscriber (void) + { + ::DDS::Subscriber_var dds_td = ::DDS::Subscriber::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDSSubscriber* subscriber = this->impl ()->get_subscriber (); + ACE_NEW_THROW_EX (dds_td, + CCM_DDS_Subscriber_i (subscriber), + CORBA::NO_MEMORY ()); +#else + ::DDSSubscriber_var subscriber = this->impl ()->get_subscriber (); + ACE_NEW_THROW_EX (dds_td, + CCM_DDS_Subscriber_i (subscriber.in ()), + CORBA::NO_MEMORY ()); +#endif + return dds_td._retn (); + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_sample_rejected_status ( + ::DDS::SampleRejectedStatus & status) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + 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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_liveliness_changed_status ( + ::DDS::LivelinessChangedStatus & status) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + 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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_requested_deadline_missed_status ( + ::DDS::RequestedDeadlineMissedStatus & status) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + 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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_requested_incompatible_qos_status ( + ::DDS::RequestedIncompatibleQosStatus & status) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + 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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_subscription_matched_status ( + ::DDS::SubscriptionMatchedStatus & status) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_SubscriptionMatchedStatus ddsstatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_subscription_matched_status (ddsstatus); + ddsstatus >>= status; + return retval; +#else + return this->impl ()->get_subscription_matched_status (status); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_sample_lost_status ( + ::DDS::SampleLostStatus & status) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + 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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::wait_for_historical_data ( + const ::DDS::Duration_t & max_wait) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_Duration_t rtiduration; + rtiduration <<= max_wait; + return this->impl ()->wait_for_historical_data (rtiduration); +#else + return this->impl ()->wait_for_historical_data (max_wait); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_matched_publications ( + ::DDS::InstanceHandleSeq & publication_handles) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandleSeq rtiseq; + ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_publications (rtiseq); + rtiseq >>= publication_handles; + return retval; +#else + return this->impl ()->get_matched_publications (publication_handles); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataReader_i::get_matched_publication_data ( + ::DDS::PublicationBuiltinTopicData & publication_data, + DDS_INSTANCE_HANDLE_T_IN publication_handle) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_PublicationBuiltinTopicData rti_pub_data; + ::DDS_InstanceHandle_t rti_pub_handle; + + rti_pub_data <<= publication_data; + rti_pub_handle <<= publication_handle; + ::DDS::ReturnCode_t const retcode = this->impl()-> + 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); +#endif + } + + DDSDataReader * + CCM_DDS_DataReader_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_DataReader_i::set_impl (DDSDataReader * dr) + { + this->impl_ = dr; + } + + DDSDataReader * + CCM_DDS_DataReader_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; + } + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h new file mode 100644 index 00000000000..74648685770 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h @@ -0,0 +1,143 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DATAREADER_H +#define DDS4CCM_DATAREADER_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsEC.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) +# include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DataReader DDSDataReader; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataReader_i + : public virtual ::DDS::CCM_DataReader, + public virtual ::CORBA::LocalObject + { + public: + /// Constructor + CCM_DDS_DataReader_i (DDSDataReader *dr); + + /// Destructor + virtual ~CCM_DDS_DataReader_i (void); + + virtual ::DDS::ReturnCode_t + enable (void); + + virtual ::DDS::StatusCondition_ptr + get_statuscondition (void); + + virtual ::DDS::StatusMask + get_status_changes (void); + + virtual DDS_INSTANCE_HANDLE_T_RETN + get_instance_handle (void); + + virtual ::DDS::ReadCondition_ptr + create_readcondition ( + ::DDS::SampleStateMask sample_states, + ::DDS::ViewStateMask view_states, + ::DDS::InstanceStateMask instance_states); + + virtual ::DDS::QueryCondition_ptr + create_querycondition ( + ::DDS::SampleStateMask sample_states, + ::DDS::ViewStateMask view_states, + ::DDS::InstanceStateMask instance_states, + const char * query_expression, + const ::DDS::StringSeq & query_parameters); + + virtual ::DDS::ReturnCode_t + delete_readcondition ( + ::DDS::ReadCondition_ptr a_condition); + + virtual ::DDS::ReturnCode_t + delete_contained_entities (void); + + virtual ::DDS::ReturnCode_t + set_qos (const ::DDS::DataReaderQos & qos); + + virtual ::DDS::ReturnCode_t + get_qos (::DDS::DataReaderQos & qos); + + virtual ::DDS::ReturnCode_t + set_listener ( + ::DDS::DataReaderListener_ptr a_listener, + ::DDS::StatusMask mask); + + virtual ::DDS::DataReaderListener_ptr + get_listener (void); + + virtual ::DDS::TopicDescription_ptr + get_topicdescription (void); + + virtual ::DDS::Subscriber_ptr + get_subscriber (void); + + virtual ::DDS::ReturnCode_t + get_sample_rejected_status (::DDS::SampleRejectedStatus & status); + + virtual ::DDS::ReturnCode_t + get_liveliness_changed_status ( + ::DDS::LivelinessChangedStatus & status); + + virtual ::DDS::ReturnCode_t + get_requested_deadline_missed_status ( + ::DDS::RequestedDeadlineMissedStatus & status); + + virtual ::DDS::ReturnCode_t + get_requested_incompatible_qos_status ( + ::DDS::RequestedIncompatibleQosStatus & status); + + virtual ::DDS::ReturnCode_t + get_subscription_matched_status ( + ::DDS::SubscriptionMatchedStatus & status); + + virtual ::DDS::ReturnCode_t + get_sample_lost_status (::DDS::SampleLostStatus & status); + + virtual ::DDS::ReturnCode_t + wait_for_historical_data (const ::DDS::Duration_t & max_wait); + + virtual ::DDS::ReturnCode_t + get_matched_publications ( + ::DDS::InstanceHandleSeq & publication_handles); + + virtual ::DDS::ReturnCode_t + get_matched_publication_data ( + ::DDS::PublicationBuiltinTopicData & publication_data, + DDS_INSTANCE_HANDLE_T_IN publication_handle); + + DDSDataReader * get_impl (void); + + void set_impl (DDSDataReader * dr); + + private: + DDSDataReader * impl_; + + DDSDataReader * impl (void); + }; + } +} + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp new file mode 100644 index 00000000000..5b4e276f614 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp @@ -0,0 +1,67 @@ +// $Id$ + +#include "dds4ccm/impl/ndds/Utils.h" + +#include "dds4ccm/impl/ndds/DataReader.h" +#include "dds4ccm/impl/logger/Log_Macros.h" + + +template +CIAO::DDS4CCM::DataReaderHandler_T::DataReaderHandler_T ( + typename CIAO::DDS4CCM::DataReaderListener_T* drl, + ::DDS::DataReader_ptr dr) + : drl_ (drl), + dr_ (::DDS::DataReader::_duplicate (dr)) +{ + this->reference_counting_policy ().value + (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); +} + +template +CIAO::DDS4CCM::DataReaderHandler_T::~DataReaderHandler_T (void) +{ +} + +template +int +CIAO::DDS4CCM::DataReaderHandler_T::handle_exception (ACE_HANDLE) +{ + try + { + this->drl_->on_data_available_i (this->dr_.in ()); + } + catch (...) + { + } + return 0; +} + +template +CIAO::DDS4CCM::DataReaderStateHandler_T::DataReaderStateHandler_T ( + typename CIAO::DDS4CCM::DataReaderStateListener_T* drl, + ::DDS::DataReader_ptr dr) + : drl_ (drl), + dr_ (::DDS::DataReader::_duplicate (dr)) +{ + this->reference_counting_policy ().value + (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); +} + +template +CIAO::DDS4CCM::DataReaderStateHandler_T::~DataReaderStateHandler_T (void) +{ +} + +template +int +CIAO::DDS4CCM::DataReaderStateHandler_T::handle_exception (ACE_HANDLE) +{ + try + { + this->drl_->on_data_available_i (this->dr_.in ()); + } + catch (...) + { + } + return 0; +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h new file mode 100644 index 00000000000..929f9cea0df --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h @@ -0,0 +1,63 @@ +// $Id$ +/** + * @author Marcel Smit + * + * $Id$ + * + * Eventhandler on orb thread, handling the + * received data from DDS. + */ + +#ifndef DDS4CCM_DATAREADERHANDLER_T_H +#define DDS4CCM_DATAREADERHANDLER_T_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Event_Handler.h" + +namespace CIAO +{ + namespace DDS4CCM + { + template + class DataReaderListener_T; + + template + class DataReaderHandler_T : + public ACE_Event_Handler + { + public: + DataReaderHandler_T ( + typename CIAO::DDS4CCM::DataReaderListener_T* drl, + ::DDS::DataReader_ptr dr); + virtual ~DataReaderHandler_T (); + + virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); + private: + typename CIAO::DDS4CCM::DataReaderListener_T* drl_; + ::DDS::DataReader_var dr_; + }; + + template + class DataReaderStateListener_T; + + template + class DataReaderStateHandler_T : + public ACE_Event_Handler + { + public: + DataReaderStateHandler_T ( + typename CIAO::DDS4CCM::DataReaderStateListener_T* drl, + ::DDS::DataReader_ptr dr); + virtual ~DataReaderStateHandler_T (); + + virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE); + private: + typename CIAO::DDS4CCM::DataReaderStateListener_T* drl_; + ::DDS::DataReader_var dr_; + }; + } +} + +#include "dds4ccm/impl/ndds/DataReaderHandler_T.cpp" + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp new file mode 100644 index 00000000000..f1f177e8801 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp @@ -0,0 +1,158 @@ +// $Id$ + +#include "DataReaderListener.h" +#include "DataReader.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" + +#include "dds4ccm/impl/logger/Log_Macros.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_DataReaderListener_i::CCM_DDS_DataReaderListener_i (::DDS::DataReaderListener_ptr p) + : impl_ (::DDS::DataReaderListener::_duplicate (p)) + { + } + + CCM_DDS_DataReaderListener_i::~CCM_DDS_DataReaderListener_i (void) + { + } + + void + CCM_DDS_DataReaderListener_i::on_requested_deadline_missed ( + ::DDSDataReader* the_reader, + const ::DDS_RequestedDeadlineMissedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_requested_deadline_missed"); + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::RequestedDeadlineMissedStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus); +#else + this->impl_->on_requested_deadline_missed (dds_reader.in (), status); +#endif + } + + void + CCM_DDS_DataReaderListener_i::on_requested_incompatible_qos ( + ::DDSDataReader* the_reader, + const ::DDS_RequestedIncompatibleQosStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_requested_incompatible_qos"); + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::RequestedIncompatibleQosStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus); +#else + this->impl_->on_requested_incompatible_qos (dds_reader.in (), status); +#endif + } + + void + CCM_DDS_DataReaderListener_i::on_sample_rejected ( + ::DDSDataReader* the_reader, + const ::DDS_SampleRejectedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_sample_rejected"); + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::SampleRejectedStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus); +#else + this->impl_->on_sample_rejected (dds_reader.in (), status); +#endif + } + + void + CCM_DDS_DataReaderListener_i::on_liveliness_changed ( + ::DDSDataReader* the_reader, + const ::DDS_LivelinessChangedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_liveliness_changed"); + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::LivelinessChangedStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus); +#else + this->impl_->on_liveliness_changed (dds_reader.in (), status); +#endif + } + + void + CCM_DDS_DataReaderListener_i::on_data_available(::DDSDataReader *the_reader) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_data_available"); + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + this->impl_->on_data_available (dds_reader.in ()); +#else + this->impl_->on_data_available (dds_reader.in ()); +#endif + } + + void + CCM_DDS_DataReaderListener_i::on_subscription_matched ( + ::DDSDataReader* the_reader, + const ::DDS_SubscriptionMatchedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_subscription_matched"); + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::SubscriptionMatchedStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus); +#else + this->impl_->on_subscription_matched (dds_reader.in (), status); +#endif + } + + void + CCM_DDS_DataReaderListener_i::on_sample_lost ( + ::DDSDataReader* the_reader, + const ::DDS_SampleLostStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_sample_lost"); + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::SampleLostStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_sample_lost (dds_reader.in (), ddsstatus); +#else + this->impl_->on_sample_lost (dds_reader.in (), status); +#endif + } + + ::DDS::DataReaderListener_ptr + CCM_DDS_DataReaderListener_i::get_datareaderlistener (void) + { + return ::DDS::DataReaderListener::_duplicate (this->impl_.in ()); + } + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h new file mode 100644 index 00000000000..a65d2e37931 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h @@ -0,0 +1,73 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DATAREADERLISTENER_H +#define DDS4CCM_DATAREADERLISTENER_H + +#include "tao/LocalObject.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm_ndds_impl_export.h" + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +# include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DataReaderListener DDSDataReaderListener; +typedef ::DDS::DataReader DDSDataReader; +typedef ::DDS::RequestedDeadlineMissedStatus DDS_RequestedDeadlineMissedStatus; +typedef ::DDS::LivelinessChangedStatus DDS_LivelinessChangedStatus; +typedef ::DDS::RequestedIncompatibleQosStatus DDS_RequestedIncompatibleQosStatus; +typedef ::DDS::SampleRejectedStatus DDS_SampleRejectedStatus; +typedef ::DDS::SubscriptionMatchedStatus DDS_SubscriptionMatchedStatus; +typedef ::DDS::SampleLostStatus DDS_SampleLostStatus; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataReaderListener_i : + public virtual ::DDSDataReaderListener + { + public: + /// Constructor + CCM_DDS_DataReaderListener_i (::DDS::DataReaderListener_ptr p); + + /// Destructor + virtual ~CCM_DDS_DataReaderListener_i (void); + + virtual void on_requested_deadline_missed(::DDSDataReader* reader, + const ::DDS_RequestedDeadlineMissedStatus& status); + + virtual void on_liveliness_changed(::DDSDataReader* reader, + const ::DDS_LivelinessChangedStatus& status); + + virtual void on_requested_incompatible_qos(::DDSDataReader* reader, + const ::DDS_RequestedIncompatibleQosStatus& status); + + virtual void on_sample_rejected(::DDSDataReader* reader, + const ::DDS_SampleRejectedStatus& status); + + virtual void on_data_available(::DDSDataReader* reader); + + virtual void on_sample_lost(::DDSDataReader* reader, + const ::DDS_SampleLostStatus& status); + + virtual void on_subscription_matched(::DDSDataReader* reader, + const ::DDS_SubscriptionMatchedStatus& status); + + ::DDS::DataReaderListener_ptr get_datareaderlistener (void); + private: + ::DDS::DataReaderListener_var impl_; + }; + } +} + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp new file mode 100644 index 00000000000..103b226130b --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp @@ -0,0 +1,170 @@ +// $Id$ +#include "dds4ccm/impl/ndds/Utils.h" + +#include "dds4ccm/impl/ndds/DataReader.h" +#include "dds4ccm/impl/logger/Log_Macros.h" +#include "ace/Reactor.h" + +template +CIAO::DDS4CCM::DataReaderListener_T::DataReaderListener_T ( + typename CCM_TYPE::listener_type::_ptr_type listener, + ::CCM_DDS::PortStatusListener_ptr port_status_listener, + ::CCM_DDS::DataListenerControl_ptr control, + ACE_Reactor* reactor) + : PortStatusListener_T (port_status_listener, reactor) , + listener_ (CCM_TYPE::listener_type::_duplicate (listener)), + control_ (::CCM_DDS::DataListenerControl::_duplicate (control)) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::DataReaderListener_T"); +} + +template +CIAO::DDS4CCM::DataReaderListener_T::~DataReaderListener_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::~DataReaderListener_T"); +} + +template +void +CIAO::DDS4CCM::DataReaderListener_T::on_data_available(::DDS::DataReader_ptr rdr) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::on_data_available"); + + if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) + { + return; + } + else + { + if (this->reactor_) + { + drh* rh = 0; + ACE_NEW (rh, drh (this, rdr)); + + ACE_Event_Handler_var safe_handler (rh); + if (this->reactor_->notify (rh) != 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderListener_T::failed to use reactor.\n"))); + } + } + else + { + this->on_data_available_i (rdr); + } + } +} + +template +void +CIAO::DDS4CCM::DataReaderListener_T::on_data_available_i (::DDS::DataReader_ptr rdr) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::on_data_available_i"); + + if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) + { + return; + } + + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i* rd = + dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i*>(rdr); + if (!rd) + { + /* In this specific case, this will never fail */ + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderListener_T::dynamic_cast failed.\n"))); + return; + } + + typename DDS_TYPE::data_reader * reader = + dynamic_cast< typename DDS_TYPE::data_reader * > ((rd->get_impl ())); + + if (!reader) + { + /* In this specific case, this will never fail */ + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderListener_T::narrow failed.\n"))); + return; + } + + typename DDS_TYPE::dds_seq_type data; + DDS_SampleInfoSeq sample_info; + ::DDS::ReturnCode_t const result = reader->take ( + data, + sample_info, + DDS_LENGTH_UNLIMITED, + DDS_NOT_READ_SAMPLE_STATE, + DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, + DDS_ANY_INSTANCE_STATE); + if (result == DDS_RETCODE_NO_DATA) + { + return; + } + else if (result != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %C.\n"), translate_retcode (result))); + return; + } + + if (this->control_->mode () == ::CCM_DDS::ONE_BY_ONE) + { + for (::DDS_Long i = 0; i < data.length (); ++i) + { + if (sample_info[i].valid_data) + { + ::CCM_DDS::ReadInfo info; + info <<= sample_info[i]; + listener_->on_one_data (data[i], info); + } + } + } + else + { + CORBA::ULong nr_of_samples = 0; + for (::DDS_Long i = 0 ; i < sample_info.length(); i++) + { + if (sample_info[i].valid_data) + { + ++nr_of_samples; + } + } + + if (nr_of_samples > 0) + { + 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); + + // Copy the valid samples + CORBA::ULong ix = 0; + for (::DDS_Long i = 0 ; i < sample_info.length(); i++) + { + if(sample_info[i].valid_data) + { + infoseq[ix] <<= sample_info[i]; + inst_seq[ix] = data[i]; + ++ix; + } + } + listener_->on_many_data (inst_seq, infoseq); + } + } + // Return the loan + reader->return_loan(data, sample_info); +} + +template +::DDS::StatusMask +CIAO::DDS4CCM::DataReaderListener_T::get_mask ( + typename CCM_TYPE::listener_type::_ptr_type listener) +{ + if (!CORBA::is_nil (listener) || CIAO_debug_level >= 10) + { + return ::DDS::DATA_AVAILABLE_STATUS | + ::DDS::REQUESTED_DEADLINE_MISSED_STATUS | + ::DDS::SAMPLE_LOST_STATUS; + } + else + { + return 0; + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h new file mode 100644 index 00000000000..89d3cb95c3e --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h @@ -0,0 +1,58 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DATAREADERLISTENER_T_H +#define DDS4CCM_DATAREADERLISTENER_T_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" + +#include "dds4ccm/impl/ndds/PortStatusListener_T.h" + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL +class ACE_Reactor; +ACE_END_VERSIONED_NAMESPACE_DECL + +namespace CIAO +{ + namespace DDS4CCM + { + template + class DataReaderListener_T : + public PortStatusListener_T + { + public: + /// Constructor + DataReaderListener_T ( + typename CCM_TYPE::listener_type::_ptr_type listener, + ::CCM_DDS::PortStatusListener_ptr port_status_listener, + ::CCM_DDS::DataListenerControl_ptr control, + ACE_Reactor* reactor); + + /// Destructor + virtual ~DataReaderListener_T (void); + + virtual void on_data_available( ::DDS::DataReader *rdr); + + static ::DDS::StatusMask get_mask ( + typename CCM_TYPE::listener_type::_ptr_type listener); + + void on_data_available_i ( ::DDS::DataReader *rdr); + + private: + typename CCM_TYPE::listener_type::_var_type listener_; + ::CCM_DDS::DataListenerControl_var control_; + + typedef ::CIAO::DDS4CCM::DataReaderHandler_T drh; + }; + } +} + +#include "dds4ccm/impl/ndds/DataReaderListener_T.cpp" + +#endif /* DDS4CCM_DATAREADERLISTENER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h new file mode 100644 index 00000000000..23df656a4f8 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h @@ -0,0 +1,99 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DATAREADERQOS_H +#define DDS4CCM_DATAREADERQOS_H + +#include "DurabilityQosPolicy.h" +#include "DeadlineQosPolicy.h" +#include "LatencyBudgetQosPolicy.h" +#include "LivelinessQosPolicy.h" +#include "ReliabilityQosPolicy.h" +#include "DestinationOrderQosPolicy.h" +#include "HistoryQosPolicy.h" +#include "ResourceLimitsQosPolicy.h" +#include "UserDataQosPolicy.h" +#include "OwnershipQosPolicy.h" +#include "TimeBasedFilterQosPolicy.h" +#include "ReaderDataLifecycleQosPolicy.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DataReaderQos DDS_DataReaderQos; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::DataReaderQos &ddsqos, const ::DDS_DataReaderQos & qos) +{ + 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<<= (::DDS_DataReaderQos &ddsqos, const ::DDS::DataReaderQos & qos) +{ + 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; +} + +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/ndds/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp new file mode 100644 index 00000000000..d3d09ec7ac8 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp @@ -0,0 +1,240 @@ +// $Id$ +#include "dds4ccm/impl/ndds/Utils.h" + +#include "dds4ccm/impl/ndds/DataReader.h" +#include "dds4ccm/impl/logger/Log_Macros.h" +#include "dds4ccm/impl/ndds/DataReaderHandler_T.h" +#include "tao/ORB_Core.h" + +#include + +template +CIAO::DDS4CCM::DataReaderStateListener_T::DataReaderStateListener_T ( + typename CCM_TYPE::statelistener_type::_ptr_type listener, + ::CCM_DDS::PortStatusListener_ptr port_status_listener, + ::CCM_DDS::StateListenerControl_ptr control, + ACE_Reactor* reactor) + : PortStatusListener_T (port_status_listener, reactor) , + listener_ (CCM_TYPE::statelistener_type::_duplicate (listener)), + control_ (::CCM_DDS::StateListenerControl::_duplicate (control)) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::DataReaderStateListener_T"); +} + +// Implementation skeleton destructor +template +CIAO::DDS4CCM::DataReaderStateListener_T::~DataReaderStateListener_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::~DataReaderStateListener_T"); +} + +template +void +CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available(::DDS::DataReader_ptr rdr) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available"); + if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) + return; + else + { + if (this->reactor_) + { + drsh* rh = 0; + ACE_NEW (rh, drsh (this, rdr)); + ACE_Event_Handler_var safe_handler (rh); + if (this->reactor_->notify (rh) != 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderStateHandler_T::failed to use reactor.\n"))); + } + } + else + { + this->on_data_available_i (rdr); + } + } +} + +template +void +CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available_i (::DDS::DataReader_ptr rdr) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available_i"); + + if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) + return; + + ::CIAO::DDS4CCM::CCM_DDS_DataReader_i* rd = + dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i*>(rdr); + if (!rd) + { + /* In this specific case, this will never fail */ + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderStateListener_T::dynamic_cast failed.\n"))); + return; + } + + typename DDS_TYPE::data_reader * reader = + dynamic_cast< typename DDS_TYPE::data_reader * > ((rd->get_impl ())); + + if (!reader) + { + /* In this specific case, this will never fail */ + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderStateListener_T::narrow failed.\n"))); + return; + } + + try + { + typename DDS_TYPE::dds_seq_type data; + DDS_SampleInfoSeq sample_info; + ::DDS_Long max_samples = 0; + + this->control_->mode () == ::CCM_DDS::ONE_BY_ONE + ? max_samples = DDS_LENGTH_UNLIMITED + : this->control_->max_delivered_data() == 0 + ? max_samples = DDS_LENGTH_UNLIMITED + : max_samples = this->control_->max_delivered_data (); + + ::DDS::ReturnCode_t const result = reader->take ( + data, + sample_info, + max_samples, + DDS_NOT_READ_SAMPLE_STATE, + DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, + DDS_ANY_INSTANCE_STATE); + if (result == DDS_RETCODE_NO_DATA) + return; + else if (result != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %d.\n"), result)); + } + if (this->control_->mode () == ::CCM_DDS::ONE_BY_ONE) + { + for (::DDS_Long i = 0; i < data.length (); ++i) + { + // sample data may not be valid anymore when + // deleted so don't check the valid_data flag + // here. + if (sample_info[i].instance_state == + ::DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE) + { + ::CCM_DDS::ReadInfo readinfo; + readinfo <<= sample_info[i]; + this->listener_->on_deletion (data[i], readinfo); + } + if (sample_info[i].valid_data) + { + if (sample_info[i].view_state == + ::DDS_NEW_VIEW_STATE) + { + ::CCM_DDS::ReadInfo readinfo; + readinfo <<= sample_info[i]; + this->listener_->on_creation (data[i], readinfo); + } + else + { + ::CCM_DDS::ReadInfo info; + info <<= sample_info[i]; + this->listener_->on_one_update (data[i], info); + } + } + } + } + else if (this->control_->mode () == ::CCM_DDS::MANY_BY_MANY) + { + typedef std::vector Updates; + Updates updates; + + CORBA::ULong nr_of_updates = 0; + + for (::DDS_Long i = 0 ; i < sample_info.length(); i++) + { + if ((sample_info[i].valid_data && + sample_info[i].view_state == ::DDS_NEW_VIEW_STATE) || + sample_info[i].instance_state == ::DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE) + { + // sample_new or sample_delete found -> first send out the updated + // samples in one go + 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); + CORBA::ULong ix = 0; + for(Updates::iterator iter = updates.begin(); + iter != updates.end(); + ++iter) + { + infoseq[ix] <<= sample_info[*iter]; + inst_seq[ix] = data[*iter]; + ++ix; + } + 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) + { + ::CCM_DDS::ReadInfo readinfo; + readinfo <<= sample_info[i]; + this->listener_->on_creation (data[i], readinfo); + } + else if (sample_info[i].instance_state == ::DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE) + { + ::CCM_DDS::ReadInfo readinfo; + readinfo <<= sample_info[i]; + this->listener_->on_deletion (data[i], readinfo); + } + //clean up + updates.clear (); + nr_of_updates = 0; + } + else if (sample_info[i].valid_data) + { + ++nr_of_updates; + updates.push_back (i); + } + } + //send the latest updates. + if (updates.size () > 0) + { + 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); + CORBA::ULong ix = 0; + for(Updates::iterator iter = updates.begin(); + iter != updates.end(); + ++iter) + { + infoseq[ix] <<= sample_info[*iter]; + inst_seq[ix] = data[*iter]; + ++ix; + } + this->listener_->on_many_updates (inst_seq, infoseq); + } + // Return the loan + reader->return_loan(data, sample_info); + } + } + catch (...) + { + } +} + +template +::DDS::StatusMask +CIAO::DDS4CCM::DataReaderStateListener_T::get_mask ( + typename CCM_TYPE::statelistener_type::_ptr_type listener) +{ + if (!CORBA::is_nil (listener) || CIAO_debug_level >= 10) + { + return ::DDS::DATA_AVAILABLE_STATUS | + ::DDS::REQUESTED_DEADLINE_MISSED_STATUS | + ::DDS::SAMPLE_LOST_STATUS; + } + else + { + return 0; + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h new file mode 100644 index 00000000000..637c79bdf38 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h @@ -0,0 +1,53 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DATAREADERSTATELISTENER_T_H +#define DDS4CCM_DATAREADERSTATELISTENER_T_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Copy_Disabled.h" + +namespace CIAO +{ + namespace DDS4CCM + { + template + class DataReaderStateListener_T : + public PortStatusListener_T + { + public: + /// Constructor + DataReaderStateListener_T ( + typename CCM_TYPE::statelistener_type::_ptr_type listener, + ::CCM_DDS::PortStatusListener_ptr port_status_listener, + ::CCM_DDS::StateListenerControl_ptr control, + ACE_Reactor* reactor); + + /// Destructor + virtual ~DataReaderStateListener_T (void); + + virtual void on_data_available (::DDS::DataReader_ptr rdr); + + static ::DDS::StatusMask get_mask ( + typename CCM_TYPE::statelistener_type::_ptr_type listener); + + void on_data_available_i (::DDS::DataReader_ptr rdr); + + private: + typename CCM_TYPE::statelistener_type::_var_type listener_; + ::CCM_DDS::StateListenerControl_var control_; + + typedef ::CIAO::DDS4CCM::DataReaderStateHandler_T drsh; + }; + } +} + +#include "dds4ccm/impl/ndds/DataReaderStateListener_T.cpp" + +#endif /* DDS4CCM_DATAREADERSTATELISTENER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp new file mode 100644 index 00000000000..d07b8bf820a --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp @@ -0,0 +1,301 @@ +// $Id$ + +#include "DataWriter.h" +#include "StatusCondition.h" +#include "Publisher.h" +#include "DataWriterListener.h" +#include "Topic.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" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_DataWriter_i::CCM_DDS_DataWriter_i (DDSDataWriter * dw) + : impl_ (dw) + { + } + + CCM_DDS_DataWriter_i::~CCM_DDS_DataWriter_i (void) + { + } + + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::set_qos (const ::DDS::DataWriterQos & qos) + { + DDS4CCM_TRACE ("CCM_DDS_DataWriter_i::set_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_DataWriterQos rti_qos; + rti_qos <<= qos; + return this->impl()->set_qos (rti_qos); +#else + return this->impl ()->set_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_qos (::DDS::DataWriterQos & qos) + { + DDS4CCM_TRACE ("CCM_DDS_DataWriter_i::get_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_DataWriterQos rti_qos; + rti_qos <<= qos; + ::DDS::ReturnCode_t retcode = + this->impl()->get_qos (rti_qos); + qos <<= rti_qos; + return retcode; +#else + return this->impl ()->get_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::set_listener (::DDS::DataWriterListener_ptr a_listener, + ::DDS::StatusMask mask) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + CCM_DDS_DataWriterListener_i* rti_impl_list = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_impl_list, + CCM_DDS_DataWriterListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + return this->impl ()->set_listener (rti_impl_list, mask); +#else + return this->impl ()->set_listener (a_listener, mask); +#endif + } + + ::DDS::DataWriterListener_ptr + CCM_DDS_DataWriter_i::get_listener (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDataWriterListener *wr = this->impl ()->get_listener (); + CCM_DDS_DataWriterListener_i *list_proxy = dynamic_cast (wr); + if (!list_proxy) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DataWriter_i::get_listener - " + "DDS returned a NIL listener.\n")); + return ::DDS::DataWriterListener::_nil (); + } + return list_proxy->get_datawriterlistener (); +#else + return this->impl ()->get_listener (); +#endif + } + + ::DDS::Topic_ptr + CCM_DDS_DataWriter_i::get_topic (void) + { + ::DDS::Topic_var retval = ::DDS::Topic::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSTopic* t = this->impl ()->get_topic (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Topic_i (t), + CORBA::NO_MEMORY ()); +#else + ::DDS::Topic_var t = this->impl ()->get_topic (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Topic_i (t.in ()), + CORBA::NO_MEMORY ()); +#endif + return retval._retn (); + } + + ::DDS::Publisher_ptr + CCM_DDS_DataWriter_i::get_publisher (void) + { + ::DDS::Publisher_var retval = ::DDS::Publisher::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSPublisher* p = this->impl ()->get_publisher (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Publisher_i (p), + CORBA::NO_MEMORY ()); +#else + ::DDS::Publisher_var p = this->impl ()->get_publisher (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_Publisher_i (p.in ()), + CORBA::NO_MEMORY ()); +#endif + return retval._retn (); + } + + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_Duration_t rtiduration; + rtiduration <<= max_wait; + return this->impl ()->wait_for_acknowledgments (rtiduration); +#else + return this->impl ()->wait_for_acknowledgments (max_wait); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_liveliness_lost_status (::DDS::LivelinessLostStatus & status) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_publication_matched_status (::DDS::PublicationMatchedStatus & status) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::assert_liveliness (void) + { + return this->impl ()->assert_liveliness (); + } + + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandleSeq rtiseq; + rtiseq <<= subscription_handles; + ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_subscriptions (rtiseq); + rtiseq >>= subscription_handles; + return retval; +#else + return this->impl ()->get_matched_subscriptions (subscription_handles); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data, + 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) + 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 + } + + ::DDS::ReturnCode_t + CCM_DDS_DataWriter_i::enable (void) + { + return this->impl ()->enable (); + } + + ::DDS::StatusCondition_ptr + CCM_DDS_DataWriter_i::get_statuscondition (void) + { + ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSStatusCondition* sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc), + CORBA::NO_MEMORY ()); +#else + ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc.in ()), + CORBA::NO_MEMORY ()); +#endif + return retval._retn (); + } + + ::DDS::StatusMask + CCM_DDS_DataWriter_i::get_status_changes (void) + { + return this->impl ()->get_status_changes (); + } + + DDS_INSTANCE_HANDLE_T_RETN + CCM_DDS_DataWriter_i::get_instance_handle (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS::InstanceHandle_t handle; + handle <<= rtihandle; + return handle; +#else + return this->impl ()->get_instance_handle (); +#endif + } + + DDSDataWriter * + CCM_DDS_DataWriter_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_DataWriter_i::set_impl (DDSDataWriter * dw) + { + this->impl_ = dw; + } + + DDSDataWriter * + CCM_DDS_DataWriter_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; + } + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h new file mode 100644 index 00000000000..30ee9a94b12 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h @@ -0,0 +1,112 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DATAWRITER_H +#define DDS4CCM_DATAWRITER_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsEC.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) +#include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DataWriter DDSDataWriter; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataWriter_i + : public virtual ::DDS::CCM_DataWriter, + public virtual ::CORBA::LocalObject + { + public: + /// Constructor + CCM_DDS_DataWriter_i (DDSDataWriter * dw); + + /// Destructor + virtual ~CCM_DDS_DataWriter_i (void); + + virtual + ::DDS::ReturnCode_t set_qos (const ::DDS::DataWriterQos & qos); + + virtual + ::DDS::ReturnCode_t get_qos (::DDS::DataWriterQos & qos); + + virtual + ::DDS::ReturnCode_t set_listener (::DDS::DataWriterListener_ptr a_listener, + ::DDS::StatusMask mask); + + virtual + ::DDS::DataWriterListener_ptr get_listener (void); + + virtual + ::DDS::Topic_ptr get_topic (void); + + virtual + ::DDS::Publisher_ptr get_publisher (void); + + virtual + ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait); + + virtual + ::DDS::ReturnCode_t get_liveliness_lost_status (::DDS::LivelinessLostStatus & status); + + virtual + ::DDS::ReturnCode_t get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status); + + virtual + ::DDS::ReturnCode_t get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status); + + virtual + ::DDS::ReturnCode_t get_publication_matched_status (::DDS::PublicationMatchedStatus & status); + + virtual + ::DDS::ReturnCode_t assert_liveliness (void); + + virtual + ::DDS::ReturnCode_t get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles); + + virtual + ::DDS::ReturnCode_t get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data, + DDS_INSTANCE_HANDLE_T_IN subscription_handle); + + virtual + ::DDS::ReturnCode_t enable (void); + + virtual + ::DDS::StatusCondition_ptr get_statuscondition (void); + + virtual + ::DDS::StatusMask get_status_changes (void); + + virtual + DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void); + + DDSDataWriter * get_impl (void); + + void set_impl (DDSDataWriter * dw); + + private: + DDSDataWriter * impl_; + + DDSDataWriter * impl (void); + }; + } +} + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp new file mode 100644 index 00000000000..041092a4324 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp @@ -0,0 +1,106 @@ +// $Id$ + +#include "DataWriterListener.h" +#include "DataWriter.h" +#include "PublicationMatchedStatus.h" +#include "LivelinessLostStatus.h" +#include "OfferedIncompatibleQosStatus.h" +#include "OfferedDeadlineMissedStatus.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_DataWriterListener_i::CCM_DDS_DataWriterListener_i (::DDS::DataWriterListener_ptr s) + : impl_ (::DDS::DataWriterListener::_duplicate (s)) + { + } + + CCM_DDS_DataWriterListener_i::~CCM_DDS_DataWriterListener_i (void) + { + } + + void + CCM_DDS_DataWriterListener_i::on_offered_deadline_missed ( + ::DDSDataWriter *the_writer, + const ::DDS_OfferedDeadlineMissedStatus & status) + { + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::OfferedDeadlineMissedStatus ddsstatus; + ddsstatus <<= status; + ACE_NEW (dds_writer, + CCM_DDS_DataWriter_i (the_writer)); + this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus); +#else + ACE_NEW (dds_writer, + CCM_DDS_DataWriter_i (the_writer)); + this->impl_->on_offered_deadline_missed (dds_writer.in (), status); +#endif + } + + void + CCM_DDS_DataWriterListener_i::on_offered_incompatible_qos ( + ::DDSDataWriter *the_writer, + const ::DDS_OfferedIncompatibleQosStatus & status) + { + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::OfferedIncompatibleQosStatus ddsstatus; + ddsstatus <<= status; + ACE_NEW (dds_writer, + CCM_DDS_DataWriter_i (the_writer)); + this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus); +#else + ACE_NEW (dds_writer, + CCM_DDS_DataWriter_i (the_writer)); + this->impl_->on_offered_incompatible_qos (dds_writer.in (), status); +#endif + } + + void + CCM_DDS_DataWriterListener_i::on_liveliness_lost ( + ::DDSDataWriter *the_writer, + const ::DDS_LivelinessLostStatus & status) + { + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::LivelinessLostStatus ddsstatus; + ddsstatus <<= status; + ACE_NEW (dds_writer, + CCM_DDS_DataWriter_i (the_writer)); + this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus); +#else + ACE_NEW (dds_writer, + CCM_DDS_DataWriter_i (the_writer)); + this->impl_->on_liveliness_lost (dds_writer.in (), status); +#endif + } + + void + CCM_DDS_DataWriterListener_i::on_publication_matched ( + ::DDSDataWriter *the_writer, + const ::DDS_PublicationMatchedStatus & status) + { + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::PublicationMatchedStatus ddsstatus; + ddsstatus <<= status; + ACE_NEW (dds_writer, + CCM_DDS_DataWriter_i (the_writer)); + this->impl_->on_publication_matched (dds_writer.in (), ddsstatus); +#else + ACE_NEW (dds_writer, + CCM_DDS_DataWriter_i (the_writer)); + this->impl_->on_publication_matched (dds_writer.in (), status); +#endif + } + + ::DDS::DataWriterListener_ptr + CCM_DDS_DataWriterListener_i::get_datawriterlistener (void) + { + return ::DDS::DataWriterListener::_duplicate (this->impl_.in ()); + } + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h new file mode 100644 index 00000000000..fc0751bc1f2 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h @@ -0,0 +1,70 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DATAWRITERLISTENER_H +#define DDS4CCM_DATAWRITERLISTENER_H + +#include "tao/LocalObject.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +# include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DataWriterListener DDSDataWriterListener; +typedef ::DDS::DataWriter DDSDataWriter; +typedef ::DDS::OfferedDeadlineMissedStatus DDS_OfferedDeadlineMissedStatus; +typedef ::DDS::OfferedIncompatibleQosStatus DDS_OfferedIncompatibleQosStatus; +typedef ::DDS::LivelinessLostStatus DDS_LivelinessLostStatus; +typedef ::DDS::PublicationMatchedStatus DDS_PublicationMatchedStatus; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataWriterListener_i : + public virtual ::DDSDataWriterListener + { + public: + /// Constructor + CCM_DDS_DataWriterListener_i (::DDS::DataWriterListener_ptr p); + + /// Destructor + virtual ~CCM_DDS_DataWriterListener_i (void); + + virtual void on_offered_deadline_missed ( + ::DDSDataWriter *the_writer, + const ::DDS_OfferedDeadlineMissedStatus & status); + + virtual void on_offered_incompatible_qos ( + ::DDSDataWriter *the_writer, + const ::DDS_OfferedIncompatibleQosStatus & status); + + virtual void on_liveliness_lost ( + ::DDSDataWriter *the_writer, + const ::DDS_LivelinessLostStatus & status); + + virtual void on_publication_matched ( + ::DDSDataWriter *the_writer, + const ::DDS_PublicationMatchedStatus & status); + + ::DDS::DataWriterListener_ptr get_datawriterlistener (void); + private: + ::DDS::DataWriterListener_var impl_; + }; + } +} + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp new file mode 100644 index 00000000000..898390a5959 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp @@ -0,0 +1,68 @@ +// $Id$ +#include "dds4ccm/impl/ndds/Utils.h" + +#include "dds4ccm/impl/ndds/DataWriter.h" +#include "dds4ccm/impl/logger/Log_Macros.h" + +template +CIAO::DDS4CCM::DataWriterListener_T::DataWriterListener_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::DataWriterListener_T"); +} + +template +CIAO::DDS4CCM::DataWriterListener_T::~DataWriterListener_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::~DataWriterListener_T"); +} + +template +void +CIAO::DDS4CCM::DataWriterListener_T::on_offered_deadline_missed ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedDeadlineMissedStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DataWriterListener_T::on_offered_incompatible_qos ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedIncompatibleQosStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DataWriterListener_T::on_liveliness_lost ( + ::DDS::DataWriter_ptr , + const ::DDS::LivelinessLostStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DataWriterListener_T::on_publication_matched ( + ::DDS::DataWriter_ptr , + const ::DDS::PublicationMatchedStatus & ) +{ +} + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +template +void +CIAO::DDS4CCM::DataWriterListener_T::on_reliable_reader_activity_changed ( + ::DDS::DataWriter_ptr , + const ::DDS::ReliableReaderActivityChangedStatus & ) +{ +} +#endif + +template +::DDS::StatusMask +CIAO::DDS4CCM::DataWriterListener_T::get_mask (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::get_mask"); + return 0; +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h new file mode 100644 index 00000000000..805499eac25 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h @@ -0,0 +1,65 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ +#ifndef DDS_DATAWRITERLISTENER_T +#define DDS_DATAWRITERLISTENER_T + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Copy_Disabled.h" + +namespace CIAO +{ + namespace DDS4CCM + { + template + class DataWriterListener_T : + public ::DDS::DataWriterListener, + private ACE_Copy_Disabled + { + public: + /// Constructor + DataWriterListener_T (void); + + /// Destructor + virtual ~DataWriterListener_T (void); + + virtual void + on_offered_deadline_missed ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedDeadlineMissedStatus & ); + + virtual void + on_offered_incompatible_qos ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedIncompatibleQosStatus & ); + + virtual void + on_liveliness_lost ( + ::DDS::DataWriter_ptr , + const ::DDS::LivelinessLostStatus & ); + + virtual void + on_publication_matched ( + ::DDS::DataWriter_ptr , + const ::DDS::PublicationMatchedStatus & ); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + virtual void + on_reliable_reader_activity_changed ( + ::DDS::DataWriter_ptr , + const ::DDS::ReliableReaderActivityChangedStatus & ); +#endif + + static ::DDS::StatusMask get_mask (void); + }; + } +} + +#include "dds4ccm/impl/ndds/DataWriterListener_T.cpp" + +#endif /* DDS_DATAWRITERLISTENER_T */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h new file mode 100644 index 00000000000..a12804a4789 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h @@ -0,0 +1,114 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DATAWRITERQOS_H +#define DDS4CCM_DATAWRITERQOS_H + +#include "DurabilityQosPolicy.h" +#include "DurabilityServiceQosPolicy.h" +#include "DeadlineQosPolicy.h" +#include "LatencyBudgetQosPolicy.h" +#include "LivelinessQosPolicy.h" +#include "ReliabilityQosPolicy.h" +#include "DestinationOrderQosPolicy.h" +#include "HistoryQosPolicy.h" +#include "ResourceLimitsQosPolicy.h" +#include "TransportPriorityQosPolicy.h" +#include "LifespanQosPolicy.h" +#include "UserDataQosPolicy.h" +#include "OwnershipQosPolicy.h" +#include "OwnershipStrengthQosPolicy.h" +#include "WriterDataLifecycleQosPolicy.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DataWriterQos DDS_DataWriterQos; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::DataWriterQos &ddsqos, const ::DDS_DataWriterQos & qos) +{ + 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<<= (::DDS_DataWriterQos &ddsqos, const ::DDS::DataWriterQos & qos) +{ + 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; +} + +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/ndds/DeadlineQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h new file mode 100644 index 00000000000..83e5298f9fd --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h @@ -0,0 +1,44 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DEADLINEQOSPOLICY_H +#define DDS4CCM_DEADLINEQOSPOLICY_H + +#include "Duration_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DeadlineQosPolicy DDS_DeadlineQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::DeadlineQosPolicy &ddsqos, const ::DDS_DeadlineQosPolicy & qos) +{ + ddsqos.period <<= qos.period; +} + +inline void +operator<<= (::DDS_DeadlineQosPolicy &ddsqos, const ::DDS::DeadlineQosPolicy & qos) +{ + 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/ndds/DestinationOrderQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h new file mode 100644 index 00000000000..31dbeb1b32d --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h @@ -0,0 +1,44 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DESTINATIONORDERQOSPOLICY_H +#define DDS4CCM_DESTINATIONORDERQOSPOLICY_H + +#include "Duration_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DestinationOrderQosPolicy DDS_DestinationOrderQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::DestinationOrderQosPolicy &ddsqos, const ::DDS_DestinationOrderQosPolicy & qos) +{ + ddsqos.kind = static_cast < ::DDS::DestinationOrderQosPolicyKind> (qos.kind); +} + +inline void +operator<<= (::DDS_DestinationOrderQosPolicy &ddsqos, const ::DDS::DestinationOrderQosPolicy & qos) +{ + 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/ndds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp new file mode 100644 index 00000000000..705d35d1398 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp @@ -0,0 +1,1014 @@ +// $Id$ + +#include "DomainParticipant.h" +#include "Subscriber.h" +#include "Publisher.h" +#include "ContentFilteredTopic.h" +#include "Topic.h" +#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 "PublisherQos.h" +#include "SubscriberQos.h" +#include "TopicQos.h" +#include "DomainParticipantQos.h" + +#include "dds4ccm/idl/dds4ccm_BaseC.h" + +#include "dds4ccm/impl/logger/Log_Macros.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_DomainParticipant_i::CCM_DDS_DomainParticipant_i ( + DDSDomainParticipant * dp) : impl_ (dp) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_i::CCM_DDS_DomainParticipant_i"); + } + + CCM_DDS_DomainParticipant_i::~CCM_DDS_DomainParticipant_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_i::~CCM_DDS_DomainParticipant_i"); + } + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::Publisher_ptr + CCM_DDS_DomainParticipant_i::create_publisher_with_profile ( + const char* library_name, + const char *profile_name, + ::DDS::PublisherListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher_with_profile"); + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher_with_profile - " + "Creating Publisher\n")); + CCM_DDS_PublisherListener_i *rti_pl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_pl, + CCM_DDS_PublisherListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + DDSPublisher * rti_pub = + this->impl ()->create_publisher_with_profile (library_name, + profile_name, + rti_pl, + mask); + + if (!rti_pub) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher_with_profile - " + "Error: Unable to create Publisher\n")); + 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 (rti_pub), + CORBA::NO_MEMORY ()); + + + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher_with_profile - " + "Successfully created a DDSPublisher\n")); + + rti_pub->enable (); + return retval._retn (); + } +#endif + + ::DDS::Publisher_ptr + CCM_DDS_DomainParticipant_i::create_publisher ( + const ::DDS::PublisherQos & qos, + ::DDS::PublisherListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_UNUSED_ARG (qos); + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - " + "Creating Publisher\n")); + + DDS_PublisherQos rti_qos = DDS_PUBLISHER_QOS_DEFAULT; + + CCM_DDS_PublisherListener_i *rti_pl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_pl, + CCM_DDS_PublisherListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + + DDSPublisher * rti_pub = + this->impl ()->create_publisher (rti_qos, + rti_pl, + mask); + + if (!rti_pub) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - " + "Error: Unable to create Publisher\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + + ::DDS::Publisher_var retval = ::DDS::Publisher::_nil (); + ACE_NEW_THROW_EX (retval, + 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")); + + rti_pub->enable (); + return retval._retn (); +#else + return this->impl ()->create_publisher (qos, a_listener, mask); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::delete_publisher (::DDS::Publisher_ptr p) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + CCM_DDS_Publisher_i *rti_pub = dynamic_cast < CCM_DDS_Publisher_i * > (p); + + 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")); + return ::DDS::RETCODE_ERROR; + } + + 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 (rti_pub->get_impl ()); + + if (retval != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - " + "Error: RTI delete_publisher returned non-ok error code %C\n", + translate_retcode (retval))); + } + else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - " + "Provided publisher successfully deleted\n")); + + return retval; +#else + return this->impl ()->delete_publisher (p); +#endif + } + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::Subscriber_ptr + CCM_DDS_DomainParticipant_i::create_subscriber_with_profile ( + const char* library_name, + const char *profile_name, + ::DDS::SubscriberListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber_with_profile"); + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber_with_profile - " + "Creating Subscriber\n")); + + CCM_DDS_SubscriberListener_i *rti_sl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_sl, + CCM_DDS_SubscriberListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + DDSSubscriber * rti_sub = + this->impl ()->create_subscriber_with_profile ( + library_name, + profile_name, + rti_sl, + mask); + + if (!rti_sub) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber_with_profile - " + "Error: Unable to create Subscriber\n")); + 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 (rti_sub), + CORBA::NO_MEMORY ()); + + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber_with_profile - " + "Successfully created a DDSSubscriber\n")); + + rti_sub->enable (); + return retval._retn (); + } +#endif + + ::DDS::Subscriber_ptr + CCM_DDS_DomainParticipant_i::create_subscriber (const ::DDS::SubscriberQos & qos, + ::DDS::SubscriberListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_UNUSED_ARG (qos); + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - " + "Creating Subscriber\n")); + + CCM_DDS_SubscriberListener_i *rti_sl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_sl, + CCM_DDS_SubscriberListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + + DDS_SubscriberQos rti_qos = DDS_SUBSCRIBER_QOS_DEFAULT; + DDSSubscriber * rti_sub = + this->impl ()->create_subscriber (rti_qos, + rti_sl, + mask); + + if (!rti_sub) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - " + "Error: Unable to create Subscriber\n")); + 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 (rti_sub), + CORBA::NO_MEMORY ()); + + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - " + "Successfully created a DDSSubscriber\n")); + + rti_sub->enable (); + return retval._retn (); +#else + return this->impl ()->create_subscriber (qos, a_listener, mask); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::delete_subscriber (::DDS::Subscriber_ptr s) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + CCM_DDS_Subscriber_i *rti_sub = dynamic_cast < CCM_DDS_Subscriber_i * > (s); + + 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")); + return ::DDS::RETCODE_ERROR; + } + + 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 (rti_sub->get_impl ()); + + if (retval != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - " + "Error: RTI delete_subscriber returned non-ok error code %C\n", + translate_retcode (retval))); + } + else + { + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - " + "Provided subscriber successfully deleted\n")); + } + + return retval; +#else + return this->impl ()->delete_subscriber (s); +#endif + } + + ::DDS::Subscriber_ptr + CCM_DDS_DomainParticipant_i::get_builtin_subscriber (void) + { + ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSSubscriber* sub = this->impl ()->get_builtin_subscriber (); + if (sub) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_Subscriber_i (sub), + CORBA::NO_MEMORY ()); + } +#else + ::DDS::Subscriber_var sub = this->impl ()->get_builtin_subscriber (); + if (!CORBA::is_nil (sub.in ())) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_Subscriber_i (sub.in ()), + CORBA::NO_MEMORY ()); + } +#endif + return retval._retn (); + } + + ::DDS::Topic_ptr + CCM_DDS_DomainParticipant_i::create_topic (const char * impl_name, + const char * type_name, + const ::DDS::TopicQos & qos, + ::DDS::TopicListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_UNUSED_ARG (qos); + + if (impl_name == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " + "Error: provided nil topic name\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, + 0); + } + + if (type_name == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " + "Error: provided nil type name\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, + 0); + } + + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic - " + "Attempting to create topic with name %C and type %C\n", + impl_name, type_name)); + + CCM_DDS_TopicListener_i *rti_tl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_tl, + CCM_DDS_TopicListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + + DDS_TopicQos rti_qos = DDS_TOPIC_QOS_DEFAULT; + + DDSTopic *rti_topic = this->impl ()->create_topic (impl_name, + type_name, + rti_qos, + rti_tl, + mask); + + if (rti_topic == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " + "Error: RTI DDS returned a nil topic\n")); + 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 (rti_topic), + CORBA::NO_MEMORY ()); + + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic - " + "Successfully created topic with name %C and type %C\n", + impl_name, type_name)); + + return retval._retn (); +#else + return this->impl ()->create_topic (impl_name, + type_name, + qos, + a_listener, + mask); +#endif + } + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::Topic_ptr + CCM_DDS_DomainParticipant_i::create_topic_with_profile ( + const char *impl_name, + const char *type_name, + const char *library_name, + const char *profile_name, + ::DDS::TopicListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic_with_profile"); + + if (impl_name == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " + "Error: provided nil topic name\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + } + + if (type_name == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " + "Error: provided nil type name\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + } + + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " + "Attempting to create topic with name %C and type %C\n", + impl_name, type_name)); + + ::DDS::Duration_t dur = { 0, 1000000 }; + ::DDS::Topic_var tp = this->find_topic (impl_name, dur); + if (CORBA::is_nil (tp)) + { + CCM_DDS_TopicListener_i *rti_tl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_tl, + CCM_DDS_TopicListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + DDSTopic *rti_topic = this->impl ()->create_topic_with_profile (impl_name, + type_name, + library_name, + profile_name, + rti_tl, + mask); + + 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 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 (rti_topic), + CORBA::NO_MEMORY ()); + + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " + "Successfully created topic with name %C and type %C\n", + impl_name, type_name)); + + return retval._retn (); + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " + "Re-using topic with name %C and type %C.\n", + impl_name, type_name)); + return ::DDS::Topic::_duplicate (tp.in ()); + } + } +#endif + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::delete_topic (::DDS::Topic_ptr a_topic) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_topic"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + CCM_DDS_Topic_i *top = dynamic_cast< CCM_DDS_Topic_i *> (a_topic); + + if (top == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - " + "Unable to cast provided object reference to servant.\n")); + return ::DDS::RETCODE_BAD_PARAMETER; + } + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - " + "Successfully casted provided object reference to servant.\n")); + + DDS_ReturnCode_t const retval = this->impl ()->delete_topic (top->get_impl ()); + + if (retval != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - " + "Error: RTI delete_topic returned non-ok error code %C\n", + translate_retcode (retval))); + } + else + { + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - " + "Provided topic successfully deleted\n")); + } + + return retval; +#else + return this->impl ()->delete_topic (a_topic); +#endif + } + + ::DDS::Topic_ptr + CCM_DDS_DomainParticipant_i::find_topic (const char * impl_name, + const ::DDS::Duration_t & timeout) + { + ::DDS::Topic_var retval = ::DDS::Topic::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_Duration_t ddstimeout; + ddstimeout <<= timeout; + ::DDSTopic* topic = this->impl ()->find_topic (impl_name, ddstimeout); + if (topic) + { + ACE_NEW_RETURN (retval, + CCM_DDS_Topic_i (topic), + ::DDS::Topic::_nil ()); + } +#else + ::DDS::Topic_var topic = this->impl ()->find_topic (impl_name, timeout); + if (!CORBA::is_nil (topic.in ()) + { + ACE_NEW_RETURN (retval, + CCM_DDS_Topic_i (topic.in ()), + ::DDS::Topic::_nil ()); + } +#endif + return retval._retn (); + } + + ::DDS::TopicDescription_ptr + CCM_DDS_DomainParticipant_i::lookup_topicdescription (const char * name) + { + ::DDS::TopicDescription_var retval = ::DDS::TopicDescription::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDSTopicDescription* topic = this->impl ()->lookup_topicdescription (name); + if (topic) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_TopicDescription_i (topic), + CORBA::NO_MEMORY ()); + } +#else + ::DDSTopicDescription_var topic = this->impl ()->lookup_topicdescription (name); + if (!CORBA::is_ni (topic.in ())) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_TopicDescription_i (topic.in ()), + CORBA::NO_MEMORY ()); + } +#endif + return retval._retn (); + } + + ::DDS::ContentFilteredTopic_ptr + CCM_DDS_DomainParticipant_i::create_contentfilteredtopic (const char * name, + ::DDS::Topic_ptr related_topic, + const char * filter_expression, + const ::DDS::StringSeq & expression_parameters) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_contentfilteredtopic"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + CCM_DDS_Topic_i *top = dynamic_cast< CCM_DDS_Topic_i *> (related_topic); + if (!top) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_contentfilteredtopic - " + "Unable to cast provided topic.\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + + const char** parameterlist = 0; + ACE_NEW_THROW_EX (parameterlist, + const char*[expression_parameters.length ()], + CORBA::NO_MEMORY ()); + + for (CORBA::ULong i = 0; i < expression_parameters.length (); ++i) + { + parameterlist[i] = expression_parameters[i].in (); + } + DDS_StringSeq parameters (expression_parameters.length ()); + parameters.from_array (parameterlist, expression_parameters.length ()); + + DDSContentFilteredTopic * rti_cft = this->impl ()->create_contentfilteredtopic ( + name, + top->get_impl (), + filter_expression, + parameters); + delete [] parameterlist; + if (!rti_cft) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_contentfilteredtopic - " + "RTI DDS returned a nil ContentFilteredTopic.\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + + ::DDS::ContentFilteredTopic_var retval = ::DDS::ContentFilteredTopic::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_ContentFilteredTopic_i (rti_cft), + CORBA::NO_MEMORY ()); + + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_contentfilteredtopic - " + "Successfully created topic with name <%C> and filter expression <%C>\n", + name, filter_expression)); + + return retval._retn (); +#else + return this->impl ()->create_contentfilteredtopic ( + name, + related_topic, + filter_expression, + expression_parameters); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::delete_contentfilteredtopic (::DDS::ContentFilteredTopic_ptr /*a_contentfilteredtopic*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_contentfilteredtopic"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::MultiTopic_ptr + CCM_DDS_DomainParticipant_i::create_multitopic (const char * /*name*/, + const char * /*type_name*/, + const char * /*subscription_expression*/, + const ::DDS::StringSeq & /*expression_parameters*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_multitopic"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::delete_multitopic (::DDS::MultiTopic_ptr /*a_multitopic*/) + { + //this->impl ()->delete_multitopic ( + DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_multitopic"); + throw CORBA::NO_IMPLEMENT (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::delete_contained_entities (void) + { + return this->impl ()->delete_contained_entities (); + + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::set_qos (const ::DDS::DomainParticipantQos & qos) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_DomainParticipantQos rti_qos; + rti_qos <<= qos; + return this->impl()->set_qos (rti_qos); +#else + return this->impl()->set_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_qos (::DDS::DomainParticipantQos & qos) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::set_listener (::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + CCM_DDS_DomainPublisherListener_i* rti_impl_list = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_impl_list, + CCM_DDS_DomainPublisherListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + return this->impl_->set_listener (rti_impl_list, mask); +#else + return this->impl_->set_listener (a_listener, mask); +#endif + } + + ::DDS::DomainParticipantListener_ptr + CCM_DDS_DomainParticipant_i::get_listener (void) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_listener"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDomainParticipantListener *rti_dp_list = this->impl ()->get_listener (); + CCM_DDS_DomainPublisherListener_i *list_proxy = dynamic_cast (rti_dp_list); + if (!list_proxy) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DomainParticipant_i::get_listener - " + "DDS returned a NIL listener.\n")); + return ::DDS::DomainParticipantListener::_nil (); + } + return list_proxy->get_domainparticipantlistener (); +#else + return this->impl ()->get_listener (); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::ignore_participant (DDS_INSTANCE_HANDLE_T_IN handle) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= handle; + return this->impl ()->ignore_participant (rti_handle); +#else + return this->impl ()->ignore_participant (handle); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::ignore_topic (DDS_INSTANCE_HANDLE_T_IN handle) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= handle; + return this->impl ()->ignore_topic (rti_handle); +#else + return this->impl ()->ignore_topic (handle); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::ignore_publication (DDS_INSTANCE_HANDLE_T_IN handle) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= handle; + return this->impl ()->ignore_publication (rti_handle); +#else + return this->impl ()->ignore_publication (handle); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::ignore_subscription (DDS_INSTANCE_HANDLE_T_IN handle) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandle_t rti_handle; + rti_handle <<= handle; + return this->impl ()->ignore_subscription (rti_handle); +#else + return this->impl ()->ignore_subscription (handle); +#endif + } + + ::DDS::DomainId_t + CCM_DDS_DomainParticipant_i::get_domain_id (void) + { + return this->impl ()->get_domain_id (); + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::assert_liveliness (void) + { + return this->impl ()->assert_liveliness (); + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::set_default_publisher_qos (const ::DDS::PublisherQos & qos) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_publisher_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::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 + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_default_publisher_qos (::DDS::PublisherQos & qos) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_publisher_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::set_default_subscriber_qos (const ::DDS::SubscriberQos & qos) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_subscriber_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::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 + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_default_subscriber_qos (::DDS::SubscriberQos & qos) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_subscriber_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_SubscriberQos rti_qos; + ::DDS::ReturnCode_t retcode = + this->impl()-> get_default_subscriber_qos (rti_qos); + qos <<= rti_qos; + return retcode; +#else + return this->impl()->get_default_subscriber_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::set_default_topic_qos (const ::DDS::TopicQos & qos) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_topic_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::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 + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_default_topic_qos (::DDS::TopicQos & qos) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_topic_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_TopicQos rti_qos; + ::DDS::ReturnCode_t retcode = + this->impl()-> get_default_topic_qos (rti_qos); + qos <<= rti_qos; + return retcode; +#else + return this->impl()->get_default_topic_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_discovered_participants (::DDS::InstanceHandleSeq & impl_handles) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandleSeq rtiseq; + ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_participants (rtiseq); + rtiseq >>= impl_handles; + return retval; +#else + return this->impl ()->get_discovered_participants (impl_handles); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_discovered_participant_data (::DDS::ParticipantBuiltinTopicData & /*impl_data*/, + DDS_INSTANCE_HANDLE_T_IN /*impl_handle*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_participant_data"); + throw CORBA::NO_IMPLEMENT (); + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_discovered_topics (::DDS::InstanceHandleSeq & impl_handles) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandleSeq rtiseq; + ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_topics (rtiseq); + rtiseq >>= impl_handles; + return retval; +#else + return this->impl ()->get_discovered_topics (impl_handles); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_discovered_topic_data (::DDS::TopicBuiltinTopicData & /*impl_data*/, + DDS_INSTANCE_HANDLE_T_IN /*impl_handle*/) + { + DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_topic_data"); + throw CORBA::NO_IMPLEMENT (); + } + + ::CORBA::Boolean + 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 rti_handle; + rti_handle <<= a_handle; + return this->impl ()->contains_entity (rti_handle); +#else + return this->impl ()->contains_entity (a_handle); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::get_current_time (::DDS::Time_t & current_time) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + 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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipant_i::enable (void) + { + return this->impl ()->enable (); + } + + ::DDS::StatusCondition_ptr + CCM_DDS_DomainParticipant_i::get_statuscondition (void) + { + ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSStatusCondition* sc = this->impl ()->get_statuscondition (); + if (sc) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc), + CORBA::NO_MEMORY ()); + } +#else + ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); + if (!CORBA::is_nil (sc.in ())) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc.in ()), + CORBA::NO_MEMORY ()); + } +#endif + return retval._retn (); + } + + ::DDS::StatusMask + CCM_DDS_DomainParticipant_i::get_status_changes (void) + { + return this->impl ()->get_status_changes (); + } + + DDS_INSTANCE_HANDLE_T_RETN + CCM_DDS_DomainParticipant_i::get_instance_handle (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS::InstanceHandle_t handle; + handle <<= rtihandle; + return handle; +#else + return this->impl ()->get_instance_handle (); +#endif + } + + DDSDomainParticipant * + CCM_DDS_DomainParticipant_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_DomainParticipant_i::set_impl (DDSDomainParticipant * dp) + { + this->impl_ = dp; + } + + DDSDomainParticipant * + CCM_DDS_DomainParticipant_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; + } + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h new file mode 100644 index 00000000000..f8658668c1b --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h @@ -0,0 +1,208 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef CIAO_NDDS_PARTICIPANT_H +#define CIAO_NDDS_PARTICIPANT_H + +#include "tao/LocalObject.h" +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/dds_rtf2_dcpsEC.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" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DomainParticipant DDSDomainParticipant; +#endif + +#include "tao/LocalObject.h" + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DomainParticipant_i : + public virtual ::DDS::CCM_DomainParticipant, + public virtual ::CORBA::LocalObject + { + public: + /// Constructor + CCM_DDS_DomainParticipant_i (DDSDomainParticipant * dp); + + /// Destructor + virtual ~CCM_DDS_DomainParticipant_i (void); + + virtual ::DDS::Publisher_ptr create_publisher ( + const ::DDS::PublisherQos & qos, + ::DDS::PublisherListener_ptr a_listener, + ::DDS::StatusMask mask); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + virtual ::DDS::Publisher_ptr create_publisher_with_profile ( + const char* library_name, + const char *profile_name, + ::DDS::PublisherListener_ptr a_listener, + ::DDS::StatusMask mask); +#endif + + virtual ::DDS::ReturnCode_t delete_publisher (::DDS::Publisher_ptr p); + + virtual ::DDS::Subscriber_ptr create_subscriber ( + const ::DDS::SubscriberQos & qos, + ::DDS::SubscriberListener_ptr a_listener, + ::DDS::StatusMask mask); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + virtual ::DDS::Subscriber_ptr create_subscriber_with_profile( + const char* library_name, + const char *profile_name, + ::DDS::SubscriberListener_ptr a_listener, + ::DDS::StatusMask mask); +#endif + + virtual ::DDS::ReturnCode_t delete_subscriber (::DDS::Subscriber_ptr s); + + virtual ::DDS::Subscriber_ptr get_builtin_subscriber (void); + + virtual ::DDS::Topic_ptr create_topic ( + const char * impl_name, + const char * type_name, + const ::DDS::TopicQos & qos, + ::DDS::TopicListener_ptr a_listener, + ::DDS::StatusMask mask); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + virtual ::DDS::Topic_ptr create_topic_with_profile ( + const char * impl_name, + const char * type_name, + const char* library_name, + const char *profile_name, + ::DDS::TopicListener_ptr a_listener, + ::DDS::StatusMask mask); +#endif + + virtual ::DDS::ReturnCode_t delete_topic (::DDS::Topic_ptr a_topic); + + virtual ::DDS::Topic_ptr find_topic ( + const char * impl_name, + const ::DDS::Duration_t & timeout); + + virtual ::DDS::TopicDescription_ptr lookup_topicdescription ( + const char * name); + + virtual ::DDS::ContentFilteredTopic_ptr create_contentfilteredtopic ( + const char * name, + ::DDS::Topic_ptr related_topic, + const char * filter_expression, + const ::DDS::StringSeq & expression_parameters); + + virtual ::DDS::ReturnCode_t delete_contentfilteredtopic ( + ::DDS::ContentFilteredTopic_ptr a_contentfilteredtopic); + + virtual ::DDS::MultiTopic_ptr create_multitopic ( + const char * name, + const char * type_name, + const char * subscription_expression, + const ::DDS::StringSeq & expression_parameters); + + virtual ::DDS::ReturnCode_t delete_multitopic ( + ::DDS::MultiTopic_ptr a_multitopic); + + virtual ::DDS::ReturnCode_t delete_contained_entities (void); + + virtual ::DDS::ReturnCode_t set_qos ( + const ::DDS::DomainParticipantQos & qos); + + virtual ::DDS::ReturnCode_t get_qos ( + ::DDS::DomainParticipantQos & qos); + + virtual ::DDS::ReturnCode_t set_listener ( + ::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask); + + virtual ::DDS::DomainParticipantListener_ptr get_listener (void); + + virtual ::DDS::ReturnCode_t ignore_participant ( + DDS_INSTANCE_HANDLE_T_IN handle); + + virtual ::DDS::ReturnCode_t ignore_topic ( + DDS_INSTANCE_HANDLE_T_IN handle); + + virtual ::DDS::ReturnCode_t ignore_publication ( + DDS_INSTANCE_HANDLE_T_IN handle); + + virtual ::DDS::ReturnCode_t ignore_subscription ( + DDS_INSTANCE_HANDLE_T_IN handle); + + virtual ::DDS::DomainId_t get_domain_id (void); + + virtual ::DDS::ReturnCode_t assert_liveliness (void); + + virtual ::DDS::ReturnCode_t set_default_publisher_qos ( + const ::DDS::PublisherQos & qos); + + virtual ::DDS::ReturnCode_t get_default_publisher_qos ( + ::DDS::PublisherQos & qos); + + virtual ::DDS::ReturnCode_t set_default_subscriber_qos ( + const ::DDS::SubscriberQos & qos); + + virtual ::DDS::ReturnCode_t get_default_subscriber_qos ( + ::DDS::SubscriberQos & qos); + + virtual ::DDS::ReturnCode_t set_default_topic_qos ( + const ::DDS::TopicQos & qos); + + virtual ::DDS::ReturnCode_t get_default_topic_qos ( + ::DDS::TopicQos & qos); + + virtual ::DDS::ReturnCode_t get_discovered_participants ( + ::DDS::InstanceHandleSeq & impl_handles); + + virtual ::DDS::ReturnCode_t get_discovered_participant_data ( + ::DDS::ParticipantBuiltinTopicData & impl_data, + DDS_INSTANCE_HANDLE_T_IN impl_handle); + + virtual ::DDS::ReturnCode_t get_discovered_topics ( + ::DDS::InstanceHandleSeq & impl_handles); + + virtual ::DDS::ReturnCode_t get_discovered_topic_data ( + ::DDS::TopicBuiltinTopicData & impl_data, + DDS_INSTANCE_HANDLE_T_IN impl_handle); + + virtual ::CORBA::Boolean contains_entity ( + DDS_INSTANCE_HANDLE_T_IN a_handle); + + virtual ::DDS::ReturnCode_t get_current_time ( + ::DDS::Time_t & current_time); + + virtual ::DDS::ReturnCode_t enable (void); + + virtual ::DDS::StatusCondition_ptr get_statuscondition (void); + + virtual ::DDS::StatusMask get_status_changes (void); + + virtual DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void); + + DDSDomainParticipant * get_impl (void); + + void set_impl (DDSDomainParticipant * dp); + + protected: + DDSDomainParticipant *impl_; + + DDSDomainParticipant * impl (void); + }; + } +} + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp new file mode 100644 index 00000000000..4ba2b73fc42 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp @@ -0,0 +1,337 @@ +// $Id$ + +#include "DomainParticipantFactory.h" +#include "DomainParticipant.h" +#include "DomainParticipantListener.h" +#include "DomainParticipantFactoryQos.h" +#include "DomainParticipantQos.h" + +#include "Utils.h" + +#include "dds4ccm/impl/logger/Log_Macros.h" +#include "dds4ccm/idl/dds4ccm_BaseC.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DomainParticipantFactory DDSDomainParticipantFactory; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_DomainParticipantFactory_i::CCM_DDS_DomainParticipantFactory_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::CCM_DDS_DomainParticipantFactory_i"); + } + + CCM_DDS_DomainParticipantFactory_i::~CCM_DDS_DomainParticipantFactory_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::~CCM_DDS_DomainParticipantFactory_i"); + } + + ::DDS::DomainParticipant_ptr + CCM_DDS_DomainParticipantFactory_i::create_participant (::DDS::DomainId_t domain_id, + const ::DDS::DomainParticipantQos & qos, + ::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::create_participant"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_UNUSED_ARG (qos); + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant - " + "Creating domain participant for domain <%d>\n", + domain_id)); + + CCM_DDS_DomainPublisherListener_i *rti_dpl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_dpl, + CCM_DDS_DomainPublisherListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + + DDSDomainParticipant *part = DDSDomainParticipantFactory::get_instance ()-> + create_participant (domain_id, + DDS_PARTICIPANT_QOS_DEFAULT, + rti_dpl, + mask); + + if (!part) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant - " + "Error: Unable to create DomainParticipant for domain <%d>\n", + domain_id)); + throw CCM_DDS::InternalError (1, 0); + } + + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (part), + CORBA::NO_MEMORY ()); + part->enable (); + CCM_DDS_DomainParticipant_i *rti_dp = dynamic_cast < CCM_DDS_DomainParticipant_i *> (retval.in ()); + rti_dp->set_impl (part); + + return retval._retn (); +#else + return DDSDomainParticipantFactory::get_instance ()-> + create_participant (domain_id, + qos, + a_listener, + mask); +#endif + } + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::DomainParticipant_ptr + CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile ( + ::DDS::DomainId_t domain_id, + const char * library_name, + const char * profile_name, + ::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile"); + + 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 *rti_dpl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_dpl, + CCM_DDS_DomainPublisherListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + + ACE_CString qos_profile = library_name; + qos_profile += ACE_TEXT ("#"); + qos_profile += profile_name; + + CCM_DDS_DomainParticipant_i *rti_dp = 0; + + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, + this->dps_mutex_, CORBA::INTERNAL ()); + { + rti_dp = this->dps_[qos_profile]; + + if (!rti_dp) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - " + "Creating participant: profile <%C> - domain <%d>\n", + qos_profile.c_str (), + domain_id)); + DDSDomainParticipant * part = DDSDomainParticipantFactory::get_instance ()-> + create_participant_with_profile (domain_id, + library_name, + profile_name, + rti_dpl, + mask); + if (!part) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - " + "Error: Unable to create DomainParticipant\n")); + throw CCM_DDS::InternalError (1, 0); + } + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (part), + CORBA::NO_MEMORY ()); + + part->enable (); + + 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 + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - " + "Re-using participant for QOS profile <%C> and domin <%d>.\n", + qos_profile.c_str (), + domain_id)); + return ::DDS::DomainParticipant::_duplicate (rti_dp); + } + } + } +#endif + + void + CCM_DDS_DomainParticipantFactory_i::remove_participant (CCM_DDS_DomainParticipant_i * part) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::remove_participant"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, + this->dps_mutex_, CORBA::INTERNAL ()); + + if (part->_refcount_value () == 1) + { + DomainParticipants::iterator pos; + for (pos = this->dps_.begin(); pos != this->dps_.end(); ++pos) + { + if (pos->second == part) + { + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::remove_participant - " + "Removing participant for %C from list.\n", + pos->first.c_str ())); + this->dps_.erase (pos->first); + break; + } + } + } + else + { + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::remove_participant - " + "Don't delete participant since it's still used - ref_count <%d>\n", + part->_refcount_value ())); + } +#else +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipantFactory_i::delete_participant (::DDS::DomainParticipant_ptr a_participant) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::delete_participant"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + CCM_DDS_DomainParticipant_i *part = dynamic_cast< CCM_DDS_DomainParticipant_i * > (a_participant); + + if (!part) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - " + "Unable to cast provided object reference to servant type, bailing.\n")); + return DDS::RETCODE_ERROR; + } + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - " + "Successfully casted provided object reference to servant type.\n")); + + this->remove_participant (part); + + DDS::ReturnCode_t retval = DDS::RETCODE_OK; + + if (part->_refcount_value () == 1) + { + retval = DDSDomainParticipantFactory::get_instance ()-> + delete_participant (part->get_impl ()); + + if (retval != DDS::RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - " + "RTI delete_participant returned non-ok error code %C\n", + translate_retcode (retval))); + } + else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - " + "Successfully deleted provided participant.\n")); + } + return retval; +#else + return DDSDomainParticipantFactory::get_instance ()-> + delete_participant (a_participant); +#endif + } + + ::DDS::DomainParticipant_ptr + CCM_DDS_DomainParticipantFactory_i::lookup_participant (::DDS::DomainId_t domain_id) + { + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDomainParticipant* dp = DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (dp), + CORBA::NO_MEMORY ()); +#else + ::DDS::DomainParticipant_var dp = DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (dp.in ()), + CORBA::NO_MEMORY ()); +#endif + return retval._retn (); + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos (const ::DDS::DomainParticipantQos & qos) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + 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 + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipantFactory_i::get_default_participant_qos (::DDS::DomainParticipantQos & qos) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::get_default_participant_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDS_DomainParticipantQos rti_qos; + ::DDS::ReturnCode_t retcode = + DDSDomainParticipantFactory::get_instance ()->get_default_participant_qos (rti_qos); + qos <<= rti_qos; + return retcode; +#else + return DDSDomainParticipantFactory::get_instance ()->get_default_participant_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipantFactory_i::set_qos (const ::DDS::DomainParticipantFactoryQos & qos) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::set_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDS_DomainParticipantFactoryQos rti_qos; + rti_qos <<= qos; + return DDSDomainParticipantFactory::get_instance ()->set_qos (rti_qos); +#else + return DDSDomainParticipantFactory::get_instance ()->set_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipantFactory_i::get_qos (::DDS::DomainParticipantFactoryQos & qos) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::get_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDS_DomainParticipantFactoryQos rti_qos; + ::DDS::ReturnCode_t retcode = + DDSDomainParticipantFactory::get_instance ()->get_qos (rti_qos); + rti_qos <<= qos; + return retcode; +#else + return DDSDomainParticipantFactory::get_instance ()->get_qos (qos); +#endif + } + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::ReturnCode_t + CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos_with_profile ( + const char * library_name, + const char * profile_name) + { + DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos_with_profile"); + + return DDSDomainParticipantFactory::get_instance ()->set_default_participant_qos_with_profile (library_name, profile_name); + } +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) + ::DDS::DomainParticipantFactory_ptr + CCM_DDS_DomainParticipantFactory_i::get_instance (void) + { + return 0; + } +#endif + } +} + +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +template ACE_Singleton * + ACE_Singleton::singleton_; +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h new file mode 100644 index 00000000000..bb27d7cc1ab --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h @@ -0,0 +1,111 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS_RTI_PARTICIPANTFACTORY_H +#define DDS_RTI_PARTICIPANTFACTORY_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" + +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" + +#include "tao/LocalObject.h" + +#include "ace/Singleton.h" + +#include + +namespace CIAO +{ + namespace DDS4CCM + { + class CCM_DDS_DomainParticipant_i; + + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DomainParticipantFactory_i : + public virtual ::DDS::CCM_DomainParticipantFactory, + public virtual ::CORBA::LocalObject + { + friend class ACE_Singleton; + + private: + // Construtor + CCM_DDS_DomainParticipantFactory_i (void); + + /// Destructor + virtual ~CCM_DDS_DomainParticipantFactory_i (void); + + public: +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) + virtual ::DDS::DomainParticipantFactory_ptr get_instance (void); +#endif + + virtual + ::DDS::DomainParticipant_ptr create_participant (::DDS::DomainId_t domain_id, + const ::DDS::DomainParticipantQos & qos, + ::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + virtual + ::DDS::DomainParticipant_ptr create_participant_with_profile (::DDS::DomainId_t domain_id, + const char * library_name, + const char * profile_name, + ::DDS::DomainParticipantListener_ptr a_listener, + ::DDS::StatusMask mask); +#endif + + virtual + ::DDS::ReturnCode_t delete_participant (::DDS::DomainParticipant_ptr a_participant); + + virtual + ::DDS::DomainParticipant_ptr lookup_participant (::DDS::DomainId_t domain_id); + + virtual + ::DDS::ReturnCode_t set_default_participant_qos (const ::DDS::DomainParticipantQos & qos); + + virtual + ::DDS::ReturnCode_t get_default_participant_qos (::DDS::DomainParticipantQos & qos); + + virtual + ::DDS::ReturnCode_t set_qos (const ::DDS::DomainParticipantFactoryQos & qos); + + virtual + ::DDS::ReturnCode_t get_qos (::DDS::DomainParticipantFactoryQos & qos); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + virtual ::DDS::ReturnCode_t set_default_participant_qos_with_profile( + const char * library_name, + const char * profile_name); +#endif + + private: + void remove_participant (CCM_DDS_DomainParticipant_i * part); + + TAO_SYNCH_MUTEX dps_mutex_; + typedef std::map DomainParticipants; + DomainParticipants dps_; + private: + ACE_UNIMPLEMENTED_FUNC (void operator= (const CCM_DDS_DomainParticipantFactory_i &)) + ACE_UNIMPLEMENTED_FUNC (CCM_DDS_DomainParticipantFactory_i (const CCM_DDS_DomainParticipantFactory_i &)) + }; + + typedef ACE_Singleton Domain_Participant_Factory; + } +} + +#define DPFACTORY ::CIAO::DDS4CCM::Domain_Participant_Factory::instance () + +/// Declare a process wide singleton +DDS4CCM_NDDS_IMPL_SINGLETON_DECLARE (ACE_Singleton, + ::CIAO::DDS4CCM::CCM_DDS_DomainParticipantFactory_i, + TAO_SYNCH_MUTEX) + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h new file mode 100644 index 00000000000..19ebdea5b16 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h @@ -0,0 +1,44 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H +#define DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H + +#include "EntityFactoryQosPolicy.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DomainParticipantFactoryQos DDS_DomainParticipantFactoryQos; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::DomainParticipantFactoryQos &ddsqos, const ::DDS_DomainParticipantFactoryQos & qos) +{ + ddsqos.entity_factory <<= qos.entity_factory; +} + +inline void +operator<<= (::DDS_DomainParticipantFactoryQos &ddsqos, const ::DDS::DomainParticipantFactoryQos & qos) +{ + 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/ndds/DomainParticipantListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp new file mode 100644 index 00000000000..828eda9a2b1 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp @@ -0,0 +1,126 @@ +// $Id$ + +#include "DomainParticipantListener.h" +#include "DomainParticipant.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" + +#include "dds4ccm/impl/logger/Log_Macros.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_DomainPublisherListener_i::CCM_DDS_DomainPublisherListener_i ( + ::DDS::DomainParticipantListener_ptr p) + : impl_ (::DDS::DomainParticipantListener::_duplicate (p)) + { + } + + CCM_DDS_DomainPublisherListener_i::~CCM_DDS_DomainPublisherListener_i (void) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_inconsistent_topic ( + ::DDS::Topic_ptr, + const ::DDS::InconsistentTopicStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_requested_deadline_missed ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedDeadlineMissedStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_requested_incompatible_qos ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedIncompatibleQosStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_sample_rejected ( + ::DDS::DataReader_ptr , + const ::DDS::SampleRejectedStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_liveliness_changed ( + ::DDS::DataReader_ptr , + const ::DDS::LivelinessChangedStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_data_available ( + ::DDS::DataReader_ptr ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_subscription_matched ( + ::DDS::DataReader_ptr , + const ::DDS::SubscriptionMatchedStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_sample_lost ( + ::DDS::DataReader_ptr , + const ::DDS::SampleLostStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_offered_deadline_missed ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedDeadlineMissedStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_offered_incompatible_qos ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedIncompatibleQosStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_liveliness_lost ( + ::DDS::DataWriter_ptr , + const ::DDS::LivelinessLostStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_publication_matched ( + ::DDS::DataWriter_ptr , + const ::DDS::PublicationMatchedStatus & ) + { + } + + void + CCM_DDS_DomainPublisherListener_i::on_data_on_readers ( + ::DDS::Subscriber_ptr ) + { + } + + ::DDS::DomainParticipantListener_ptr + CCM_DDS_DomainPublisherListener_i::get_domainparticipantlistener (void) + { + return ::DDS::DomainParticipantListener::_duplicate (this->impl_.in ()); + } + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h new file mode 100644 index 00000000000..ef0b7f6aee9 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h @@ -0,0 +1,111 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DOMAINPARTICIPANTLISTENER_H +#define DDS4CCM_DOMAINPARTICIPANTLISTENER_H + +#include "tao/LocalObject.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm_ndds_impl_export.h" + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +# include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DomainParticipantListener DDSDomainParticipantListener; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DomainPublisherListener_i : + public virtual ::DDSDomainParticipantListener + { + public: + /// Constructor + CCM_DDS_DomainPublisherListener_i (::DDS::DomainParticipantListener_ptr p); + + /// Destructor + virtual ~CCM_DDS_DomainPublisherListener_i (void); + + ::DDS::DomainParticipantListener_ptr get_domainparticipantlistener (void); + + virtual void + on_inconsistent_topic ( + ::DDS::Topic_ptr, + const ::DDS::InconsistentTopicStatus & ); + + virtual void + on_requested_deadline_missed ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedDeadlineMissedStatus & ); + + virtual void + on_requested_incompatible_qos ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedIncompatibleQosStatus & ); + + virtual void + on_sample_rejected ( + ::DDS::DataReader_ptr , + const ::DDS::SampleRejectedStatus & ); + + virtual void + on_liveliness_changed ( + ::DDS::DataReader_ptr , + const ::DDS::LivelinessChangedStatus & ); + + virtual void + on_data_available ( + ::DDS::DataReader_ptr ); + + virtual void + on_subscription_matched ( + ::DDS::DataReader_ptr , + const ::DDS::SubscriptionMatchedStatus & ); + + virtual void + on_sample_lost ( + ::DDS::DataReader_ptr , + const ::DDS::SampleLostStatus & ); + + virtual void + on_offered_deadline_missed ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedDeadlineMissedStatus & ); + + virtual void + on_offered_incompatible_qos ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedIncompatibleQosStatus & ); + + virtual void + on_liveliness_lost ( + ::DDS::DataWriter_ptr , + const ::DDS::LivelinessLostStatus & ); + + virtual void + on_publication_matched ( + ::DDS::DataWriter_ptr , + const ::DDS::PublicationMatchedStatus & ); + + virtual void + on_data_on_readers ( + ::DDS::Subscriber_ptr ); + + private: + ::DDS::DomainParticipantListener_var impl_; + }; + } +} + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp new file mode 100644 index 00000000000..136904aa34a --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp @@ -0,0 +1,142 @@ +// $Id$ +#include "dds4ccm/impl/ndds/Utils.h" + +#include "dds4ccm/impl/ndds/DataReader.h" +#include "dds4ccm/impl/logger/Log_Macros.h" +#include "dds4ccm/impl/ndds/DataReaderHandler_T.h" +#include "tao/ORB_Core.h" + +template +CIAO::DDS4CCM::DomainParticipantListener_T::DomainParticipantListener_T ( + ::CCM_DDS::ConnectorStatusListener_ptr error_listener) + : error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DomainParticipantListener_T::DomainParticipantListener_T"); +} + +template +CIAO::DDS4CCM::DomainParticipantListener_T::~DomainParticipantListener_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DomainParticipantListener_T::~DomainParticipantListener_T"); +} + +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_inconsistent_topic ( + ::DDS::Topic_ptr, + const ::DDS::InconsistentTopicStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_requested_deadline_missed ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedDeadlineMissedStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_requested_incompatible_qos ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedIncompatibleQosStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_sample_rejected ( + ::DDS::DataReader_ptr , + const ::DDS::SampleRejectedStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_liveliness_changed ( + ::DDS::DataReader_ptr , + const ::DDS::LivelinessChangedStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_data_available ( + ::DDS::DataReader_ptr ) +{ +} + +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_subscription_matched ( + ::DDS::DataReader_ptr , + const ::DDS::SubscriptionMatchedStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_sample_lost ( + ::DDS::DataReader_ptr , + const ::DDS::SampleLostStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_offered_deadline_missed ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedDeadlineMissedStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_offered_incompatible_qos ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedIncompatibleQosStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_liveliness_lost ( + ::DDS::DataWriter_ptr , + const ::DDS::LivelinessLostStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_publication_matched ( + ::DDS::DataWriter_ptr , + const ::DDS::PublicationMatchedStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_data_on_readers ( + ::DDS::Subscriber_ptr ) +{ +} + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +template +void +CIAO::DDS4CCM::DomainParticipantListener_T::on_reliable_reader_activity_changed ( + ::DDS::DataWriter_ptr , + const ::DDS::ReliableReaderActivityChangedStatus & ) +{ +} +#endif + +template +::DDS::StatusMask +CIAO::DDS4CCM::DomainParticipantListener_T::get_mask (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::DomainParticipantListener_T::get_mask"); + return 0; +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h new file mode 100644 index 00000000000..50b8b59806f --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h @@ -0,0 +1,109 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Copy_Disabled.h" + +namespace CIAO +{ + namespace DDS4CCM + { + template + class DomainParticipantListener_T : + public virtual ::DDS::CCM_DomainParticipantListener, + public virtual ::CORBA::LocalObject, + private virtual ACE_Copy_Disabled + { + public: + /// Constructor + DomainParticipantListener_T ( + ::CCM_DDS::ConnectorStatusListener_ptr error_listener); + + /// Destructor + virtual ~DomainParticipantListener_T (void); + + static ::DDS::StatusMask get_mask (void); + + virtual void + on_inconsistent_topic ( + ::DDS::Topic_ptr, + const ::DDS::InconsistentTopicStatus & ); + + virtual void + on_requested_deadline_missed ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedDeadlineMissedStatus & ); + + virtual void + on_requested_incompatible_qos ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedIncompatibleQosStatus & ); + + virtual void + on_sample_rejected ( + ::DDS::DataReader_ptr , + const ::DDS::SampleRejectedStatus & ); + + virtual void + on_liveliness_changed ( + ::DDS::DataReader_ptr , + const ::DDS::LivelinessChangedStatus & ); + + virtual void + on_data_available ( + ::DDS::DataReader_ptr ); + + virtual void + on_subscription_matched ( + ::DDS::DataReader_ptr , + const ::DDS::SubscriptionMatchedStatus & ); + + virtual void + on_sample_lost ( + ::DDS::DataReader_ptr , + const ::DDS::SampleLostStatus & ); + + virtual void + on_offered_deadline_missed ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedDeadlineMissedStatus & ); + + virtual void + on_offered_incompatible_qos ( + ::DDS::DataWriter_ptr , + const ::DDS::OfferedIncompatibleQosStatus & ); + + virtual void + on_liveliness_lost ( + ::DDS::DataWriter_ptr , + const ::DDS::LivelinessLostStatus & ); + + virtual void + on_publication_matched ( + ::DDS::DataWriter_ptr , + const ::DDS::PublicationMatchedStatus & ); + + virtual void + on_data_on_readers ( + ::DDS::Subscriber_ptr ); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + virtual void + on_reliable_reader_activity_changed ( + ::DDS::DataWriter_ptr , + const ::DDS::ReliableReaderActivityChangedStatus & ); +#endif + + private: + ::CCM_DDS::ConnectorStatusListener_var error_listener_; + }; + } +} + +#include "dds4ccm/impl/ndds/DomainParticipantListener_T.cpp" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h new file mode 100644 index 00000000000..bc023e1c5e5 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h @@ -0,0 +1,48 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H +#define DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H + +#include "UserDataQosPolicy.h" +#include "EntityFactoryQosPolicy.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DomainParticipantQos DDS_DomainParticipantQos; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::DomainParticipantQos &ddsqos, const ::DDS_DomainParticipantQos & qos) +{ + ddsqos.user_data <<= qos.user_data; + ddsqos.entity_factory <<= qos.entity_factory; +} + +inline void +operator<<= (::DDS_DomainParticipantQos &ddsqos, const ::DDS::DomainParticipantQos & qos) +{ + ddsqos.user_data <<= qos.user_data; + 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/ndds/DurabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h new file mode 100644 index 00000000000..6b56460f3db --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h @@ -0,0 +1,42 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DURABILITYQOSPOLICY_H +#define DDS4CCM_DURABILITYQOSPOLICY_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DurabilityQosPolicy DDS_DurabilityQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::DurabilityQosPolicy &ddsqos, const ::DDS_DurabilityQosPolicy & qos) +{ + ddsqos.kind = static_cast < ::DDS::DurabilityQosPolicyKind> (qos.kind); +} + +inline void +operator<<= (::DDS_DurabilityQosPolicy &ddsqos, const ::DDS::DurabilityQosPolicy & qos) +{ + 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/ndds/DurabilityServiceQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h new file mode 100644 index 00000000000..f1bbc26325a --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h @@ -0,0 +1,64 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DURABILITYSERVICEQOSPOLICY_H +#define DDS4CCM_DURABILITYSERVICEQOSPOLICY_H + +#include "Duration_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::DurabilityServiceQosPolicy DDS_DurabilityServiceQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::DurabilityServiceQosPolicy &ddsqos, const ::DDS_DurabilityServiceQosPolicy & qos) +{ + 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<<= (::DDS_DurabilityServiceQosPolicy &ddsqos, const ::DDS::DurabilityServiceQosPolicy & qos) +{ + 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; +} + +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/ndds/Duration_t.h b/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h new file mode 100644 index 00000000000..74d6815b2a7 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h @@ -0,0 +1,41 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_DURATION_T_H +#define DDS4CCM_DURATION_T_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::Duration_t DDS_Duration_t; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::Duration_t &ddsduration, const ::DDS_Duration_t & duration) +{ + ddsduration.sec = duration.sec; + ddsduration.nanosec = duration.nanosec; +} + +inline void +operator<<= (::DDS_Duration_t &ddsduration, const ::DDS::Duration_t & duration) +{ + ddsduration.sec = duration.sec; + 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/ndds/EntityFactoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h new file mode 100644 index 00000000000..ec0a24a23f2 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h @@ -0,0 +1,42 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_ENTITYFACTORYQOSPOLICY_H +#define DDS4CCM_ENTITYFACTORYQOSPOLICY_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::EntityFactoryQosPolicy DDS_EntityFactoryQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::EntityFactoryQosPolicy &ddsqos, const ::DDS_EntityFactoryQosPolicy & qos) +{ + ddsqos.autoenable_created_entities = qos.autoenable_created_entities; +} + +inline void +operator<<= (::DDS_EntityFactoryQosPolicy &ddsqos, const ::DDS::EntityFactoryQosPolicy & qos) +{ + 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/ndds/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp new file mode 100644 index 00000000000..5fa9c34fd36 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp @@ -0,0 +1,421 @@ +// $Id$ +#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 +CIAO::DDS4CCM::RTI::Getter_Base_T::Getter_Base_T (void) : + impl_ (0), + condition_(0), + time_out_ (), + max_delivered_data_ (0), + ws_ (0), + rd_condition_ (0) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Getter_Base_T::Getter_Base_T"); +} + +template +CIAO::DDS4CCM::RTI::Getter_Base_T::~Getter_Base_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Getter_Base_T::~Getter_Base_T"); + delete ws_; +} + +template +typename DDS_TYPE::data_reader * +CIAO::DDS4CCM::RTI::Getter_Base_T::impl (void) +{ + if (this->impl_) + { + return this->impl_; + } + else + { + throw ::CORBA::BAD_INV_ORDER (); + } +} + +template +bool +CIAO::DDS4CCM::RTI::Getter_Base_T::wait ( + DDSConditionSeq& active_conditions) +{ + DDS_Duration_t timeout; + timeout <<= this->time_out_; + DDS_ReturnCode_t const retcode = this->ws_->wait (active_conditions, timeout); + if (retcode == DDS_RETCODE_TIMEOUT) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("Getter: No data available after timeout.\n"))); + return false; + } + return true; +} + +template +bool +CIAO::DDS4CCM::RTI::Getter_Base_T::get_many ( + typename CCM_TYPE::seq_type::_out_type instances, + ::CCM_DDS::ReadInfoSeq_out infos) +{ + instances = new typename CCM_TYPE::seq_type; + infos = new ::CCM_DDS::ReadInfoSeq; + + DDSConditionSeq active_conditions; + if (!this->wait (active_conditions)) + { + return false; + } + + ::DDS_Long max_samples = this->max_delivered_data_; + if (max_samples == 0) + { + max_samples = DDS_LENGTH_UNLIMITED; + } + + DDS_SampleInfoSeq sample_info; + typename DDS_TYPE::dds_seq_type data; + for (::DDS_Long i = 0; i < active_conditions.length(); i++) + { + if (active_conditions[i] == this->rd_condition_) + { + // Check trigger + active_conditions[i]->get_trigger_value (); + + // Take read condition + DDS_ReturnCode_t retcode = this->impl ()->read_w_condition ( + data, + sample_info, + max_samples, + this->rd_condition_); + + if (retcode == DDS_RETCODE_OK && data.length () >= 1) + { + ::CORBA::ULong number_read = 0; + for (::DDS_Long index = 0; index < sample_info.length (); index ++) + { + if (sample_info[index].valid_data) + { + ++number_read; + } + } + DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("Getter_Base_T::get_many: ") + ACE_TEXT ("read <%d> - valid <%d>\n"), + sample_info.length (), + number_read)); + infos->length (number_read); + instances->length (number_read); + number_read = 0; + for (::DDS_Long j = 0; j < data.length (); j ++) + { + if (sample_info[j].valid_data) + { + infos->operator[](number_read) <<= sample_info[j]; + instances->operator[](number_read) = data[j]; + ++number_read; + } + } + } + else + { + // RETCODE_NO_DATA should be an error + // because after a timeout there should be + // data. + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO + "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); + throw CCM_DDS::InternalError (retcode, 1); + } + + retcode = this->impl ()->return_loan(data,sample_info); + if (retcode != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("return loan error %C\n"), + translate_retcode (retcode))); + } + } + } + return true; +} + +template +::DDS::Duration_t +CIAO::DDS4CCM::RTI::Getter_Base_T::time_out (void) +{ + return this->time_out_; +} + +template +void +CIAO::DDS4CCM::RTI::Getter_Base_T::time_out ( + const ::DDS::Duration_t & time_out) +{ + this->time_out_ = time_out; +} + +template +::CCM_DDS::DataNumber_t +CIAO::DDS4CCM::RTI::Getter_Base_T::max_delivered_data (void) +{ + return this->max_delivered_data_; +} + +template +void +CIAO::DDS4CCM::RTI::Getter_Base_T::max_delivered_data ( + ::CCM_DDS::DataNumber_t max_delivered_data) +{ + this->max_delivered_data_ = max_delivered_data; +} + +template +void +CIAO::DDS4CCM::RTI::Getter_Base_T::passivate () +{ + DDS_ReturnCode_t retcode = this->ws_->detach_condition (this->rd_condition_); + if (retcode != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "Getter_Base_T::passivate - " + "Unable to detach read condition from waitset.\n")); + } + else + { + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "Getter_Base_T::passivate - " + "Read condition succesfully detached from waitset.\n")); + } + if (retcode != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "Getter_Base_T::passivate - " + "Unable to detach guard condition from waitset.\n")); + } + else + { + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "Getter_Base_T::passivate - " + "Guard condition succesfully detached from waitset.\n")); + } + retcode = this->impl ()->delete_readcondition (this->rd_condition_); + if (retcode != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "Getter_Base_T::passivate - " + "Unable to delete read condition from DDSDataReader.\n")); + } + else + { + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "Getter_Base_T::passivate - " + "Read condition succesfully deleted from DDSDataReader.\n")); + } +} + +template +void +CIAO::DDS4CCM::RTI::Getter_Base_T::set_impl ( + ::DDS::DataReader_ptr reader) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Getter_Base_T::set_impl"); + + if (::CORBA::is_nil (reader)) + { + impl_ = 0; + delete this->ws_; + this->ws_ = 0; + } + else + { + CCM_DDS_DataReader_i *rdr = dynamic_cast (reader); + if (!rdr) + { + 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 (); + } + + this->impl_ = DDS_TYPE::data_reader::narrow (rdr->get_impl ()); + + if (!this->impl_) + { + 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 + 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); + DDS_ReturnCode_t retcode = this->ws_->attach_condition (this->rd_condition_); + if (retcode != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "GETTER: Unable to attach read condition to waitset.\n")); + throw CCM_DDS::InternalError (retcode, 1); + } + } +} + +template +bool +CIAO::DDS4CCM::RTI::Getter_T::get_one ( + typename DDS_TYPE::value_type::_out_type an_instance, + ::CCM_DDS::ReadInfo_out info) +{ + DDSConditionSeq active_conditions; + if (!this->wait (active_conditions)) + { + return false; + } + + for (::DDS_Long i = 0; i < active_conditions.length(); i++) + { + if (active_conditions[i] == this->rd_condition_) + { + bool valid_data_read = false; + + while (!valid_data_read) + { + DDS_SampleInfoSeq sample_info; + typename DDS_TYPE::dds_seq_type data; + DDS_ReturnCode_t retcode = this->impl ()->read_w_condition ( + data, + sample_info, + 1, + this->rd_condition_); + if (retcode == DDS_RETCODE_NO_DATA) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO + "CIAO::DDS4CCM::RTI::Getter_T::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::RTI::Getter_T::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::RTI::Getter_T") + ACE_TEXT ("::get_one - ") + ACE_TEXT ("return loan error\n"))); + } + throw CCM_DDS::InternalError (retcode, 1); + } + else if (data.length () == 1 && + sample_info[0].valid_data) + { + info <<= sample_info[0]; + an_instance = data[0]; + valid_data_read = true; + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO + "CIAO::DDS4CCM::RTI::Getter_T::get_one - " + "No valid available in DDS.\n")); + } + //return the loan of each read. + if (this->impl ()->return_loan (data, sample_info) != + DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, + ACE_TEXT ("CIAO::DDS4CCM::RTI::Getter_T") + ACE_TEXT ("::get_one - ") + ACE_TEXT ("return loan error\n"))); + } + } + } + } + + return true; +} + +template +bool +CIAO::DDS4CCM::RTI::Getter_T::get_one ( + typename DDS_TYPE::value_type::_out_type an_instance, + ::CCM_DDS::ReadInfo_out info) +{ + an_instance = new typename DDS_TYPE::value_type; + DDSConditionSeq active_conditions; + if (!this->wait (active_conditions)) + { + return false; + } + + DDS_SampleInfoSeq sample_info; + typename DDS_TYPE::dds_seq_type data; + for (::DDS_Long i = 0; i < active_conditions.length(); i++) + { + if (active_conditions[i] == this->rd_condition_) + { + bool valid_data_read = false; + + while (!valid_data_read) + { + DDS_SampleInfoSeq sample_info; + typename DDS_TYPE::dds_seq_type data; + DDS_ReturnCode_t retcode = this->impl ()->read_w_condition ( + data, + sample_info, + 1, + this->rd_condition_); + if (retcode == DDS_RETCODE_NO_DATA) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO + "CIAO::DDS4CCM::RTI::Getter_T::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::RTI::Getter_T::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::RTI::Getter_T") + ACE_TEXT ("::get_one - ") + ACE_TEXT ("return loan error\n"))); + } + throw CCM_DDS::InternalError (retcode, 1); + } + else if (data.length () == 1 && + sample_info[0].valid_data) + { + info <<= sample_info[0]; + *an_instance = data[0]; + valid_data_read = true; + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO + "CIAO::DDS4CCM::RTI::Getter_T::get_one - " + "No valid available in DDS.\n")); + } + //return the loan of each read. + if (this->impl ()->return_loan (data, sample_info) != + DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, + ACE_TEXT ("CIAO::DDS4CCM::RTI::Getter_T") + ACE_TEXT ("::get_one - ") + ACE_TEXT ("return loan error\n"))); + } + } + } + } + + return true; +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h new file mode 100644 index 00000000000..d797ec32b27 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h @@ -0,0 +1,141 @@ +/** + * @author Marcel Smit + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef GETTER_T_H +#define GETTER_T_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Copy_Disabled.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::GuardCondition DDSGuardCondition; +typedef ::DDS::WaitSet DDSWaitSet; +typedef ::DDS::ReadCondition DDSReadCondition; +typedef ::DDS::ConditionSeq DDSConditionSeq; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + namespace RTI + { + /** + * @class Getter_Base_T + * + * @brief Templated base class for the Getter port. + * + * Spec: Get operations are performed with the following parameters + * · SampleStateMask: NO_READ, + * · ViewStateMask: NEW or NOT_NEW, + * · InstanceStateMask: ALIVE or NOT_ALIVE, + * · Through the query (if any) of the Reader associated to the port, + * · Within the time limit specified in time_out. + * + * All methods return a boolean as result indicating whether actual data + * are provided (TRUE) or if the time-out occurred (FALSE). + */ + template + class Getter_Base_T : + public virtual CCM_TYPE::getter_type, + public virtual ::CORBA::LocalObject, + private virtual ACE_Copy_Disabled + { + public: + /// Constructor + Getter_Base_T (void); + + /// Destructor + virtual ~Getter_Base_T (void); + + /** + * Spec : get_many returns all the available samples + * in the limits set by the attribute max_delivered_data. + * In case there are more available samples, the first + * max_delivered_data are returned. The default value for + * that attribute is UNLIMITED (0) + */ + virtual bool get_many ( + typename CCM_TYPE::seq_type::_out_type instances, + ::CCM_DDS::ReadInfoSeq_out infos); + virtual ::DDS::Duration_t time_out (void); + virtual void time_out (const ::DDS::Duration_t & time_out); + + virtual ::CCM_DDS::DataNumber_t max_delivered_data (void); + virtual void max_delivered_data ( + ::CCM_DDS::DataNumber_t max_delivered_data); + + /** + * Set the actual pointer to DDS Datareader + */ + void set_impl (::DDS::DataReader_ptr reader); + + void passivate (void); + + protected: + typename DDS_TYPE::data_reader *impl_; + + DDSQueryCondition* condition_; + ::DDS::Duration_t time_out_; + ::CCM_DDS::DataNumber_t max_delivered_data_; + DDSWaitSet* ws_; + DDSReadCondition* rd_condition_; + + bool wait (DDSConditionSeq& active_conditions); + + typename DDS_TYPE::data_reader * impl (void); + }; + + template + class Getter_T; + + /** + * @brief Implementation of the Getter port for variable sized data types. + * + */ + template + class Getter_T : + public Getter_Base_T + { + public: + /** + * + * @brief get_one implementation for variable sized datatypes. + * + * Spec : get_one returns the next sample to be gotten. + */ + virtual bool get_one ( + typename DDS_TYPE::value_type::_out_type an_instance, + ::CCM_DDS::ReadInfo_out info); + }; + + /** + * @brief Implementation of the Getter port for fixed sized data types. + * + */ + template + class Getter_T : + public Getter_Base_T + { + public: + /** + * @brief get_one implementation for fixed sized datatypes. + * + * Spec : get_one returns the next sample to be gotten. + */ + virtual bool get_one ( + typename DDS_TYPE::value_type::_out_type an_instance, + ::CCM_DDS::ReadInfo_out info); + }; + } + } +} + +#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 + * + * $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/ndds/HistoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h new file mode 100644 index 00000000000..0a4ce342254 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h @@ -0,0 +1,46 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_HISTORYQOSPOLICY_H +#define DDS4CCM_HISTORYQOSPOLICY_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::HistoryQosPolicy DDS_HistoryQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::HistoryQosPolicy &ddsqos, const ::DDS_HistoryQosPolicy & qos) +{ + ddsqos.kind = static_cast < ::DDS::HistoryQosPolicyKind> (qos.kind); + ddsqos.depth = qos.depth; +} + +inline void +operator<<= (::DDS_HistoryQosPolicy &ddsqos, const ::DDS::HistoryQosPolicy & qos) +{ + 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; +} + +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/ndds/InconsistentTopicStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h new file mode 100644 index 00000000000..841b28e1660 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h @@ -0,0 +1,47 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_INCONSISTENTTOPICSTATUS_H +#define DDS4CCM_INCONSISTENTTOPICSTATUS_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::InconsistentTopicStatus DDS_InconsistentTopicStatus; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::InconsistentTopicStatus &ddsstatus, const ::DDS_InconsistentTopicStatus & status) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; +} + +inline void +operator<<= (::DDS_InconsistentTopicStatus &ddsstatus, const ::DDS::InconsistentTopicStatus & status) +{ + 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; +} + +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/ndds/InstanceHandleManager_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp new file mode 100644 index 00000000000..9eff3682e48 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp @@ -0,0 +1,89 @@ +// $Id$ + +#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 +CIAO::DDS4CCM::InstanceHandleManager_T::InstanceHandleManager_T (void) + : impl_ (0) +{ +} + +template +CIAO::DDS4CCM::InstanceHandleManager_T::~InstanceHandleManager_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::InstanceHandleManager_T::~InstanceHandleManager_T"); +} + +template +typename DDS_TYPE::data_writer * +CIAO::DDS4CCM::InstanceHandleManager_T::impl (void) +{ + if (this->impl_) + { + return this->impl_; + } + else + { + throw ::CORBA::BAD_INV_ORDER (); + } +} + +template +::DDS::InstanceHandle_t +CIAO::DDS4CCM::InstanceHandleManager_T:: + register_instance (const typename DDS_TYPE::value_type & datum) +{ + ::DDS::InstanceHandle_t dds_handle; + ::DDS_InstanceHandle_t const handle = this->impl ()->register_instance (datum); + dds_handle <<= handle; + return dds_handle; +} + +template +void +CIAO::DDS4CCM::InstanceHandleManager_T::unregister_instance ( + const typename DDS_TYPE::value_type & datum, + const ::DDS::InstanceHandle_t & instance_handle) +{ + ::DDS_InstanceHandle_t handle = ::DDS_HANDLE_NIL; + handle <<= instance_handle; + this->impl ()->unregister_instance (datum, handle); +} + +template +void +CIAO::DDS4CCM::InstanceHandleManager_T::set_impl ( + ::DDS::DataWriter_ptr writer) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::InstanceHandleManager_T::set_impl"); + + if (::CORBA::is_nil (writer)) + { + impl_ = 0; + } + else + { + CCM_DDS_DataWriter_i *rdw = dynamic_cast (writer); + + if (rdw == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::InstanceHandleManager_T::data_writer - " + "Unable to cast provided DataWriter to servant\n")); + throw ::CORBA::INTERNAL (); + } + + this->impl_ = DDS_TYPE::data_writer::narrow (rdw->get_impl ()); + + if (!this->impl_) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::InstanceHandleManager_T::data_writer - " + "Unable to narrow the provided writer entity to the specific " + "type necessary to publish messages\n")); + throw ::CORBA::INTERNAL (); + } + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h new file mode 100644 index 00000000000..a232161c718 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h @@ -0,0 +1,51 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef INSTANCE_HANDLEMANGER_T_H +#define INSTANCE_HANDLEMANGER_T_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Copy_Disabled.h" + +namespace CIAO +{ + namespace DDS4CCM + { + template + class InstanceHandleManager_T : + public virtual BASE_TYPE, + public virtual ::CORBA::LocalObject, + private virtual ACE_Copy_Disabled + { + public: + /// Constructor + InstanceHandleManager_T (void); + + /// Destructor + virtual ~InstanceHandleManager_T (void); + + virtual ::DDS::InstanceHandle_t register_instance ( + const typename DDS_TYPE::value_type & datum); + + virtual void unregister_instance ( + const typename DDS_TYPE::value_type & datum, + const ::DDS::InstanceHandle_t & instance_handle); + + void set_impl (::DDS::DataWriter_ptr writer); + + typename DDS_TYPE::data_writer * impl (void); + + private: + typename DDS_TYPE::data_writer *impl_; + }; + } +} + +#include "dds4ccm/impl/ndds/InstanceHandleManager_T.cpp" + +#endif /* INSTANCE_HANDLEMANGER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h new file mode 100644 index 00000000000..e5c49ba137c --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h @@ -0,0 +1,66 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_INSTANCEHANDLESEQ_H +#define DDS4CCM_INSTANCEHANDLESEQ_H + +#include "InstanceHandle_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::InstanceHandleSeq DDS_InstanceHandleSeq; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +template +void convert_dds_to_corba_sequence(corbaseq & target, const ddsseq& source) { + target.length (source.length ()); + for (::DDS_Long index = 0; index < source.length (); index++) + { + target[index] <<= source[index]; + } +} + +inline void +operator<<= (::DDS::InstanceHandleSeq &ddsinstancehandleseqseq, const ::DDS_InstanceHandleSeq & instancehandleseq) +{ + convert_dds_to_corba_sequence (ddsinstancehandleseqseq, instancehandleseq); +} + +inline void +operator<<= (::DDS_InstanceHandleSeq &ddsinstancehandleseqseq, const ::DDS::InstanceHandleSeq & instancehandleseq) +{ + ddsinstancehandleseqseq.length (instancehandleseq.length ()); + for (::DDS::InstanceHandleSeq::size_type index = 0; index < instancehandleseq.length (); index++) + { + ddsinstancehandleseqseq[index] <<= instancehandleseq[index]; + } +} + +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/ndds/InstanceHandle_t.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h new file mode 100644 index 00000000000..ea731ea7f28 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h @@ -0,0 +1,106 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_INSTANCEHANDLE_T_H +#define DDS4CCM_INSTANCEHANDLE_T_H + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +#include "ndds/ndds_cpp.h" +#define DDS_INSTANCE_HANDLE_T_IN const ::DDS::InstanceHandle_t & +#define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +#define DDS_INSTANCE_HANDLE_T_IN ::DDS::InstanceHandle_t +#define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::InstanceHandle_t &ddsinstancehandle, const ::DDS_InstanceHandle_t & instancehandle) +{ + ACE_OS::memcpy (ddsinstancehandle.value, instancehandle.keyHash.value, sizeof (instancehandle.keyHash.value)); + ddsinstancehandle.length = instancehandle.keyHash.length; + ddsinstancehandle.isValid = instancehandle.isValid; +} + +inline void +operator<<= (::DDS_InstanceHandle_t &ddsinstancehandle, const ::DDS::InstanceHandle_t & instancehandle) +{ + ACE_OS::memcpy (ddsinstancehandle.keyHash.value, instancehandle.value, sizeof (instancehandle.value)); + ddsinstancehandle.keyHash.length = instancehandle.length; + 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) +{ + return instancehandle1.length == instancehandle2.length && + instancehandle1.isValid == instancehandle2.isValid && + ACE_OS::memcmp (instancehandle1.value, instancehandle2.value, sizeof (instancehandle1.value)) == 0; +} + +inline bool +operator== (const DDS_InstanceHandle_t & dds_instancehandle, const ::DDS::InstanceHandle_t & ccm_instancehandle) +{ + return dds_instancehandle.keyHash.length == ccm_instancehandle.length && + static_cast(dds_instancehandle.isValid) == ccm_instancehandle.isValid && + ACE_OS::memcmp (dds_instancehandle.keyHash.value, ccm_instancehandle.value, sizeof (dds_instancehandle.keyHash.value)) == 0; +} + +inline bool +operator== (const ::DDS::InstanceHandle_t & ccm_instancehandle, const DDS_InstanceHandle_t & dds_instancehandle) +{ + return ccm_instancehandle.length == dds_instancehandle.keyHash.length && + ccm_instancehandle.isValid == static_cast(dds_instancehandle.isValid) && + ACE_OS::memcmp (ccm_instancehandle.value, dds_instancehandle.keyHash.value, sizeof (ccm_instancehandle.value)) == 0; +} + +inline bool +operator!= (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2) +{ + return instancehandle1.length != instancehandle2.length || + instancehandle1.isValid != instancehandle2.isValid || + ACE_OS::memcmp (instancehandle1.value, instancehandle2.value, sizeof (instancehandle1.value)) != 0; +} + +inline bool +operator!= (const DDS_InstanceHandle_t & dds_instancehandle, const ::DDS::InstanceHandle_t & ccm_instancehandle) +{ + return dds_instancehandle.keyHash.length != ccm_instancehandle.length || + static_cast(dds_instancehandle.isValid) != ccm_instancehandle.isValid || + ACE_OS::memcmp (dds_instancehandle.keyHash.value, ccm_instancehandle.value, sizeof (dds_instancehandle.keyHash.value)) != 0; +} + +inline bool +operator!= (const ::DDS::InstanceHandle_t & ccm_instancehandle, const DDS_InstanceHandle_t & dds_instancehandle) +{ + return ccm_instancehandle.length != dds_instancehandle.keyHash.length || + ccm_instancehandle.isValid != static_cast(dds_instancehandle.isValid) || + ACE_OS::memcmp (ccm_instancehandle.value, dds_instancehandle.keyHash.value, sizeof (ccm_instancehandle.value)) != 0; +} +#endif + +#endif /* DDS4CCM_INSTANCEHANDLE_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h new file mode 100644 index 00000000000..0aaee70207c --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h @@ -0,0 +1,44 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_LATENCYBUDGETQOSPOLICY_H +#define DDS4CCM_LATENCYBUDGETQOSPOLICY_H + +#include "Duration_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::LatencyBudgetQosPolicy DDS_LatencyBudgetQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::LatencyBudgetQosPolicy &ddsqos, const ::DDS_LatencyBudgetQosPolicy & qos) +{ + ddsqos.duration <<= qos.duration; +} + +inline void +operator<<= (::DDS_LatencyBudgetQosPolicy &ddsqos, const ::DDS::LatencyBudgetQosPolicy & qos) +{ + 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/ndds/LifespanQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h new file mode 100644 index 00000000000..a40e0cae31f --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h @@ -0,0 +1,44 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_LIFESPANQOSPOLICY_H +#define DDS4CCM_LIFESPANQOSPOLICY_H + +#include "Duration_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::LifespanQosPolicy DDS_LifespanQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::LifespanQosPolicy &ddsqos, const ::DDS_LifespanQosPolicy & qos) +{ + ddsqos.duration <<= qos.duration; +} + +inline void +operator<<= (::DDS_LifespanQosPolicy &ddsqos, const ::DDS::LifespanQosPolicy & qos) +{ + 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/ndds/LivelinessChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h new file mode 100644 index 00000000000..6828b018a51 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h @@ -0,0 +1,61 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_LIVELINESSCHANGEDSTATUS_H +#define DDS4CCM_LIVELINESSCHANGEDSTATUS_H + +#include "InstanceHandle_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::LivelinessChangedStatus DDS_LivelinessChangedStatus; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::LivelinessChangedStatus &ddsstatus, const ::DDS_LivelinessChangedStatus & status) +{ + 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<<= (::DDS_LivelinessChangedStatus &ddsstatus, const ::DDS::LivelinessChangedStatus & status) +{ + 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; +} + +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/ndds/LivelinessLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h new file mode 100644 index 00000000000..6561f6fe2c4 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h @@ -0,0 +1,47 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_LIVELINESSLOSTSTATUS_H +#define DDS4CCM_LIVELINESSLOSTSTATUS_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::LivelinessLostStatus DDS_LivelinessLostStatus; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::LivelinessLostStatus &ddsstatus, const ::DDS_LivelinessLostStatus & status) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; +} + +inline void +operator<<= (::DDS_LivelinessLostStatus &ddsstatus, const ::DDS::LivelinessLostStatus & status) +{ + 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; +} + +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/ndds/LivelinessQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h new file mode 100644 index 00000000000..ec3121e9efb --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h @@ -0,0 +1,48 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_LIVELINESSQOSPOLICY_H +#define DDS4CCM_LIVELINESSQOSPOLICY_H + +#include "Duration_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::LivelinessQosPolicy DDS_LivelinessQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::LivelinessQosPolicy &ddsqos, const ::DDS_LivelinessQosPolicy & qos) +{ + ddsqos.kind = static_cast < ::DDS::LivelinessQosPolicyKind> (qos.kind); + ddsqos.lease_duration <<= qos.lease_duration; +} + +inline void +operator<<= (::DDS_LivelinessQosPolicy &ddsqos, const ::DDS::LivelinessQosPolicy & qos) +{ + 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; +} + +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/ndds/OfferedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h new file mode 100644 index 00000000000..8c242eec417 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h @@ -0,0 +1,53 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H +#define DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H + +#include "InstanceHandle_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::OfferedDeadlineMissedStatus DDS_OfferedDeadlineMissedStatus; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::OfferedDeadlineMissedStatus &ddsstatus, const ::DDS_OfferedDeadlineMissedStatus & status) +{ + 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<<= (::DDS_OfferedDeadlineMissedStatus &ddsstatus, const ::DDS::OfferedDeadlineMissedStatus & status) +{ + 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; +} + +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/ndds/OfferedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h new file mode 100644 index 00000000000..4ac14dc690b --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h @@ -0,0 +1,57 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H +#define DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H + +#include "QosPolicyCountSeq.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::OfferedIncompatibleQosStatus DDS_OfferedIncompatibleQosStatus; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::OfferedIncompatibleQosStatus &ddsstatus, const ::DDS_OfferedIncompatibleQosStatus & status) +{ + 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<<= (::DDS_OfferedIncompatibleQosStatus &ddsstatus, const ::DDS::OfferedIncompatibleQosStatus & status) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.last_policy_id = static_cast (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 = 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 (status.last_policy_id); + ddsstatus.policies <<= status.policies; +} +#endif + +#endif /* DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h new file mode 100644 index 00000000000..1553d5d4ddb --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h @@ -0,0 +1,42 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_OWNERSHIPQOSPOLICY_H +#define DDS4CCM_OWNERSHIPQOSPOLICY_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::OwnershipQosPolicy DDS_OwnershipQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::OwnershipQosPolicy &ddsqos, const ::DDS_OwnershipQosPolicy & qos) +{ + ddsqos.kind = static_cast < ::DDS::OwnershipQosPolicyKind> (qos.kind); +} + +inline void +operator<<= (::DDS_OwnershipQosPolicy &ddsqos, const ::DDS::OwnershipQosPolicy & qos) +{ + 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/ndds/OwnershipStrengthQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h new file mode 100644 index 00000000000..64e905a4faa --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h @@ -0,0 +1,42 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H +#define DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::OwnershipStrengthQosPolicy DDS_OwnershipStrengthQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::OwnershipStrengthQosPolicy &ddsqos, const ::DDS_OwnershipStrengthQosPolicy & qos) +{ + ddsqos.value = qos.value; +} + +inline void +operator<<= (::DDS_OwnershipStrengthQosPolicy &ddsqos, const ::DDS::OwnershipStrengthQosPolicy & qos) +{ + 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/ndds/PartitionQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h new file mode 100644 index 00000000000..49a84ebc20c --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h @@ -0,0 +1,44 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_PARTITIONQOSPOLICY_H +#define DDS4CCM_PARTITIONQOSPOLICY_H + +#include "dds4ccm/impl/ndds/StringSeq.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::PartitionQosPolicy DDS_PartitionQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::PartitionQosPolicy &ddsqos, const ::DDS_PartitionQosPolicy & qos) +{ + ddsqos.name <<= qos.name; +} + +inline void +operator<<= (::DDS_PartitionQosPolicy &ddsqos, const ::DDS::PartitionQosPolicy & qos) +{ + 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/ndds/PortStatusListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp new file mode 100644 index 00000000000..1344dd510fd --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp @@ -0,0 +1,182 @@ +// $Id$ +#include "dds4ccm/impl/ndds/Utils.h" + +#include "dds4ccm/impl/ndds/DataReader.h" +#include "dds4ccm/impl/logger/Log_Macros.h" +#include "dds4ccm/impl/ndds/DataReaderHandler_T.h" +#include "tao/ORB_Core.h" + +template +CIAO::DDS4CCM::PortStatusListener_T::PortStatusListener_T ( + ::CCM_DDS::PortStatusListener_ptr port_status_listener, + ACE_Reactor* reactor) + : port_status_listener_ (::CCM_DDS::PortStatusListener::_duplicate (port_status_listener)), + reactor_ (reactor) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener_T::PortStatusListener_T"); +} + +template +CIAO::DDS4CCM::PortStatusListener_T::~PortStatusListener_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener_T::~PortStatusListener_T"); +} + +template +void +CIAO::DDS4CCM::PortStatusListener_T::on_requested_deadline_missed ( + ::DDS::DataReader_ptr the_reader, + const ::DDS::RequestedDeadlineMissedStatus & status) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener_T::on_requested_deadline_missed"); + + DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO + ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ") + ACE_TEXT ("total count <%d> - total change <%d> - ") + ACE_TEXT ("last instance handle - isValid <%l>\n"), + status.total_count, status.total_count_change, + status.last_instance_handle.length, status.last_instance_handle.isValid)); + + if (!CORBA::is_nil (this->port_status_listener_)) + { + try + { + if (this->reactor_) + { + ::CIAO::DDS4CCM::OnRequestedDeadlineMissedHandler* rh = 0; + ACE_NEW (rh, + ::CIAO::DDS4CCM::OnRequestedDeadlineMissedHandler ( + this->port_status_listener_, the_reader, status)); + ACE_Event_Handler_var safe_handler (rh); + if (this->reactor_->notify (rh) != 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO + ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ") + ACE_TEXT ("failed to use reactor.\n"))); + } + } + else + { + this->port_status_listener_->on_requested_deadline_missed (the_reader, status); + } + } + catch (...) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ") + ACE_TEXT ("DDS Exception caught\n"))); + } + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, + ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ") + ACE_TEXT ("No portstatus listener installed\n"))); + } +} + +template +void +CIAO::DDS4CCM::PortStatusListener_T::on_sample_lost ( + ::DDS::DataReader_ptr the_reader, + const ::DDS::SampleLostStatus & status) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener_T::on_sample_lost"); + + DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO + ACE_TEXT ("PortStatusListener_T::on_sample_lost: ") + ACE_TEXT ("total count <%d> - total change <%d>\n"), + status.total_count, status.total_count_change)); + + if (!CORBA::is_nil (this->port_status_listener_)) + { + try + { + if (this->reactor_) + { + ::CIAO::DDS4CCM::OnSampleLostHandler* rh = 0; + ACE_NEW (rh, + ::CIAO::DDS4CCM::OnSampleLostHandler ( + this->port_status_listener_, + the_reader, + status)); + ACE_Event_Handler_var safe_handler (rh); + if (this->reactor_->notify (rh) != 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO + ACE_TEXT ("PortStatusListener_T::on_sample_lost: ") + ACE_TEXT ("failed to use reactor.\n"))); + } + } + else + { + this->port_status_listener_->on_sample_lost (the_reader, status); + } + } + catch (...) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PortStatusListener_T::on_sample_lost: ") + ACE_TEXT ("DDS Exception caught\n"))); + } + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, + ACE_TEXT ("PortStatusListener_T::on_sample_lost: ") + ACE_TEXT ("No portstatus listener installed\n"))); + } +} + +template +void +CIAO::DDS4CCM::PortStatusListener_T::on_requested_incompatible_qos ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedIncompatibleQosStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::PortStatusListener_T::on_sample_rejected ( + ::DDS::DataReader_ptr , + const ::DDS::SampleRejectedStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::PortStatusListener_T::on_liveliness_changed ( + ::DDS::DataReader_ptr , + const ::DDS::LivelinessChangedStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::PortStatusListener_T::on_data_available ( + ::DDS::DataReader_ptr ) +{ +} + +template +void +CIAO::DDS4CCM::PortStatusListener_T::on_subscription_matched ( + ::DDS::DataReader_ptr , + const ::DDS::SubscriptionMatchedStatus & ) +{ +} + +template +::DDS::StatusMask +CIAO::DDS4CCM::PortStatusListener_T::get_mask ( + ::CCM_DDS::PortStatusListener_ptr psl) +{ + if (!CORBA::is_nil (psl) || CIAO_debug_level >= 10) + { + return DDS_REQUESTED_DEADLINE_MISSED_STATUS | + DDS_SAMPLE_LOST_STATUS; + } + else + { + return 0; + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.h new file mode 100644 index 00000000000..f228db9bcca --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.h @@ -0,0 +1,84 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_PORTSTATUSLISTENER_T_H +#define DDS4CCM_PORTSTATUSLISTENER_T_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Copy_Disabled.h" + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL +class ACE_Reactor; +ACE_END_VERSIONED_NAMESPACE_DECL + +namespace CIAO +{ + namespace DDS4CCM + { + template + class PortStatusListener_T : + public ::DDS::DataReaderListener, + private ACE_Copy_Disabled + { + public: + /// Constructor + PortStatusListener_T ( + ::CCM_DDS::PortStatusListener_ptr port_status_listener, + ACE_Reactor* reactor); + + /// Destructor + virtual ~PortStatusListener_T (void); + + virtual void on_requested_deadline_missed ( + ::DDS::DataReader_ptr the_reader, + const ::DDS::RequestedDeadlineMissedStatus & status); + + virtual void on_sample_lost ( + ::DDS::DataReader_ptr the_reader, + const ::DDS::SampleLostStatus & status); + + virtual void + on_requested_incompatible_qos ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedIncompatibleQosStatus & ); + + virtual void + on_sample_rejected ( + ::DDS::DataReader_ptr , + const ::DDS::SampleRejectedStatus & ); + + virtual void + on_liveliness_changed ( + ::DDS::DataReader_ptr , + const ::DDS::LivelinessChangedStatus & ); + + virtual void + on_data_available ( + ::DDS::DataReader_ptr ); + + virtual void + on_subscription_matched ( + ::DDS::DataReader_ptr , + const ::DDS::SubscriptionMatchedStatus & ); + + static ::DDS::StatusMask get_mask ( + ::CCM_DDS::PortStatusListener_ptr psl); + + private: + ::CCM_DDS::PortStatusListener_var port_status_listener_; + protected: + ACE_Reactor* reactor_; + + }; + } +} + +#include "dds4ccm/impl/ndds/PortStatusListener_T.cpp" + +#endif /* DDS4CCM_PORTSTATUSLISTENER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h new file mode 100644 index 00000000000..b2018f2ec82 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h @@ -0,0 +1,50 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_PRESENTATIONQOSPOLICY_H +#define DDS4CCM_PRESENTATIONQOSPOLICY_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::PresentationQosPolicy DDS_PresentationQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::PresentationQosPolicy &ddsqos, const ::DDS_PresentationQosPolicy & qos) +{ + 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<<= (::DDS_PresentationQosPolicy &ddsqos, const ::DDS::PresentationQosPolicy & qos) +{ + 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; +} + +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/ndds/PublicationBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h new file mode 100644 index 00000000000..3ecbb2b2699 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h @@ -0,0 +1,127 @@ +/** + * @author Marcel Smit + * + * $Id$ + * + */ + +#ifndef PUBLICATIONBUILTINTOPICDATA_H_ +#define PUBLICATIONBUILTINTOPICDATA_H_ + +#include "BuiltinTopicKey_t.h" +#include "DurabilityQosPolicy.h" +#include "DurabilityServiceQosPolicy.h" +#include "DeadlineQosPolicy.h" +#include "LatencyBudgetQosPolicy.h" +#include "LivelinessQosPolicy.h" +#include "ReliabilityQosPolicy.h" +#include "LifespanQosPolicy.h" +#include "UserDataQosPolicy.h" +#include "OwnershipQosPolicy.h" +#include "OwnershipStrengthQosPolicy.h" +#include "DestinationOrderQosPolicy.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::PublicationBuiltinTopicData &ddstopicdata, const ::DDS_PublicationBuiltinTopicData & 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.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<<= (::DDS_PublicationBuiltinTopicData & ddstopicdata, const ::DDS::PublicationBuiltinTopicData & 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.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 = 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/ndds/PublicationMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h new file mode 100644 index 00000000000..819a2d447aa --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h @@ -0,0 +1,61 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_PUBLICATIONMATCHEDSTATUS_H +#define DDS4CCM_PUBLICATIONMATCHEDSTATUS_H + +#include "InstanceHandle_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::PublicationMatchedStatus DDS_PublicationMatchedStatus; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::PublicationMatchedStatus &ddsstatus, const ::DDS_PublicationMatchedStatus & status) +{ + 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<<= (::DDS_PublicationMatchedStatus &ddsstatus, const ::DDS::PublicationMatchedStatus & status) +{ + 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; +} + +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/ndds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp new file mode 100644 index 00000000000..5e3efc9217b --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp @@ -0,0 +1,449 @@ +// $Id$ + +#include "Publisher.h" +#include "PublisherListener.h" +#include "Topic.h" +#include "DataWriter.h" +#include "StatusCondition.h" +#include "Utils.h" +#include "Duration_t.h" +#include "InstanceHandle_t.h" +#include "DataWriterListener.h" +#include "DataWriterQos.h" +#include "PublisherQos.h" +#include "TopicQos.h" + +#include "dds4ccm/idl/dds4ccm_BaseC.h" + +#include "dds4ccm/impl/logger/Log_Macros.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_Publisher_i::CCM_DDS_Publisher_i (DDSPublisher * dw) + : impl_ (dw) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::CCM_DDS_Publisher_i"); + } + + CCM_DDS_Publisher_i::~CCM_DDS_Publisher_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::~CCM_DDS_Publisher_i"); + } + + ::DDS::DataWriter_ptr + CCM_DDS_Publisher_i::create_datawriter (::DDS::Topic_ptr a_topic, + const ::DDS::DataWriterQos & qos, + ::DDS::DataWriterListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::create_datawriter"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ACE_UNUSED_ARG (qos); + + CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); + + if (!topic) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter - " + "Error: Unable to cast provided topic to its servant.\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + } + + DDSDataWriterListener *rti_drl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_drl, + CCM_DDS_DataWriterListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + DDS_DataWriterQos rti_qos = DDS_DATAWRITER_QOS_DEFAULT; + DDSDataWriter *rti_dw = this->impl ()->create_datawriter ( + topic->get_impl (), + rti_qos, + rti_drl, + mask); + + if (!rti_dw) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter - " + "Error: RTI Topic returned a nil datawriter.\n")); + 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 (rti_dw), + CORBA::NO_MEMORY ()); + + rti_dw->enable (); + CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ()); + dw->set_impl (rti_dw); + + return retval._retn (); +#else + return this->impl ()->create_datawriter ( + a_topic, + qos, + a_listener, + mask); +#endif + } + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::DataWriter_ptr + CCM_DDS_Publisher_i::create_datawriter_with_profile (::DDS::Topic_ptr a_topic, + const char* library_name, + const char *profile_name, + ::DDS::DataWriterListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::create_datawriter"); + + CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); + + if (!topic) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter_with_profile - " + "Error: Unable to cast provided topic to its servant.\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + } + + DDSDataWriterListener *rti_drl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_drl, + CCM_DDS_DataWriterListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + DDSDataWriter *rti_dw = this->impl ()->create_datawriter_with_profile ( + topic->get_impl (), + library_name, + profile_name, + rti_drl, + mask); + + 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 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 (rti_dw), + CORBA::NO_MEMORY ()); + + rti_dw->enable (); + CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ()); + dw->set_impl (rti_dw); + + return retval._retn (); + } +#endif + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::delete_datawriter (::DDS::DataWriter_ptr a_datawriter) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::delete_datawriter"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + CCM_DDS_DataWriter_i *top = dynamic_cast< CCM_DDS_DataWriter_i *> (a_datawriter); + + if (top == 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - " + "Unable to cast provided object reference to servant.\n")); + return ::DDS::RETCODE_BAD_PARAMETER; + } + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - " + "Successfully casted provided object reference to servant.\n")); + + DDS_ReturnCode_t const retval = this->impl ()->delete_datawriter (top->get_impl ()); + + if (retval != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - " + "Error: RTI delete_datawriter returned non-ok error code %C\n", + translate_retcode (retval))); + } + else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - " + "Provided datawriter successfully deleted\n")); + + return retval; +#else + return this->impl ()->delete_datawriter (a_datawriter); +#endif + } + + ::DDS::DataWriter_ptr + CCM_DDS_Publisher_i::lookup_datawriter (const char * impl_name) + { + ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDataWriter* dw = this->impl ()->lookup_datawriter (impl_name); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DataWriter_i (dw), + CORBA::NO_MEMORY ()); +#else + ::DDS::DataWriter_var dw = this->impl ()->lookup_datawriter (impl_name); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DataWriter_i (dw.in ()), + CORBA::NO_MEMORY ()); +#endif + return retval._retn (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::delete_contained_entities (void) + { + return this->impl ()->delete_contained_entities (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::set_qos (const ::DDS::PublisherQos & qos) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::set_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_PublisherQos rti_qos; + rti_qos <<= qos; + return this->impl()->set_qos (rti_qos); +#else + return this->impl ()->set_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::get_qos (::DDS::PublisherQos & qos) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_PublisherQos rti_qos; + rti_qos <<= qos; + ::DDS::ReturnCode_t retcode = this->impl()-> + get_qos (rti_qos); + qos <<= rti_qos; + return retcode; +#else + return this->impl ()->get_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::set_listener (::DDS::PublisherListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::set_listener"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + CCM_DDS_PublisherListener_i *rti_impl_list = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_impl_list, + CCM_DDS_PublisherListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + return this->impl ()->set_listener (rti_impl_list, mask); +#else + return this->impl ()->set_listener (a_listener, mask); +#endif + } + + ::DDS::PublisherListener_ptr + CCM_DDS_Publisher_i::get_listener (void) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_listener"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSPublisherListener *rti_pub_list = this->impl ()->get_listener (); + CCM_DDS_PublisherListener_i *list_proxy = dynamic_cast (rti_pub_list); + if (!list_proxy) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Publisher_i::get_listener - " + "DDS returned a NIL listener.\n")); + return ::DDS::PublisherListener::_nil (); + } + return list_proxy->get_publisher_listener (); +#else + return this->impl ()->get_listener (); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::suspend_publications (void) + { + return this->impl ()->suspend_publications (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::resume_publications (void) + { + return this->impl ()->resume_publications (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::begin_coherent_changes (void) + { + return this->impl ()->begin_coherent_changes (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::end_coherent_changes (void) + { + return this->impl ()->end_coherent_changes (); + } + + ::DDS::ReturnCode_t + 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 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 + } + + ::DDS::DomainParticipant_ptr + CCM_DDS_Publisher_i::get_participant (void) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_participant"); + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDomainParticipant* p = this->impl ()->get_participant (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p), + CORBA::NO_MEMORY ()); +#else + ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p.in ()), + CORBA::NO_MEMORY ()); +#endif + return retval._retn (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::set_default_datawriter_qos (const ::DDS::DataWriterQos & qos) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::set_default_datawriter_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::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 + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::get_default_datawriter_qos (::DDS::DataWriterQos & qos) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_default_datawriter_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_DataWriterQos rti_qos; + ::DDS::ReturnCode_t retcode = + this->impl()->get_default_datawriter_qos (rti_qos); + qos <<= rti_qos; + return retcode; +#else + return this->impl()->get_default_datawriter_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::copy_from_topic_qos (::DDS::DataWriterQos & a_dataimpl_qos, + const ::DDS::TopicQos & a_impl_qos) + { + DDS4CCM_TRACE ("CCM_DDS_Publisher_i::copy_from_topic_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_DataWriterQos rti_qos; + ::DDS_TopicQos rti_topic_qos; + + rti_qos <<= a_dataimpl_qos; + rti_topic_qos <<= a_impl_qos; + ::DDS::ReturnCode_t retcode = + 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, + a_impl_qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_Publisher_i::enable (void) + { + return this->impl ()->enable (); + } + + ::DDS::StatusCondition_ptr + CCM_DDS_Publisher_i::get_statuscondition (void) + { + ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSStatusCondition* sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc), + CORBA::NO_MEMORY ()); +#else + ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc.in ()), + CORBA::NO_MEMORY ()); +#endif + return retval._retn (); + } + + ::DDS::StatusMask + CCM_DDS_Publisher_i::get_status_changes (void) + { + return this->impl ()->get_status_changes (); + } + + ::DDS::InstanceHandle_t + CCM_DDS_Publisher_i::get_instance_handle (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS::InstanceHandle_t handle; + handle <<= rtihandle; + return handle; +#else + return this->impl ()->get_instance_handle (); +#endif + } + + DDSPublisher * + CCM_DDS_Publisher_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_Publisher_i::set_impl (DDSPublisher * dw) + { + this->impl_ = dw; + } + + DDSPublisher * + CCM_DDS_Publisher_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; + } + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h new file mode 100644 index 00000000000..f090330c618 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h @@ -0,0 +1,132 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_PUBLISHER_H +#define DDS4CCM_PUBLISHER_H + +#include "tao/LocalObject.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +# include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::Publisher DDSPublisher; +#endif + +#include "tao/LocalObject.h" + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_Publisher_i : + public virtual ::DDS::CCM_Publisher, + public virtual ::CORBA::LocalObject + { + public: + /// Constructor + CCM_DDS_Publisher_i (DDSPublisher * dw); + + /// Destructor + virtual ~CCM_DDS_Publisher_i (void); + + virtual + ::DDS::DataWriter_ptr create_datawriter (::DDS::Topic_ptr a_topic, + const ::DDS::DataWriterQos & qos, + ::DDS::DataWriterListener_ptr a_listener, + ::DDS::StatusMask mask); + + virtual + ::DDS::DataWriter_ptr create_datawriter_with_profile (::DDS::Topic_ptr a_topic, + const char* library_name, + const char *profile_name, + ::DDS::DataWriterListener_ptr a_listener, + ::DDS::StatusMask mask); + + virtual + ::DDS::ReturnCode_t delete_datawriter (::DDS::DataWriter_ptr a_datawriter); + + virtual + ::DDS::DataWriter_ptr lookup_datawriter (const char * impl_name); + + virtual + ::DDS::ReturnCode_t delete_contained_entities (void); + + virtual + ::DDS::ReturnCode_t set_qos (const ::DDS::PublisherQos & qos); + + virtual + ::DDS::ReturnCode_t get_qos (::DDS::PublisherQos & qos); + + virtual + ::DDS::ReturnCode_t set_listener (::DDS::PublisherListener_ptr a_listener, + ::DDS::StatusMask mask); + + virtual + ::DDS::PublisherListener_ptr get_listener (void); + + virtual + ::DDS::ReturnCode_t suspend_publications (void); + + virtual + ::DDS::ReturnCode_t resume_publications (void); + + virtual + ::DDS::ReturnCode_t begin_coherent_changes (void); + + virtual + ::DDS::ReturnCode_t end_coherent_changes (void); + + virtual + ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait); + + virtual + ::DDS::DomainParticipant_ptr get_participant (void); + + virtual + ::DDS::ReturnCode_t set_default_datawriter_qos (const ::DDS::DataWriterQos & qos); + + virtual + ::DDS::ReturnCode_t get_default_datawriter_qos (::DDS::DataWriterQos & qos); + + virtual + ::DDS::ReturnCode_t copy_from_topic_qos (::DDS::DataWriterQos & a_dataimpl_qos, + const ::DDS::TopicQos & a_impl_qos); + + virtual + ::DDS::ReturnCode_t enable (void); + + virtual + ::DDS::StatusCondition_ptr get_statuscondition (void); + + virtual + ::DDS::StatusMask get_status_changes (void); + + virtual + ::DDS::InstanceHandle_t get_instance_handle (void); + + DDSPublisher * get_impl (void); + + void set_impl (DDSPublisher *p); + + private: + DDSPublisher *impl_; + + DDSPublisher *impl (void); + }; + } +} + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp new file mode 100644 index 00000000000..8cd479f7d89 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp @@ -0,0 +1,112 @@ +// $Id$ + +#include "PublisherListener.h" +#include "Publisher.h" +#include "DataWriter.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" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_PublisherListener_i::CCM_DDS_PublisherListener_i ( ::DDS::PublisherListener_ptr p) + : impl_ (::DDS::PublisherListener::_duplicate (p)) + { + DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::CCM_DDS_PublisherListener_i"); + } + + CCM_DDS_PublisherListener_i::~CCM_DDS_PublisherListener_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::~CCM_DDS_PublisherListener_i"); + } + + void + CCM_DDS_PublisherListener_i::on_offered_deadline_missed ( + ::DDSDataWriter* writer, + const ::DDS_OfferedDeadlineMissedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_offered_deadline_missed"); + + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); + ACE_NEW (dds_writer, + CCM_DDS_DataWriter_i (writer)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::OfferedDeadlineMissedStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus); +#else + this->impl_->on_offered_deadline_missed (dds_writer.in (), status); +#endif + } + + void + CCM_DDS_PublisherListener_i::on_offered_incompatible_qos ( + ::DDSDataWriter* writer, + const ::DDS_OfferedIncompatibleQosStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_offered_incompatible_qos"); + + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); + ACE_NEW (dds_writer, + CCM_DDS_DataWriter_i (writer)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::OfferedIncompatibleQosStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus); +#else + this->impl_->on_offered_incompatible_qos (dds_writer.in (), status); +#endif + } + + void + CCM_DDS_PublisherListener_i::on_liveliness_lost ( + ::DDSDataWriter* writer, + const ::DDS_LivelinessLostStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_liveliness_lost"); + + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); + ACE_NEW (dds_writer, + CCM_DDS_DataWriter_i (writer)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::LivelinessLostStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus); +#else + this->impl_->on_liveliness_lost (dds_writer.in (), status); +#endif + } + + void + CCM_DDS_PublisherListener_i::on_publication_matched ( + ::DDSDataWriter* writer, + const ::DDS_PublicationMatchedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_publication_matched"); + + ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil (); + ACE_NEW (dds_writer, + CCM_DDS_DataWriter_i (writer)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::PublicationMatchedStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_publication_matched (dds_writer.in (), ddsstatus); +#else + this->impl_->on_publication_matched (dds_writer.in (), status); +#endif + } + + ::DDS::PublisherListener_ptr + CCM_DDS_PublisherListener_i::get_publisher_listener (void) + { + return ::DDS::PublisherListener::_duplicate (this->impl_.in ()); + } + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h new file mode 100644 index 00000000000..4feaaeb4e31 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h @@ -0,0 +1,76 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_PUBLISHERLISTENER_H +#define DDS4CCM_PUBLISHERLISTENER_H + +#include "tao/LocalObject.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +# include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::PublisherListener DDSPublisherListener; +typedef ::DDS::DataWriter DDSDataWriter; +typedef ::DDS::OfferedDeadlineMissedStatus DDS_OfferedDeadlineMissedStatus; +typedef ::DDS::OfferedIncompatibleQosStatus DDS_OfferedIncompatibleQosStatus; +typedef ::DDS::LivelinessLostStatus DDS_LivelinessLostStatus; +typedef ::DDS::PublicationMatchedStatus DDS_PublicationMatchedStatus; +#endif + +#include "tao/LocalObject.h" + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_PublisherListener_i : + public virtual ::DDSPublisherListener + { + public: + /// Constructor + CCM_DDS_PublisherListener_i (::DDS::PublisherListener_ptr p); + + /// Destructor + virtual ~CCM_DDS_PublisherListener_i (void); + + virtual void + on_offered_deadline_missed ( + ::DDSDataWriter *writer, + const ::DDS_OfferedDeadlineMissedStatus & status); + + virtual void + on_offered_incompatible_qos ( + ::DDSDataWriter *writer, + const ::DDS_OfferedIncompatibleQosStatus & status); + + virtual void + on_liveliness_lost ( + ::DDSDataWriter* writer, + const ::DDS_LivelinessLostStatus & status); + + virtual void + on_publication_matched ( + ::DDSDataWriter *writer, + const ::DDS_PublicationMatchedStatus & status); + + ::DDS::PublisherListener_ptr get_publisher_listener (void); + private: + ::DDS::PublisherListener_var impl_; + }; + } +} + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp new file mode 100644 index 00000000000..f1789309e7c --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp @@ -0,0 +1,260 @@ +// $Id$ +#include "dds4ccm/impl/ndds/Utils.h" + +#include "dds4ccm/impl/ndds/DataReader.h" +#include "dds4ccm/impl/logger/Log_Macros.h" +#include "dds4ccm/impl/ndds/DataReaderHandler_T.h" +#include "dds4ccm/impl/ndds/DDSCallbackStatusHandler.h" +#include "tao/ORB_Core.h" + +template +CIAO::DDS4CCM::PublisherListener_T::PublisherListener_T ( + ::CCM_DDS::ConnectorStatusListener_ptr error_listener, + ACE_Reactor* reactor) + : error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)), + reactor_ (reactor) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::PublisherListener_T"); +} + +template +CIAO::DDS4CCM::PublisherListener_T::~PublisherListener_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::~PublisherListener_T"); +} + +template +void +CIAO::DDS4CCM::PublisherListener_T::on_unexpected_status ( + ::DDS::Entity_ptr entity, + ::DDS::StatusKind status_kind) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_unexpected_status"); + + if (!CORBA::is_nil (this->error_listener_)) + { + try + { + if (this->reactor_) + { + ::CIAO::DDS4CCM::OnUnexpectedStatusHandler* rh = 0; + ACE_NEW (rh, + ::CIAO::DDS4CCM::OnUnexpectedStatusHandler ( + this->error_listener_, entity, status_kind)); + ACE_Event_Handler_var safe_handler (rh); + if (this->reactor_->notify (rh) != 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("PublisherListener_T::failed to use reactor.\n"))); + } + } + else + { + this->error_listener_->on_unexpected_status (entity, status_kind); + } + } + catch (...) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, + ACE_TEXT ("PublisherListener_T::on_unexpected_status: ") + ACE_TEXT ("DDS Exception caught\n"))); + } + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO + ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ") + ACE_TEXT ("No error listener connected\n"))); + } +} + +template +void +CIAO::DDS4CCM::PublisherListener_T::on_offered_deadline_missed ( + ::DDS::DataWriter_ptr the_Writer, + const ::DDS::OfferedDeadlineMissedStatus & status) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_offered_deadline_missed"); + + DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO + ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ") + ACE_TEXT ("total count <%d> - count change <%d> - ") + ACE_TEXT ("last instance handle - isValid <%d>\n"), + status.total_count, status.total_count_change, + status.last_instance_handle.length, + status.last_instance_handle.isValid)); + + if (!CORBA::is_nil (this->error_listener_)) + { + try + { + if (this->reactor_) + { + ::CIAO::DDS4CCM::OnOfferedDeadlineMissedHandler* rh = 0; + ACE_NEW (rh, + ::CIAO::DDS4CCM::OnOfferedDeadlineMissedHandler ( + this->error_listener_, the_Writer, status)); + ACE_Event_Handler_var safe_handler (rh); + if (this->reactor_->notify (rh) != 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("PublisherListener_T::failed to use reactor.\n"))); + } + } + else + { + this->error_listener_->on_offered_deadline_missed (the_Writer, status); + } + } + catch (...) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ") + ACE_TEXT ("DDS Exception caught\n"))); + } + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO + ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ") + ACE_TEXT ("No error listener connected\n"))); + } +} + +template +void +CIAO::DDS4CCM::PublisherListener_T::on_offered_incompatible_qos ( + ::DDS::DataWriter_ptr the_Writer, + const ::DDS::OfferedIncompatibleQosStatus & status) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_offered_incompatible_qos"); + + DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO + ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos: ") + ACE_TEXT ("total count <%d> - total change <%d> - ") + ACE_TEXT ("last policy id <%d> - policies "), + status.total_count, status.total_count_change, + status.last_policy_id)); + for (CORBA::ULong i = 0; i < status.policies.length (); ++i) + { + DDS4CCM_DEBUG (10, (LM_DEBUG, + ACE_TEXT ("\t\tid <%d> - count <%d>\n"), + status.policies[i].policy_id, + status.policies[i].count)); + } + + if (!CORBA::is_nil (this->error_listener_)) + { + try + { + if (this->reactor_) + { + ::CIAO::DDS4CCM::OnOfferedIncompatibleQoSHandler* rh = 0; + ACE_NEW (rh, + ::CIAO::DDS4CCM::OnOfferedIncompatibleQoSHandler ( + this->error_listener_, the_Writer, status)); + ACE_Event_Handler_var safe_handler (rh); + if (this->reactor_->notify (rh) != 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("PublisherListener_T::failed to use reactor.\n"))); + } + } + else + { + this->error_listener_->on_offered_incompatible_qos (the_Writer, status); + } + } + catch (...) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos: ") + ACE_TEXT ("DDS Exception caught\n"))); + } + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO + ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos: ") + ACE_TEXT ("No error listener connected\n"))); + } +} + +template +void +CIAO::DDS4CCM::PublisherListener_T::on_liveliness_lost ( + ::DDS::DataWriter_ptr the_Writer, + const ::DDS::LivelinessLostStatus & status) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_liveliness_lost"); + + DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO + ACE_TEXT ("PublisherListener_T::on_liveliness_lost: ") + ACE_TEXT ("total count <%d> - count change <%d>\n"), + status.total_count, status.total_count_change)); + + this->on_unexpected_status (the_Writer, ::DDS::LIVELINESS_LOST_STATUS); +} + +template +void +CIAO::DDS4CCM::PublisherListener_T::on_publication_matched ( + ::DDS::DataWriter_ptr the_Writer, + const ::DDS::PublicationMatchedStatus & status) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_publication_matched"); + + DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO + ACE_TEXT ("PublisherListener_T::on_publication_matched: ") + ACE_TEXT ("total count <%d> - count change <%d> - ") + ACE_TEXT ("current count <%d> - current count change <%d> ") + ACE_TEXT ("last publication handle - isValid <%d>\n"), + status.total_count, status.total_count_change, + status.current_count, status.current_count_change, + status.last_subscription_handle.length, + status.last_subscription_handle.isValid)); + + this->on_unexpected_status (the_Writer, ::DDS::PUBLICATION_MATCHED_STATUS); +} + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +template +void +CIAO::DDS4CCM::PublisherListener_T::on_reliable_reader_activity_changed ( + ::DDS::DataWriter_ptr the_Writer, + const ::DDS::ReliableReaderActivityChangedStatus & status) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_reliable_reader_activity_changed"); + + DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO + ACE_TEXT ("PublisherListener_T::on_reliable_reader_activity_changed: ") + ACE_TEXT ("active count <%d> - active change <%d> - ") + ACE_TEXT ("not active count <%d> - inactive count change <%d>") + ACE_TEXT ("last instance handle - isValid <%d>\n"), + status.active_count, status.active_count_change, + status.not_active_count, status.inactive_count_change, + status.last_instance_handle.length, + status.last_instance_handle.isValid)); + + this->on_unexpected_status (the_Writer, ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS); +} +#endif + +template +::DDS::StatusMask +CIAO::DDS4CCM::PublisherListener_T::get_mask ( + ::CCM_DDS::ConnectorStatusListener_ptr error_listener) +{ + if (!CORBA::is_nil (error_listener) || CIAO_debug_level >= 10) + { + return DDS_STATUS_MASK_ALL; +/* + ::DDS::OFFERED_DEADLINE_MISSED_STATUS | + ::DDS::OFFERED_INCOMPATIBLE_QOS_STATUS | +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS | +#endif + ::DDS::LIVELINESS_LOST_STATUS | + ::DDS::PUBLICATION_MATCHED_STATUS;*/ + } + else + { + return 0; + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h new file mode 100644 index 00000000000..0543b5a4de0 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h @@ -0,0 +1,78 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS_PUBLISHERLISTENER_T_H_ +#define DDS_PUBLISHERLISTENER_T_H_ + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Copy_Disabled.h" + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL +class ACE_Reactor; +ACE_END_VERSIONED_NAMESPACE_DECL + +namespace CIAO +{ + namespace DDS4CCM + { + template + class PublisherListener_T : + public ::DDS::PublisherListener, + private ACE_Copy_Disabled + { + public: + /// Constructor + PublisherListener_T ( + ::CCM_DDS::ConnectorStatusListener_ptr error_listener, + ACE_Reactor* reactor); + + virtual void on_offered_deadline_missed ( + ::DDS::DataWriter_ptr the_Writer, + const ::DDS::OfferedDeadlineMissedStatus & status); + + virtual void on_liveliness_lost ( + ::DDS::DataWriter_ptr the_Writer, + const ::DDS::LivelinessLostStatus & status); + + virtual void on_offered_incompatible_qos ( + ::DDS::DataWriter_ptr the_Writer, + const ::DDS::OfferedIncompatibleQosStatus & status); + + virtual void on_publication_matched ( + ::DDS::DataWriter_ptr the_Writer, + const ::DDS::PublicationMatchedStatus & status); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + virtual void on_reliable_reader_activity_changed ( + ::DDS::DataWriter_ptr the_Writer, + const ::DDS::ReliableReaderActivityChangedStatus & status); +#endif + + /// Destructor + virtual ~PublisherListener_T (void); + + static ::DDS::StatusMask get_mask ( + ::CCM_DDS::ConnectorStatusListener_ptr error_listener); + + private: + virtual void on_unexpected_status ( + ::DDS::Entity_ptr entity, + ::DDS::StatusKind status_kind); + + ::CCM_DDS::ConnectorStatusListener_var error_listener_; + + ACE_Reactor* reactor_; + }; + } +} + +#include "dds4ccm/impl/ndds/PublisherListener_T.cpp" + +#endif /* DDS_PUBLISHERLISTENER_T_H_ */ + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h new file mode 100644 index 00000000000..f948216ebe7 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h @@ -0,0 +1,59 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_PUBLISHERQOS_H +#define DDS4CCM_PUBLISHERQOS_H + +#include "PresentationQosPolicy.h" +#include "PartitionQosPolicy.h" +#include "GroupDataQosPolicy.h" +#include "EntityFactoryQosPolicy.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::PublisherQos DDS_PublisherQos; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::PublisherQos &ddsqos, const ::DDS_PublisherQos & qos) +{ + ddsqos.presentation <<= qos.presentation; + ddsqos.partition <<= qos.partition; + ddsqos.group_data <<= qos.group_data; + ddsqos.entity_factory <<= qos.entity_factory; +} + +inline void +operator<<= (::DDS_PublisherQos &ddsqos, const ::DDS::PublisherQos & qos) +{ + 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; +} + +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/ndds/QosPolicyCountSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h new file mode 100644 index 00000000000..01b6abd175c --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h @@ -0,0 +1,63 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_QOSPOLICYCOUNTSEQ_H +#define DDS4CCM_QOSPOLICYCOUNTSEQ_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::QosPolicyCountSeq DDS_QosPolicyCountSeq; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::QosPolicyCountSeq & ddspolicycount, const ::DDS_QosPolicyCountSeq & policycount) +{ + 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<<= (::DDS_QosPolicyCountSeq & ddspolicycount, const ::DDS::QosPolicyCountSeq & policycount) +{ + ddspolicycount.length (policycount.length ()); + for (::CORBA::ULong i = 0 ; i < policycount.length (); ++i) + { + ddspolicycount[i].policy_id = static_cast (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 (::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 (policycount[i].policy_id); + ddspolicycount[i].count = policycount[i].count; + } +} +#endif + +#endif /* DDS4CCM_QOSPOLICYCOUNTSEQ_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp new file mode 100644 index 00000000000..2d9b6b8ee97 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp @@ -0,0 +1,133 @@ +// $Id$ + +#include "QueryCondition.h" +#include "Subscriber.h" +#include "DataReader.h" +#include "StringSeq.h" + +#include "dds4ccm/idl/dds4ccm_BaseC.h" + +#include "dds4ccm/impl/logger/Log_Macros.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_QueryCondition_i::CCM_DDS_QueryCondition_i (DDSQueryCondition * qc) + : impl_ (qc) + { + } + + CCM_DDS_QueryCondition_i::~CCM_DDS_QueryCondition_i (void) + { + } + + ::CORBA::Boolean + CCM_DDS_QueryCondition_i::get_trigger_value (void) + { + return this->impl ()->get_trigger_value (); + } + + ::DDS::SampleStateMask + CCM_DDS_QueryCondition_i::get_sample_state_mask (void) + { + return this->impl ()->get_sample_state_mask (); + } + + ::DDS::ViewStateMask + CCM_DDS_QueryCondition_i::get_view_state_mask (void) + { + return this->impl ()->get_view_state_mask (); + } + + ::DDS::InstanceStateMask + CCM_DDS_QueryCondition_i::get_instance_state_mask (void) + { + return this->impl ()->get_instance_state_mask (); + } + + ::DDS::DataReader_ptr + CCM_DDS_QueryCondition_i::get_datareader (void) + { + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDSDataReader* reader = this->impl ()->get_datareader (); + if (reader) + { + ACE_NEW_THROW_EX (dds_reader, + CCM_DDS_DataReader_i (reader), + CORBA::NO_MEMORY ()); + } +#else + ::DDS::DataReader_var reader = this->impl ()->get_datareader (); + if (!CORBA::is_nil (reader.in ())) + { + ACE_NEW_THROW_EX (dds_reader, + CCM_DDS_DataReader_i (reader.in ()), + CORBA::NO_MEMORY ()); + } +#endif + return dds_reader._retn (); + } + + char * + CCM_DDS_QueryCondition_i::get_query_expression (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + return ::CORBA::string_dup (this->impl ()->get_query_expression ()); +#else + return this->impl ()->get_query_expression (); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_QueryCondition_i::get_query_parameters ( + ::DDS::StringSeq & query_parameters) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDS_StringSeq parameters; + ::DDS::ReturnCode_t const retval = this->impl ()->get_query_parameters (parameters); + query_parameters <<= parameters; + return retval; +#else + return this->impl ()->get_query_parameters (query_parameters); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_QueryCondition_i::set_query_parameters ( + const ::DDS::StringSeq & query_parameters) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDS_StringSeq parameters; + parameters <<= query_parameters; + return this->impl ()->set_query_parameters (parameters); +#else + return this->impl ()->set_query_parameters (query_parameters); +#endif + } + + DDSQueryCondition * + CCM_DDS_QueryCondition_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_QueryCondition_i::set_impl (DDSQueryCondition * dw) + { + this->impl_ = dw; + } + + DDSQueryCondition * + CCM_DDS_QueryCondition_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; + } + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h new file mode 100644 index 00000000000..e0a5abee529 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h @@ -0,0 +1,75 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_QUERYCONDITION_H +#define DDS4CCM_QUERYCONDITION_H + +#include "tao/LocalObject.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +#include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::QueryCondition DDSQueryCondition; +#endif + +#include "tao/LocalObject.h" + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_QueryCondition_i : + public virtual ::DDS::CCM_QueryCondition, + public virtual ::CORBA::LocalObject + { + public: + /// Constructor + CCM_DDS_QueryCondition_i (DDSQueryCondition * qc); + + /// Destructor + virtual ~CCM_DDS_QueryCondition_i (void); + + virtual ::CORBA::Boolean get_trigger_value (void); + + virtual ::DDS::SampleStateMask get_sample_state_mask (void); + + virtual ::DDS::ViewStateMask get_view_state_mask (void); + + virtual ::DDS::InstanceStateMask get_instance_state_mask (void); + + virtual ::DDS::DataReader_ptr get_datareader (void); + + virtual char *get_query_expression (void); + + virtual ::DDS::ReturnCode_t + get_query_parameters (::DDS::StringSeq & query_parameters); + + virtual ::DDS::ReturnCode_t + set_query_parameters (const ::DDS::StringSeq & query_parameters); + + DDSQueryCondition * get_impl (void); + + void set_impl (DDSQueryCondition * qc); + + private: + DDSQueryCondition * impl_; + + DDSQueryCondition * impl (); + }; + } +} + +#endif /* DDS4CCM_QUERYCONDITION_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp new file mode 100644 index 00000000000..e8459b51e0a --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp @@ -0,0 +1,80 @@ +// $Id$ + +#include "ReadCondition.h" +#include "DataReader.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_ReadCondition_i::CCM_DDS_ReadCondition_i (DDSReadCondition * rc) + : impl_ (rc) + { + } + + CCM_DDS_ReadCondition_i::~CCM_DDS_ReadCondition_i (void) + { + } + + ::CORBA::Boolean + CCM_DDS_ReadCondition_i::get_trigger_value (void) + { + return this->impl ()->get_trigger_value (); + } + + ::DDS::SampleStateMask + CCM_DDS_ReadCondition_i::get_sample_state_mask (void) + { + return this->impl ()->get_sample_state_mask (); + } + + ::DDS::ViewStateMask + CCM_DDS_ReadCondition_i::get_view_state_mask (void) + { + return this->impl ()->get_view_state_mask (); + } + + ::DDS::InstanceStateMask + CCM_DDS_ReadCondition_i::get_instance_state_mask (void) + { + return this->impl ()->get_instance_state_mask (); + } + + ::DDS::DataReader_ptr + CCM_DDS_ReadCondition_i::get_datareader (void) + { + ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); + ::DDSDataReader* rd = this->impl ()->get_datareader (); + if (rd) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_DataReader_i (rd), + CORBA::NO_MEMORY ()); + } + return retval._retn (); + } + + DDSReadCondition * + CCM_DDS_ReadCondition_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_ReadCondition_i::set_impl (DDSReadCondition * rc) + { + this->impl_ = rc; + } + + DDSReadCondition * + CCM_DDS_ReadCondition_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; + } + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h new file mode 100644 index 00000000000..10ee871c817 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h @@ -0,0 +1,72 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_READCONDITION_H +#define DDS4CCM_READCONDITION_H + +#include "tao/LocalObject.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +#include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::ReadCondition DDSReadCondition; +#endif + +#include "tao/LocalObject.h" + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_ReadCondition_i : + public virtual ::DDS::CCM_ReadCondition, + public virtual ::CORBA::LocalObject + { + public: + /// Constructor + CCM_DDS_ReadCondition_i (DDSReadCondition * rc); + + /// Destructor + virtual ~CCM_DDS_ReadCondition_i (void); + + virtual ::CORBA::Boolean + get_trigger_value (void); + + virtual ::DDS::SampleStateMask + get_sample_state_mask (void); + + virtual ::DDS::ViewStateMask + get_view_state_mask (void); + + virtual ::DDS::InstanceStateMask + get_instance_state_mask (void); + + virtual ::DDS::DataReader_ptr + get_datareader (void); + + DDSReadCondition * get_impl (void); + + void set_impl (DDSReadCondition * rc); + + private: + DDSReadCondition *impl_; + + DDSReadCondition * impl (void); + }; + } +} + +#endif /* DDS4CCM_READCONDITION_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h new file mode 100644 index 00000000000..b383e26b23c --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h @@ -0,0 +1,46 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H +#define DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::ReaderDataLifecycleQosPolicy DDS_ReaderDataLifecycleQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::ReaderDataLifecycleQosPolicy &ddsqos, const ::DDS_ReaderDataLifecycleQosPolicy & qos) +{ + ddsqos.autopurge_nowriter_samples_delay <<= qos.autopurge_nowriter_samples_delay; + ddsqos.autopurge_disposed_samples_delay <<= qos.autopurge_disposed_samples_delay; +} + +inline void +operator<<= (::DDS_ReaderDataLifecycleQosPolicy &ddsqos, const ::DDS::ReaderDataLifecycleQosPolicy & qos) +{ + 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; +} + +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/ndds/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp new file mode 100644 index 00000000000..5a58128b760 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp @@ -0,0 +1,536 @@ +// $Id$ + +#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 +CIAO::DDS4CCM::RTI::Reader_T::Reader_T (void) + : topic_ (0), + library_name_ (""), + profile_name_ (""), + impl_ (0) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::Reader_T"); + #if defined DDS4CCM_USES_QUERY_CONDITION + this->qc_ = DDS::QueryCondition::_nil (); + #else + this->cft_ = ::DDS::ContentFilteredTopic::_nil (); + #endif +} + +template +CIAO::DDS4CCM::RTI::Reader_T::~Reader_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::~Reader_T"); +} + +template +typename DDS_TYPE::data_reader * +CIAO::DDS4CCM::RTI::Reader_T::impl (void) +{ + if (this->impl_) + { + return this->impl_; + } + else + { + throw ::CORBA::BAD_INV_ORDER (); + } +} + +// For the requirement : 'samples ordered by instances' the following settings are necessary: +// ordered_access -> true and DDS_INSTANCE_PRESENTATION_QOS (default) . +template +CORBA::ULong +CIAO::DDS4CCM::RTI::Reader_T::get_nr_valid_samples ( + const DDS_SampleInfoSeq& sample_info, + bool determine_last) +{ + CORBA::ULong nr_of_samples = 0; + for (::DDS_Long i = 0 ; i < sample_info.length(); ++i) + { + if (determine_last) + { + if (sample_info[i].sample_rank == 0 && sample_info[i].valid_data) + { + ++nr_of_samples; + } + } + else if (sample_info[i].valid_data) + { + ++nr_of_samples; + } + } + return nr_of_samples; +} + +template +void +CIAO::DDS4CCM::RTI::Reader_T::read_without_instance ( + typename DDS_TYPE::dds_seq_type & data, + DDS_SampleInfoSeq & sample_info) +{ + 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); + + 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::RTI::Reader_T::read_without_instance - ") + ACE_TEXT ("retval is %C\n"), translate_retcode(retval))); + throw ::CCM_DDS::InternalError (retval, 0); + } +} + + +template +void +CIAO::DDS4CCM::RTI::Reader_T::read_last ( + typename CCM_TYPE::seq_type::_out_type instances, + ::CCM_DDS::ReadInfoSeq_out infos) +{ + // This function has to return the last sample of all instances + DDS_SampleInfoSeq sample_info; + typename DDS_TYPE::dds_seq_type data; + + this->read_without_instance (data, sample_info); + + 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::RTI::Reader_T::read_last - ") + ACE_TEXT ("total number of samples <%u> - ") + ACE_TEXT ("last number of samples <%u>\n"), + data.length(), + nr_of_last_samples)); + CORBA::ULong ix = 0; + + infoseq->length (nr_of_last_samples); + inst_seq->length (nr_of_last_samples); + + // We need only the last sample of each instance + for (::DDS_Long i = 0 ; i < sample_info.length(); ++i) + { + if((sample_info[i].sample_rank == 0) && (sample_info[i].valid_data)) + { + infoseq[ix] <<= sample_info[i]; + inst_seq[ix] = data[i]; + ++ix; + } + } + + // Return the loan + this->impl ()->return_loan(data,sample_info); + infos = infoseq._retn (); + instances = inst_seq._retn(); +} + +template +void +CIAO::DDS4CCM::RTI::Reader_T::read_all ( + typename CCM_TYPE::seq_type::_out_type instances, + ::CCM_DDS::ReadInfoSeq_out infos) +{ + // This function has to return all samples of all instances + DDS_SampleInfoSeq sample_info; + typename DDS_TYPE::dds_seq_type data; + + 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::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::_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); + + CORBA::ULong ix = 0; + + for (::DDS_Long i = 0 ; i < sample_info.length(); ++i) + { + if(sample_info[i].valid_data) + { + infoseq[ix] <<= sample_info[i]; + inst_seq[ix] = data[i]; + ++ix; + } + } + + // Return the loan + this->impl ()->return_loan(data,sample_info); + + infos = infoseq._retn (); + instances = inst_seq._retn(); +} + +template +DDS_InstanceHandle_t +CIAO::DDS4CCM::RTI::Reader_T::check_handle ( + const typename DDS_TYPE::value_type& an_instance, + const ::DDS::InstanceHandle_t & instance_handle) +{ + DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; + hnd <<= instance_handle; + + DDS_InstanceHandle_t const lookup_hnd = + this->impl ()->lookup_instance (an_instance); + if (!DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL) && + !DDS_InstanceHandle_equals (&hnd, &lookup_hnd)) + { + throw ::CCM_DDS::InternalError (0, 0); + } + if (DDS_InstanceHandle_equals (&lookup_hnd, &::DDS_HANDLE_NIL)) + { + throw ::CCM_DDS::NonExistent (); + } + return lookup_hnd; +} + +template +void +CIAO::DDS4CCM::RTI::Reader_T::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::RTI::Reader_T::read_with_instance - ") + ACE_TEXT ("Reading with instance.\n"))); + DDS_ReturnCode_t const retval = this->impl ()->read_instance ( + data, + sample_info, + DDS_LENGTH_UNLIMITED, + lookup_hnd, + DDS_READ_SAMPLE_STATE | DDS_NOT_READ_SAMPLE_STATE , + DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, + DDS_ALIVE_INSTANCE_STATE); + 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::RTI::Reader_T::read_with_instance - ") + ACE_TEXT ("retval is %C\n"), translate_retcode(retval))); + throw ::CCM_DDS::InternalError (retval, 0); + } +} + +template +void +CIAO::DDS4CCM::RTI::Reader_T::read_one_last ( + typename DDS_TYPE::value_type& an_instance, + ::CCM_DDS::ReadInfo_out info, + const ::DDS::InstanceHandle_t & instance_handle) +{ + DDS_InstanceHandle_t const lookup_hnd = this->check_handle (an_instance, instance_handle); + + DDS_SampleInfoSeq sample_info; + typename DDS_TYPE::dds_seq_type data; + + // For now, only read with instance... + this->read_with_instance (data, lookup_hnd, sample_info); + + ::DDS_Long sample = data.length(); + DDS4CCM_DEBUG (6, (LM_INFO, + 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) + { + --sample; + } + if (sample >= 0) + { + if(sample_info[sample-1].valid_data) + { + an_instance = data[sample-1]; + info <<= sample_info[sample-1]; + } + } + // Return the loan + this->impl ()->return_loan(data, sample_info); +} + +template +void +CIAO::DDS4CCM::RTI::Reader_T::read_one_all ( + const typename DDS_TYPE::value_type& an_instance, + typename CCM_TYPE::seq_type::_out_type instances, + ::CCM_DDS::ReadInfoSeq_out infos, + const ::DDS::InstanceHandle_t & instance_handle) +{ + DDS_InstanceHandle_t const lookup_hnd = + this->check_handle (an_instance, instance_handle); + + DDS_SampleInfoSeq sample_info; + typename DDS_TYPE::dds_seq_type data; + + this->read_with_instance (data, lookup_hnd, sample_info); + + // 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::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::_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); + + // Copy the valid samples + CORBA::ULong ix = 0; + for (::DDS_Long i = 0 ; i < sample_info.length(); ++i) + { + if(sample_info[i].valid_data) + { + infoseq[ix] <<= sample_info[i]; + inst_seq[ix] = data[i]; + ++ix; + } + } + + // Return the loan + this->impl ()->return_loan(data, sample_info); + + infos = infoseq._retn (); + instances = inst_seq._retn(); +} + +template +void +CIAO::DDS4CCM::RTI::Reader_T::create_filter ( + const ::CCM_DDS::QueryFilter & 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::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::RTI::Reader_T::create_filter - " + "Error: Unable to get Participant.\n")); + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1); + } + + this->cft_ = dp->create_contentfilteredtopic ( + "DDS4CCMContentFilteredTopic", + this->topic_.in (), + filter.query, + filter.query_parameters); + if (CORBA::is_nil (this->cft_)) + { + 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); + } + ::DDS::DataReaderListener_var listener = this->reader_->get_listener (); + CCM_DDS::PortStatusListener_ptr psl = CCM_DDS::PortStatusListener::_nil (); + if (!CORBA::is_nil (listener)) + { + psl = dynamic_cast (listener.in ()); + this->reader_->set_listener (::DDS::DataReaderListener::_nil (), 0); + } + ::DDS::ReturnCode_t const retval = sub->delete_datareader (this->reader_); + if (retval != ::DDS::RETCODE_OK) + { + 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 (); + + ::DDS::DataReader_var reader = ::DDS::DataReader::_nil (); + if (this->library_name_.length () > 0 && + this->profile_name_.length () > 0) + { + reader = sub->create_datareader_with_profile ( + this->cft_, + this->library_name_.c_str (), + this->profile_name_.c_str (), + listener, + ::CIAO::DDS4CCM::PortStatusListener_T::get_mask ( + psl)); + } + else + { + ::DDS::DataReaderQos drqos; + reader = sub->create_datareader ( + this->cft_, + drqos, + listener, + ::CIAO::DDS4CCM::PortStatusListener_T::get_mask ( + psl)); + } + if (CORBA::is_nil(reader)) + { + 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); + this->set_impl (reader); +} + +template + ::CCM_DDS::QueryFilter * + CIAO::DDS4CCM::RTI::Reader_T::filter (void) +{ + #if defined DDS4CCM_USES_QUERY_CONDITION + if (CORBA::is_nil (this->qc_)) + { + 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 * filter = new ::CCM_DDS::QueryFilter(); + filter->query = this->qc_->get_query_expression (); + this->qc_->get_query_parameters (filter->query_parameters); + return filter; + #else + if (CORBA::is_nil (this->cft_)) + { + 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 * 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::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; + #endif +} + +template +void +CIAO::DDS4CCM::RTI::Reader_T::filter ( + const ::CCM_DDS::QueryFilter & filter) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::filter"); + #if defined DDS4CCM_USES_QUERY_CONDITION + if (CORBA::is_nil (this->qc_)) + { + this->qc_ = this->impl ()->create_querycondition ( + DDS_READ_SAMPLE_STATE | DDS_NOT_READ_SAMPLE_STATE, + DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE, + DDS_ALIVE_INSTANCE_STATE, + filter.query, + filter.query_parameters); + if (CORBA::is_nil (this->qc_)) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - " + "Error creating query condition.")); + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1); + } + } + else + { + ::DDS::ReturnCode_t retval = this->qc_->set_query_parameters ( + filter.query_parameters); + if (retval != ::DDS::RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - " + "Error setting expression_parameters. " + "Retval is %C\n", + translate_retcode(retval))); + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, retval); + } + } + #else + if (CORBA::is_nil (this->cft_)) + { + this->create_filter (filter); + } + else + { + ::DDS::ReturnCode_t retval = this->cft_->set_expression_parameters ( + filter.query_parameters); + if (retval != ::DDS::RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - " + "Error setting expression_parameters. " + "Retval is %C\n", + translate_retcode(retval))); + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, retval); + } + } + #endif +} + +template +void +CIAO::DDS4CCM::RTI::Reader_T::set_qos ( + ::DDS::Topic_ptr topic, + const char * library_name, + const char * profile_name) +{ + this->library_name_ = library_name; + this->profile_name_ = profile_name; + this->topic_ = topic; +} + +template +void +CIAO::DDS4CCM::RTI::Reader_T::set_impl ( + ::DDS::DataReader_ptr reader) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::set_impl"); + + if (::CORBA::is_nil (reader)) + { + this->impl_ = 0; + } + else + { + this->reader_ = reader; + CCM_DDS_DataReader_i *rdr = dynamic_cast (reader); + + if (!rdr) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::data_reader - " + "Unable to cast provided DataReader to servant\n")); + throw ::CORBA::INTERNAL (); + } + + this->impl_ = DDS_TYPE::data_reader::narrow (rdr->get_impl ()); + + if (!this->impl ()) + { + 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/ndds/Reader_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h new file mode 100644 index 00000000000..de473f0e4c7 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h @@ -0,0 +1,112 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ +#ifndef DDS_READER_T +#define DDS_READER_T + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Copy_Disabled.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::InstanceHandle_t DDS_InstanceHandle_t; +typedef ::DDS::SampleInfoSeq DDS_SampleInfoSeq; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + namespace RTI + { + template + class Reader_T : + public virtual CCM_TYPE::reader_type, + public virtual ::CORBA::LocalObject, + private virtual ACE_Copy_Disabled + { + public: + /// Constructor + Reader_T (void); + + /// Destructor + virtual ~Reader_T (void); + + virtual void read_last ( + typename CCM_TYPE::seq_type::_out_type instances, + ::CCM_DDS::ReadInfoSeq_out infos); + + virtual void read_all ( + typename CCM_TYPE::seq_type::_out_type instances, + ::CCM_DDS::ReadInfoSeq_out infos); + + virtual void read_one_last ( + typename DDS_TYPE::value_type& an_instance, + ::CCM_DDS::ReadInfo_out info, + const ::DDS::InstanceHandle_t & instance_handle); + + virtual void read_one_all ( + const typename DDS_TYPE::value_type& an_instance, + typename CCM_TYPE::seq_type::_out_type instances, + ::CCM_DDS::ReadInfoSeq_out infos, + const ::DDS::InstanceHandle_t & instance_handle); + + virtual ::CCM_DDS::QueryFilter *filter (void); + + virtual void filter (const ::CCM_DDS::QueryFilter & filter); + + void set_impl (::DDS::DataReader_ptr reader); + void set_qos ( + ::DDS::Topic_ptr topic, + const char * libary_name, + const char * profile_name); + + private: + ::DDS::Topic_var topic_; + ::DDS::DataReader_var reader_; + + ACE_CString library_name_; + ACE_CString profile_name_; + + #if defined DDS4CCM_USES_QUERY_CONDITION + DDS::QueryCondition_var qc_; + #else + DDS::ContentFilteredTopic_var cft_; + #endif + + typename DDS_TYPE::data_reader * impl_; + + typename DDS_TYPE::data_reader * impl (void); + + DDS_InstanceHandle_t check_handle ( + const typename DDS_TYPE::value_type& an_instance, + const ::DDS::InstanceHandle_t & instance_handle); + + void read_with_instance ( + typename DDS_TYPE::dds_seq_type & data, + const ::DDS_InstanceHandle_t & lookup_hnd, + DDS_SampleInfoSeq & sample_info); + + void read_without_instance ( + typename DDS_TYPE::dds_seq_type & data, + DDS_SampleInfoSeq & sample_info); + + CORBA::ULong get_nr_valid_samples ( + const DDS_SampleInfoSeq & sample_info, + bool determine_last = false); + + void create_filter ( + const ::CCM_DDS::QueryFilter & filter); + }; + } + } +} + +#include "dds4ccm/impl/ndds/Reader_T.cpp" + +#endif /* DDS_READER_T */ + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h new file mode 100644 index 00000000000..031474a4484 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h @@ -0,0 +1,48 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_RELIABILITYSQOSPOLICY_H +#define DDS4CCM_RELIABILITYSQOSPOLICY_H + +#include "Duration_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::ReliabilityQosPolicy DDS_ReliabilityQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::ReliabilityQosPolicy &ddsqos, const ::DDS_ReliabilityQosPolicy & qos) +{ + ddsqos.kind = static_cast < ::DDS::ReliabilityQosPolicyKind> (qos.kind); + ddsqos.max_blocking_time <<= qos.max_blocking_time; +} + +inline void +operator<<= (::DDS_ReliabilityQosPolicy &ddsqos, const ::DDS::ReliabilityQosPolicy & qos) +{ + 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; +} + +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/ndds/RequestedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h new file mode 100644 index 00000000000..fe0fa067115 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h @@ -0,0 +1,53 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H +#define DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H + +#include "InstanceHandle_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::RequestedDeadlineMissedStatus DDS_RequestedDeadlineMissedStatus; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::RequestedDeadlineMissedStatus &ddsstatus, const ::DDS_RequestedDeadlineMissedStatus & status) +{ + 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<<= (::DDS_RequestedDeadlineMissedStatus &ddsstatus, const ::DDS::RequestedDeadlineMissedStatus & status) +{ + 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; +} + +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/ndds/RequestedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h new file mode 100644 index 00000000000..2300236f884 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h @@ -0,0 +1,57 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H +#define DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H + +#include "QosPolicyCountSeq.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::RequestedIncompatibleQosStatus DDS_RequestedIncompatibleQosStatus; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::RequestedIncompatibleQosStatus &ddsstatus, const ::DDS_RequestedIncompatibleQosStatus & status) +{ + 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<<= (::DDS_RequestedIncompatibleQosStatus &ddsstatus, const ::DDS::RequestedIncompatibleQosStatus & status) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; + ddsstatus.last_policy_id = static_cast (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 = 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 (status.last_policy_id); + ddsstatus.policies <<= status.policies; +} +#endif + +#endif /* DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h new file mode 100644 index 00000000000..439c4c0047b --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h @@ -0,0 +1,50 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_RESOURCELIMITSQOSPOLICY_H +#define DDS4CCM_RESOURCELIMITSQOSPOLICY_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::ResourceLimitsQosPolicy DDS_ResourceLimitsQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::ResourceLimitsQosPolicy &ddsqos, const ::DDS_ResourceLimitsQosPolicy & qos) +{ + 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<<= (::DDS_ResourceLimitsQosPolicy &ddsqos, const ::DDS::ResourceLimitsQosPolicy & qos) +{ + 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; +} + +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/ndds/SampleInfo.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h new file mode 100644 index 00000000000..8d3d816576d --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h @@ -0,0 +1,69 @@ +/** + * @author Marcel Smit + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef SAMPLE_INFO_H +#define SAMPLE_INFO_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "Time_t.h" +#include "InstanceHandle_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::SampleStateKind DDS_SampleStateKind; +typedef ::DDS::SampleInfo DDS_SampleInfo; +#endif + +inline void +operator<<= (::CCM_DDS::AccessStatus & access_status, const ::DDS_SampleStateKind & sample_state) +{ + if (sample_state == ::DDS::NOT_READ_SAMPLE_STATE) + { + access_status = ::CCM_DDS::FRESH_INFO; + } + else if (sample_state == ::DDS::READ_SAMPLE_STATE) + { + access_status = ::CCM_DDS::ALREADY_SEEN; + } +} + +inline void +operator<<= (::CCM_DDS::ReadInfo& ccm_dds_readinfo, const ::DDS_SampleInfo& sample_info) +{ +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ccm_dds_readinfo.source_timestamp <<= sample_info.source_timestamp; +#else + ccm_dds_readinfo.source_timestamp = sample_info.source_timestamp; +#endif + ccm_dds_readinfo.access_status <<= sample_info.sample_state; +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ccm_dds_readinfo.instance_handle <<= sample_info.instance_handle; +#else + ccm_dds_readinfo.instance_handle = sample_info.instance_handle; +#endif + + if (sample_info.instance_state == ::DDS::ALIVE_INSTANCE_STATE && + sample_info.view_state == ::DDS::NEW_VIEW_STATE) + { + // Instance_status new + ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_CREATED; + } + else if (sample_info.instance_state == ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE) + { + // Instance_status deleted + ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_DELETED; + } + else if ((sample_info.instance_state == ::DDS::ALIVE_INSTANCE_STATE && + sample_info.view_state == ::DDS::NOT_NEW_VIEW_STATE) || + sample_info.instance_state == ::DDS::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) + { + // Instance_status updated + ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_UPDATED; + } +} + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h new file mode 100644 index 00000000000..920f4051bd4 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h @@ -0,0 +1,34 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_SAMPLELOSTSTATUS_H +#define DDS4CCM_SAMPLELOSTSTATUS_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::SampleLostStatus DDS_SampleLostStatus; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::SampleLostStatus &ddsstatus, const ::DDS_SampleLostStatus & status) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; +} + +inline void +operator>>= (const ::DDS_SampleLostStatus &status, ::DDS::SampleLostStatus & ddsstatus) +{ + ddsstatus.total_count = status.total_count; + ddsstatus.total_count_change = status.total_count_change; +} +#endif + +#endif /* DDS4CCM_SAMPLELOSTSTATUS_H */ + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h new file mode 100644 index 00000000000..032aca41a8c --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h @@ -0,0 +1,57 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_SAMPLEREJECTEDSTATUS_H +#define DDS4CCM_SAMPLEREJECTEDSTATUS_H + +#include "InstanceHandle_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::SampleRejectedStatus DDS_SampleRejectedStatus; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::SampleRejectedStatus &ddsstatus, const ::DDS_SampleRejectedStatus & status) +{ + 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<<= (::DDS_SampleRejectedStatus &ddsstatus, const ::DDS::SampleRejectedStatus & status) +{ + 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; +} + +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/ndds/StateListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp new file mode 100644 index 00000000000..197e999eae8 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp @@ -0,0 +1,35 @@ +// -*- C++ -*- +// $Id$ + +template +CCM_DDS_StateListenerControl_T::CCM_DDS_StateListenerControl_T (void) + : is_filter_interpreted_ (false) +{ + DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::CCM_DDS_StateListenerControl_T"); +} + +template +CCM_DDS_StateListenerControl_T::~CCM_DDS_StateListenerControl_T (void) +{ + DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::~CCM_DDS_StateListenerControl_T"); +} + +template +::CORBA::Boolean +CCM_DDS_StateListenerControl_T::is_filter_interpreted (void) +{ + DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::is_filter_interpreted"); + + return this->is_filter_interpreted_.value (); +} + +template +void +CCM_DDS_StateListenerControl_T::is_filter_interpreted ( + ::CORBA::Boolean is_filter_interpreted) +{ + DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::is_filter_interpreted"); + + this->is_filter_interpreted_ = is_filter_interpreted; +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.h b/CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.h new file mode 100644 index 00000000000..87ed1de1034 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.h @@ -0,0 +1,38 @@ +// -*- C++ -*- +// $Id$ + +#ifndef DDS4CCM_STATELISTENERCONTROLI_H_ +#define DDS4CCM_STATELISTENERCONTROLI_H_ + +#include "dds4ccm/impl/ndds/DataListenerControl_T.h" +#include "dds4ccm/idl/dds4ccm_StateListenerControlEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +template +class CCM_DDS_StateListenerControl_T + : public virtual CCM_DDS_DataListenerControl_T +{ +public: + /// Constructor + CCM_DDS_StateListenerControl_T (void); + + /// Destructor + virtual ~CCM_DDS_StateListenerControl_T (void); + + /// Set the is_filter_interpreted + virtual ::CORBA::Boolean is_filter_interpreted (void); + + /// Get the is_filter_interpreted + virtual void is_filter_interpreted (::CORBA::Boolean is_filter_interpreted); + +private: + ACE_Atomic_Op is_filter_interpreted_; +}; + +#include "dds4ccm/impl/ndds/StateListenerControl_T.cpp" + +#endif /* DDS4CCM_STATELISTENERCONTROLI_H_ */ + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp new file mode 100644 index 00000000000..37baef77d72 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp @@ -0,0 +1,72 @@ +// $Id$ + +#include "StatusCondition.h" +#include "Subscriber.h" + +#include "dds4ccm/idl/dds4ccm_BaseC.h" + +#include "dds4ccm/impl/logger/Log_Macros.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_StatusCondition_i::CCM_DDS_StatusCondition_i ( + DDSStatusCondition * sc) : + impl_ (sc) + { + } + + CCM_DDS_StatusCondition_i::~CCM_DDS_StatusCondition_i (void) + { + } + + ::CORBA::Boolean + CCM_DDS_StatusCondition_i::get_trigger_value (void) + { + return this->impl ()->get_trigger_value (); + } + + ::DDS::StatusMask + CCM_DDS_StatusCondition_i::get_enabled_statuses (void) + { + return this->impl ()->get_enabled_statuses (); + } + + ::DDS::ReturnCode_t + CCM_DDS_StatusCondition_i::set_enabled_statuses ( + ::DDS::StatusMask mask) + { + return this->impl ()->set_enabled_statuses (mask); + } + + ::DDS::Entity_ptr + CCM_DDS_StatusCondition_i::get_entity (void) + { + throw CORBA::NO_IMPLEMENT (); + } + + DDSStatusCondition * + CCM_DDS_StatusCondition_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_StatusCondition_i::set_impl (DDSStatusCondition * sc) + { + this->impl_ = sc; + } + + DDSStatusCondition * + CCM_DDS_StatusCondition_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; + } + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h new file mode 100644 index 00000000000..1101549109a --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h @@ -0,0 +1,64 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_STATUSCONDITION_H +#define DDS4CCM_STATUSCONDITION_H + +#include "tao/LocalObject.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +# include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::StatusCondition DDSStatusCondition; +#endif + +#include "tao/LocalObject.h" + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_StatusCondition_i : + public virtual ::DDS::CCM_StatusCondition, + public virtual ::CORBA::LocalObject + { + public: + /// Constructor + CCM_DDS_StatusCondition_i (DDSStatusCondition *sc); + + /// Destructor + virtual ~CCM_DDS_StatusCondition_i (void); + + virtual ::CORBA::Boolean get_trigger_value (void); + + virtual ::DDS::StatusMask get_enabled_statuses (void); + + virtual ::DDS::ReturnCode_t set_enabled_statuses (::DDS::StatusMask mask); + + virtual ::DDS::Entity_ptr get_entity (void); + + DDSStatusCondition * get_impl (void); + + void set_impl (DDSStatusCondition * sc); + + private: + DDSStatusCondition * impl_; + DDSStatusCondition * impl (void); + }; + } +} + +#endif /* DDS4CCM_STATUSCONDITION_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h new file mode 100644 index 00000000000..6f75683fd3f --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h @@ -0,0 +1,43 @@ +/** + * @author Marcel Smit + * @author Johnny Willemsen + * + * $Id$ + * + */ + +#ifndef DDS4CCM_STRINGSEQ_T_H +#define DDS4CCM_STRINGSEQ_T_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::StringSeq DDS_StringSeq; +typedef long DDS_Long; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::StringSeq & string_seq, const ::DDS_StringSeq & dds_string_seq) +{ + string_seq.length (dds_string_seq.length ()); + for (::DDS_Long i = 0 ; i < dds_string_seq.length(); ++i) + { + string_seq[i] = CORBA::string_dup (dds_string_seq[i]); + } +} + +inline void +operator<<= (::DDS_StringSeq & dds_string_seq, const ::DDS::StringSeq & string_seq) +{ + const char** parameterlist = new const char*[string_seq.length ()]; + + for (CORBA::ULong i = 0; i < string_seq.length (); ++i) + { + parameterlist[i] = string_seq[i].in (); + } + dds_string_seq.length (string_seq.length ()); + dds_string_seq.from_array (parameterlist, string_seq.length ()); + delete [] parameterlist; +} +#endif + +#endif /* DDS4CCM_STRINGSEQ_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp new file mode 100644 index 00000000000..41ea04b1552 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp @@ -0,0 +1,531 @@ +// $Id$ + +#include "Subscriber.h" +#include "SubscriberListener.h" +#include "Topic.h" +#include "ContentFilteredTopic.h" +#include "DataReader.h" +#include "DataReaderListener.h" +#include "Utils.h" +#include "StatusCondition.h" +#include "InstanceHandle_t.h" + +#include "DataReaderQos.h" +#include "SubscriberQos.h" +#include "TopicQos.h" + +#include "dds4ccm/idl/dds4ccm_BaseC.h" + +#include "dds4ccm/impl/logger/Log_Macros.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_Subscriber_i::CCM_DDS_Subscriber_i (DDSSubscriber * sub) + : impl_ (sub) + { + DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::CCM_DDS_Subscriber_i"); + } + + CCM_DDS_Subscriber_i::~CCM_DDS_Subscriber_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::~CCM_DDS_Subscriber_i"); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::enable (void) + { + return this->impl ()->enable (); + } + + ::DDS::StatusCondition_ptr + CCM_DDS_Subscriber_i::get_statuscondition (void) + { + ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSStatusCondition* sc = this->impl ()->get_statuscondition (); + if (sc) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc), + CORBA::NO_MEMORY ()); + } +#else + ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); + if (!CORBA::is_nil (sc.in ())) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc.in ()), + CORBA::NO_MEMORY ()); + } +#endif + return retval._retn (); + } + + ::DDS::StatusMask + CCM_DDS_Subscriber_i::get_status_changes (void) + { + return this->impl ()->get_status_changes (); + } + + ::DDS::InstanceHandle_t + CCM_DDS_Subscriber_i::get_instance_handle (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS::InstanceHandle_t handle; + handle <<= rtihandle; + return handle; +#else + return this->impl ()->get_instance_handle (); +#endif + } + + DDSDataReader * + CCM_DDS_Subscriber_i::create_datareader ( + DDSContentFilteredTopic * topic, + 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 rti_qos = DDS_DATAREADER_QOS_DEFAULT; + return this->impl ()->create_datareader (topic, + rti_qos, + rti_drl, + mask); +#else + return this->impl ()->create_datareader (topic, + qos, + rti_drl, + mask); +#endif + } + + DDSDataReader * + CCM_DDS_Subscriber_i::create_datareader ( + DDSTopic * topic, + 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 rti_qos = DDS_DATAREADER_QOS_DEFAULT; + return this->impl ()->create_datareader (topic, + rti_qos, + rti_drl, + mask); +#else + return this->impl ()->create_datareader (topic, + qos, + rti_drl, + mask); +#endif + } + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDataReader * + CCM_DDS_Subscriber_i::create_datareader_with_profile ( + DDSContentFilteredTopic * topic, + const char * library_name, + const char * profile_name, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask) + { + return this->impl ()->create_datareader_with_profile (topic, + library_name, + profile_name, + rti_drl, + mask); + } +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDataReader * + CCM_DDS_Subscriber_i::create_datareader_with_profile ( + DDSTopic * topic, + const char * library_name, + const char * profile_name, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask) + { + return this->impl ()->create_datareader_with_profile (topic, + library_name, + profile_name, + rti_drl, + mask); + } +#endif + + ::DDS::DataReader_ptr + CCM_DDS_Subscriber_i::create_datareader ( + ::DDS::TopicDescription_ptr a_topic, + const ::DDS::DataReaderQos & qos, + ::DDS::DataReaderListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::create_datareader"); + ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); + DDSDataReaderListener *rti_drl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_drl, + CCM_DDS_DataReaderListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + + DDSDataReader * rti_dr = 0; + CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); + + if (!topic) + { + CCM_DDS_ContentFilteredTopic_i * cf_topic = + dynamic_cast < CCM_DDS_ContentFilteredTopic_i * > (a_topic); + if (!cf_topic) + { + 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 rti_drl; + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + } + else + rti_dr = this->create_datareader (cf_topic->get_impl (), rti_drl, mask, qos); + } + else + rti_dr = this->create_datareader (topic->get_impl (), rti_drl, mask, qos); + + if (!rti_dr) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::create_datareader - " + "Error: RTI Topic returned a nil datareader.\n")); + delete rti_drl; + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - " + "Successfully created datareader.\n")); + } + + rti_dr->enable (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DataReader_i (rti_dr), + CORBA::NO_MEMORY ()); + return retval._retn (); + } + + ::DDS::DataReader_ptr + CCM_DDS_Subscriber_i::create_datareader_with_profile ( + ::DDS::TopicDescription_ptr a_topic, + const char * library_name, + const char * profile_name, + ::DDS::DataReaderListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::create_datareader_with_profile"); + ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); + DDSDataReaderListener *rti_drl = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_drl, + CCM_DDS_DataReaderListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + + DDSDataReader * rti_dr = 0; + CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic); + + if (!topic) + { + CCM_DDS_ContentFilteredTopic_i * cf_topic = + dynamic_cast < CCM_DDS_ContentFilteredTopic_i * > (a_topic); + if (!cf_topic) + { + 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 rti_drl; + throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + } + else + rti_dr = this->create_datareader_with_profile (cf_topic->get_impl (), + library_name, + profile_name, + rti_drl, + mask); + } + else + rti_dr = this->create_datareader_with_profile (topic->get_impl (), + library_name, + profile_name, + rti_drl, + mask); + + 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 rti_drl; + throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - " + "Successfully created datareader with profile <%C#%C>.\n", + library_name, + profile_name)); + } + + rti_dr->enable (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_DataReader_i (rti_dr), + CORBA::NO_MEMORY ()); + return retval._retn (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::delete_datareader ( + ::DDS::DataReader_ptr a_datareader) + { + CCM_DDS_DataReader_i *dr = dynamic_cast< CCM_DDS_DataReader_i *> (a_datareader); + if (!dr) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - " + "Unable to cast provided object reference to servant.\n")); + return ::DDS::RETCODE_BAD_PARAMETER; + } + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - " + "Successfully casted provided object reference to servant.\n")); + + DDS_ReturnCode_t const retval = this->impl ()->delete_datareader (dr->get_impl ()); + + if (retval != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - " + "Error: Returned non-ok error code %C\n", + translate_retcode (retval))); + } + else + { + DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - " + "Datareader successfully deleted\n")); + } + + return retval; + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::delete_contained_entities (void) + { + return this->impl ()->delete_contained_entities (); + } + + ::DDS::DataReader_ptr + CCM_DDS_Subscriber_i::lookup_datareader ( + const char * impl_name) + { + ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); + DDSDataReader* dr = this->impl ()->lookup_datareader (impl_name); + if (dr) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_DataReader_i (dr), + CORBA::NO_MEMORY ()); + } + return retval._retn (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::get_datareaders ( + ::DDS::DataReaderSeq & /*readers*/, + ::DDS::SampleStateMask /*sample_states*/, + ::DDS::ViewStateMask /*view_states*/, + ::DDS::InstanceStateMask /*instance_states*/) + { + throw CORBA::NO_IMPLEMENT (); + // Add your implementation here + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::notify_datareaders (void) + { + return this->impl ()->notify_datareaders (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::set_qos ( + const ::DDS::SubscriberQos & qos) + { + CIAO_TRACE ("CCM_DDS_Subscriber_i::set_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_SubscriberQos rti_qos; + rti_qos <<= qos; + return this->impl ()->get_qos (rti_qos); +#else + return this->impl ()->set_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::get_qos ( + ::DDS::SubscriberQos & qos) + { + CIAO_TRACE ("CCM_DDS_Subscriber_i::get_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::set_listener ( + ::DDS::SubscriberListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::set_listener"); + + CCM_DDS_SubscriberListener_i* rti_impl_list = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_impl_list, + CCM_DDS_SubscriberListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + return this->impl ()->set_listener (rti_impl_list, mask); + } + + ::DDS::SubscriberListener_ptr + CCM_DDS_Subscriber_i::get_listener (void) + { + DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::get_listener"); + + DDSSubscriberListener *rti_impl_list = this->impl ()->get_listener (); + CCM_DDS_SubscriberListener_i *list_proxy = dynamic_cast (rti_impl_list); + if (!list_proxy) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Subscriber_i::get_listener - " + "DDS returned a NIL listener.\n")); + return ::DDS::SubscriberListener::_nil (); + } + return list_proxy->get_subscriber_listener (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::begin_access (void) + { + return this->impl ()->begin_access (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::end_access (void) + { + return this->impl ()->end_access (); + } + + ::DDS::DomainParticipant_ptr + CCM_DDS_Subscriber_i::get_participant (void) + { + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDomainParticipant* p = this->impl ()->get_participant (); + if (p) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p), + CORBA::NO_MEMORY ()); + } +#else + ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); + if (!CORBA::is_nil (p.in)) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p.in ()), + CORBA::NO_MEMORY ()); + } +#endif + return retval._retn (); + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::set_default_datareader_qos ( + const ::DDS::DataReaderQos & qos) + { + CIAO_TRACE ("CCM_DDS_Subscriber_i::set_default_datareader_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::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 + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::get_default_datareader_qos ( + ::DDS::DataReaderQos & qos) + { + CIAO_TRACE ("CCM_DDS_Subscriber_i::get_default_datareader_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::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); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_Subscriber_i::copy_from_topic_qos ( + ::DDS::DataReaderQos & a_datareader_qos, + const ::DDS::TopicQos & a_impl_qos) + { + DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::copy_from_topic_qos"); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_DataReaderQos rti_qos; + ::DDS_TopicQos rti_topic_qos; + + rti_qos <<= a_datareader_qos; + rti_topic_qos <<= a_impl_qos; + ::DDS::ReturnCode_t retcode = + 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, + a_impl_qos); +#endif + } + + DDSSubscriber * + CCM_DDS_Subscriber_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_Subscriber_i::set_impl (DDSSubscriber * sub) + { + this->impl_ = sub; + } + + DDSSubscriber * + CCM_DDS_Subscriber_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; + } + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h new file mode 100644 index 00000000000..c1ed651728e --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h @@ -0,0 +1,176 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_SUBSCRIBER_H +#define DDS4CCM_SUBSCRIBER_H + +#include "tao/LocalObject.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" + +#include "tao/LocalObject.h" + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +#include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::Subscriber DDSSubscriber; +typedef ::DDS::DataReaderListener DDSDataReaderListener; +typedef ::DDS::DataReader DDSDataReader; +typedef ::DDS::ContentFilteredTopic DDSContentFilteredTopic; +typedef ::DDS::Topic DDSTopic; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_Subscriber_i : + public virtual ::DDS::CCM_Subscriber, + public virtual ::CORBA::LocalObject + { + public: + /// Constructor + CCM_DDS_Subscriber_i (DDSSubscriber * sub); + + /// Destructor + virtual ~CCM_DDS_Subscriber_i (void); + + virtual ::DDS::ReturnCode_t enable (void); + + virtual ::DDS::StatusCondition_ptr get_statuscondition (void); + + virtual ::DDS::StatusMask get_status_changes (void); + + virtual ::DDS::InstanceHandle_t get_instance_handle (void); + + virtual ::DDS::DataReader_ptr create_datareader ( + ::DDS::TopicDescription_ptr a_topic, + const ::DDS::DataReaderQos & qos, + ::DDS::DataReaderListener_ptr a_listener, + ::DDS::StatusMask mask); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + virtual ::DDS::DataReader_ptr + create_datareader_with_profile ( + ::DDS::TopicDescription_ptr a_topic, + const char* library_name, + const char *profile_name, + ::DDS::DataReaderListener_ptr a_listener, + ::DDS::StatusMask mask); +#endif + + virtual ::DDS::ReturnCode_t + delete_datareader ( + ::DDS::DataReader_ptr a_datareader); + + virtual ::DDS::ReturnCode_t delete_contained_entities (void); + + virtual ::DDS::DataReader_ptr lookup_datareader ( + const char * impl_name); + + virtual ::DDS::ReturnCode_t + get_datareaders ( + ::DDS::DataReaderSeq & readers, + ::DDS::SampleStateMask sample_states, + ::DDS::ViewStateMask view_states, + ::DDS::InstanceStateMask instance_states); + + virtual ::DDS::ReturnCode_t + notify_datareaders (void); + + virtual ::DDS::ReturnCode_t + set_qos ( + const ::DDS::SubscriberQos & qos); + + virtual ::DDS::ReturnCode_t + get_qos ( + ::DDS::SubscriberQos & qos); + + virtual ::DDS::ReturnCode_t + set_listener ( + ::DDS::SubscriberListener_ptr a_listener, + ::DDS::StatusMask mask); + + virtual ::DDS::SubscriberListener_ptr + get_listener (void); + + virtual ::DDS::ReturnCode_t + begin_access (void); + + virtual ::DDS::ReturnCode_t + end_access (void); + + virtual ::DDS::DomainParticipant_ptr + get_participant (void); + + virtual ::DDS::ReturnCode_t + set_default_datareader_qos ( + const ::DDS::DataReaderQos & qos); + + virtual ::DDS::ReturnCode_t + get_default_datareader_qos ( + ::DDS::DataReaderQos & qos); + + virtual ::DDS::ReturnCode_t + copy_from_topic_qos ( + ::DDS::DataReaderQos & a_datareader_qos, + const ::DDS::TopicQos & a_impl_qos); + + DDSSubscriber * get_impl (void); + + void set_impl (DDSSubscriber * sub); + + private: + DDSSubscriber *impl_; + + DDSSubscriber *impl (void); + + DDSDataReader * + create_datareader ( + DDSTopic * topic, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask, + const ::DDS::DataReaderQos & qos); + + DDSDataReader * + create_datareader ( + DDSContentFilteredTopic * topic, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask, + const ::DDS::DataReaderQos & qos); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDataReader * + create_datareader_with_profile ( + DDSContentFilteredTopic * topic, + const char* library_name, + const char *profile_name, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask); +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDataReader * + create_datareader_with_profile ( + DDSTopic * topic, + const char* library_name, + const char *profile_name, + DDSDataReaderListener * rti_drl, + ::DDS::StatusMask mask); +#endif + }; + } +} + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp new file mode 100644 index 00000000000..f5897fa3945 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp @@ -0,0 +1,176 @@ +// $Id$ + +#include "SubscriberListener.h" +#include "Subscriber.h" +#include "DataReader.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 +{ + namespace DDS4CCM + { + CCM_DDS_SubscriberListener_i::CCM_DDS_SubscriberListener_i (::DDS::SubscriberListener_ptr p) + : impl_ ( ::DDS::SubscriberListener::_duplicate (p)) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::CCM_DDS_SubscriberListener_i"); + } + + CCM_DDS_SubscriberListener_i::~CCM_DDS_SubscriberListener_i (void) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::~CCM_DDS_SubscriberListener_i"); + } + + void + CCM_DDS_SubscriberListener_i::on_data_on_readers ( + ::DDSSubscriber* the_subscriber) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_data_on_readers"); + + ::DDS::Subscriber_var sub = ::DDS::Subscriber::_nil (); + ACE_NEW (sub, + CCM_DDS_Subscriber_i (the_subscriber)); + this->impl_->on_data_on_readers (sub.in ()); + the_subscriber->notify_datareaders (); + } + + void + CCM_DDS_SubscriberListener_i::on_requested_deadline_missed ( + ::DDSDataReader* the_reader, + const ::DDS_RequestedDeadlineMissedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_requested_deadline_missed"); + + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::RequestedDeadlineMissedStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus); +#else + this->impl_->on_requested_deadline_missed (dds_reader.in (), status); +#endif + } + + void + CCM_DDS_SubscriberListener_i::on_requested_incompatible_qos ( + ::DDSDataReader* the_reader, + const ::DDS_RequestedIncompatibleQosStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_requested_incompatible_qos"); + + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::RequestedIncompatibleQosStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus); +#else + this->impl_->on_requested_incompatible_qos (dds_reader.in (), status); +#endif + } + + void + CCM_DDS_SubscriberListener_i::on_sample_rejected ( + ::DDSDataReader* the_reader, + const ::DDS_SampleRejectedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_sample_rejected"); + + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::SampleRejectedStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus); +#else + this->impl_->on_sample_rejected (dds_reader.in (), status); +#endif + } + + void + CCM_DDS_SubscriberListener_i::on_liveliness_changed ( + ::DDSDataReader* the_reader, + const ::DDS_LivelinessChangedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_liveliness_changed"); + + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::LivelinessChangedStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus); +#else + this->impl_->on_liveliness_changed (dds_reader.in (), status); +#endif + } + + void + CCM_DDS_SubscriberListener_i::on_data_available ( + ::DDSDataReader* the_reader) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_data_available"); + + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); + this->impl_->on_data_available (dds_reader.in ()); + } + + void + CCM_DDS_SubscriberListener_i::on_subscription_matched ( + ::DDSDataReader* the_reader, + const ::DDS_SubscriptionMatchedStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_subscription_matched"); + + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::SubscriptionMatchedStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus); +#else + this->impl_->on_subscription_matched (dds_reader.in (), status); +#endif + } + + void + CCM_DDS_SubscriberListener_i::on_sample_lost ( + ::DDSDataReader* the_reader, + const ::DDS_SampleLostStatus & status) + { + DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_sample_lost"); + + ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil (); + ACE_NEW (dds_reader, + CCM_DDS_DataReader_i (the_reader)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::SampleLostStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_sample_lost (dds_reader.in (), ddsstatus); +#else + this->impl_->on_sample_lost (dds_reader.in (), status); +#endif + } + + ::DDS::SubscriberListener_ptr + CCM_DDS_SubscriberListener_i::get_subscriber_listener (void) + { + return ::DDS::SubscriberListener::_duplicate (this->impl_.in ()); + } + } +} + + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h new file mode 100644 index 00000000000..6ccfa187656 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h @@ -0,0 +1,94 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_SUBSCRIBERLISTENER_H +#define DDS4CCM_SUBSCRIBERLISTENER_H + +#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +#include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::SubscriberListener DDSSubscriberListener; +typedef ::DDS::DataReader DDSDataReader; +typedef ::DDS::Subscriber DDSSubscriber; +typedef ::DDS::RequestedDeadlineMissedStatus DDS_RequestedDeadlineMissedStatus; +typedef ::DDS::LivelinessChangedStatus DDS_LivelinessChangedStatus; +typedef ::DDS::RequestedIncompatibleQosStatus DDS_RequestedIncompatibleQosStatus; +typedef ::DDS::SampleRejectedStatus DDS_SampleRejectedStatus; +typedef ::DDS::SubscriptionMatchedStatus DDS_SubscriptionMatchedStatus; +typedef ::DDS::SampleLostStatus DDS_SampleLostStatus; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_SubscriberListener_i : + public virtual ::DDSSubscriberListener + { + public: + /// Constructor + CCM_DDS_SubscriberListener_i ( ::DDS::SubscriberListener_ptr s); + + /// Destructor + virtual ~CCM_DDS_SubscriberListener_i (void); + + virtual void + on_requested_deadline_missed ( + ::DDSDataReader* the_reader, + const ::DDS_RequestedDeadlineMissedStatus & status); + + virtual void + on_requested_incompatible_qos ( + ::DDSDataReader* the_reader, + const ::DDS_RequestedIncompatibleQosStatus & status); + + virtual void + on_sample_rejected ( + ::DDSDataReader* the_reader, + const ::DDS_SampleRejectedStatus & status); + + virtual void + on_liveliness_changed ( + ::DDSDataReader* the_reader, + const ::DDS_LivelinessChangedStatus & status); + + virtual void + on_data_available ( + ::DDSDataReader* the_reader); + + virtual void + on_subscription_matched ( + ::DDSDataReader* the_reader, + const ::DDS_SubscriptionMatchedStatus & status); + + virtual void + on_sample_lost ( + ::DDSDataReader* the_reader, + const ::DDS_SampleLostStatus & status); + + virtual void + on_data_on_readers ( + ::DDSSubscriber* the_subscriber); + + ::DDS::SubscriberListener_ptr get_subscriber_listener (void); + private: + ::DDS::SubscriberListener_var impl_; + }; + } +} + +#endif + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp new file mode 100644 index 00000000000..1dd1b95f0c4 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp @@ -0,0 +1,277 @@ +// $Id$ +#include "dds4ccm/impl/ndds/Utils.h" + +#include "dds4ccm/impl/ndds/DataReader.h" +#include "dds4ccm/impl/logger/Log_Macros.h" +#include "dds4ccm/impl/ndds/DDSCallbackStatusHandler.h" +#include "dds4ccm/impl/ndds/Utils.h" +#include "tao/ORB_Core.h" + +template +CIAO::DDS4CCM::SubscriberListener_T::SubscriberListener_T ( + ::CCM_DDS::ConnectorStatusListener_ptr error_listener, + ACE_Reactor* reactor) + : error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)), + reactor_ (reactor) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::SubscriberListener_T"); +} + +template +CIAO::DDS4CCM::SubscriberListener_T::~SubscriberListener_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::~SubscriberListener_T"); +} + +template +void +CIAO::DDS4CCM::SubscriberListener_T::on_requested_incompatible_qos ( + ::DDS::DataReader_ptr reader, + const ::DDS::RequestedIncompatibleQosStatus & status) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_requested_incompatible_qos"); + + DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO + ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ") + ACE_TEXT ("total count <%d> - total change <%d> - ") + ACE_TEXT ("last policy id <%d> - policies "), + status.total_count, status.total_count_change, + status.last_policy_id)); + for (CORBA::ULong i = 0; i < status.policies.length (); ++i) + { + DDS4CCM_DEBUG (10, (LM_DEBUG, + ACE_TEXT ("\t\tid <%d> - count <%d>\n"), + status.policies[i].policy_id, + status.policies[i].count)); + } + + if (!CORBA::is_nil (this->error_listener_)) + { + try + { + if (this->reactor_) + { + ::CIAO::DDS4CCM::OnRequestedOncompatibleQosHandler* rh = 0; + ACE_NEW (rh, + ::CIAO::DDS4CCM::OnRequestedOncompatibleQosHandler ( + this->error_listener_, reader, status)); + ACE_Event_Handler_var safe_handler (rh); + if (this->reactor_->notify (rh) != 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO + ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ") + ACE_TEXT ("failed to use reactor.\n"))); + } + } + else + { + this->error_listener_->on_requested_incompatible_qos (reader, status); + } + } + catch (...) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ") + ACE_TEXT ("DDS Exception caught\n"))); + } + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO + ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ") + ACE_TEXT ("No error listener connected\n"))); + } +} + +template +void +CIAO::DDS4CCM::SubscriberListener_T::on_unexpected_status ( + ::DDS::Entity_ptr entity, + ::DDS::StatusKind status_kind) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_unexpected_status"); + + if (!CORBA::is_nil (this->error_listener_)) + { + try + { + if (this->reactor_) + { + ::CIAO::DDS4CCM::OnUnexpectedStatusHandler* rh = 0; + ACE_NEW (rh, + ::CIAO::DDS4CCM::OnUnexpectedStatusHandler ( + this->error_listener_, entity, status_kind)); + ACE_Event_Handler_var safe_handler (rh); + if (this->reactor_->notify (rh) != 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO + ACE_TEXT ("SubscriberListener_T::on_unexpected_status: ") + ACE_TEXT ("failed to use reactor.\n"))); + } + } + else + { + this->error_listener_->on_unexpected_status (entity, status_kind); + } + } + catch (...) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, + ACE_TEXT ("SubscriberListener_T::on_unexpected_status: ") + ACE_TEXT ("DDS Exception caught\n"))); + } + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO + ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ") + ACE_TEXT ("No error listener connected\n"))); + } +} + +template +void +CIAO::DDS4CCM::SubscriberListener_T::on_liveliness_changed ( + ::DDS::DataReader* reader, + const ::DDS::LivelinessChangedStatus& status) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_liveliness_changed"); + + DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO + ACE_TEXT ("SubscriberListener_T::on_liveliness_changed: ") + ACE_TEXT ("alive count <%d> - not alive count <%d> - ") + ACE_TEXT ("alive count change <%d> - not alive count change <%d> ") + ACE_TEXT ("last publication handle - isValid <%d>\n"), + status.alive_count, status.not_alive_count, + status.alive_count_change, status.not_alive_count_change, + status.last_publication_handle.length, + status.last_publication_handle.isValid)); + + this->on_unexpected_status (reader, ::DDS::LIVELINESS_CHANGED_STATUS); +} + +template +void +CIAO::DDS4CCM::SubscriberListener_T::on_sample_rejected ( + ::DDS::DataReader_ptr reader, + const ::DDS::SampleRejectedStatus& status) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_sample_rejected"); + + DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO + ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ") + ACE_TEXT ("total count <%d> - count change <%d> - ") + ACE_TEXT ("last reason <%C> - last instance handle ") + ACE_TEXT (" - isValid <%d>\n"), + status.total_count, status.total_count_change, + translate_rejectedstatuskind (status.last_reason), + status.last_instance_handle.length, + status.last_instance_handle.isValid)); + + if (!CORBA::is_nil (this->error_listener_)) + { + try + { + if (this->reactor_) + { + ::CIAO::DDS4CCM::OnSampleRejectedHandler* rh = 0; + ACE_NEW (rh, + ::CIAO::DDS4CCM::OnSampleRejectedHandler ( + this->error_listener_, reader, status)); + ACE_Event_Handler_var safe_handler (rh); + if (this->reactor_->notify (rh) != 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO + ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ") + ACE_TEXT ("failed to use reactor.\n"))); + } + } + else + { + this->error_listener_->on_sample_rejected (reader, status); + } + } + catch (...) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ") + ACE_TEXT ("DDS Exception caught\n"))); + } + } + else + { + DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO + ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ") + ACE_TEXT ("No error listener connected\n"))); + } +} + +template +void +CIAO::DDS4CCM::SubscriberListener_T::on_subscription_matched( + ::DDS::DataReader* reader, + const ::DDS::SubscriptionMatchedStatus& status) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_subscription_matched"); + + DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO + ACE_TEXT ("SubscriberListener_T::on_subscription_matched: ") + ACE_TEXT ("total count <%d> - count change <%d> - ") + ACE_TEXT ("current count <%d> - current count change <%d> ") + ACE_TEXT ("last publication handle - isValid <%d>\n"), + status.total_count, status.total_count_change, + status.current_count, status.current_count_change, + status.last_publication_handle.length, + status.last_publication_handle.isValid)); + + this->on_unexpected_status (reader, ::DDS::SUBSCRIPTION_MATCHED_STATUS); +} + +template +void +CIAO::DDS4CCM::SubscriberListener_T::on_data_on_readers( + ::DDS::Subscriber *) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_data_on_readers"); + //do nothing by design +} + +template +void +CIAO::DDS4CCM::SubscriberListener_T::on_requested_deadline_missed ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedDeadlineMissedStatus & ) +{ +} + +template +void +CIAO::DDS4CCM::SubscriberListener_T::on_data_available ( + ::DDS::DataReader_ptr ) +{ +} + +template +void +CIAO::DDS4CCM::SubscriberListener_T::on_sample_lost ( + ::DDS::DataReader_ptr , + const ::DDS::SampleLostStatus & ) +{ +} + +template +::DDS::StatusMask +CIAO::DDS4CCM::SubscriberListener_T::get_mask ( + ::CCM_DDS::ConnectorStatusListener_ptr csl) +{ + if (!CORBA::is_nil (csl) || CIAO_debug_level >= 10) + { + return ::DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS | + ::DDS::SAMPLE_REJECTED_STATUS | + ::DDS::LIVELINESS_CHANGED_STATUS | + ::DDS::SUBSCRIPTION_MATCHED_STATUS; + } + else + { + return 0; + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.h new file mode 100644 index 00000000000..fd39a011c6f --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.h @@ -0,0 +1,87 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS_SUBSCRIBERLISTENER_T_H_ +#define DDS_SUBSCRIBERLISTENER_T_H_ + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Copy_Disabled.h" + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL +class ACE_Reactor; +ACE_END_VERSIONED_NAMESPACE_DECL + +namespace CIAO +{ + namespace DDS4CCM + { + template + class SubscriberListener_T : + public ::DDS::CCM_SubscriberListener, + private ACE_Copy_Disabled + { + public: + /// Constructor + SubscriberListener_T ( + ::CCM_DDS::ConnectorStatusListener_ptr error_listener, + ACE_Reactor* reactor); + + /// Destructor + virtual ~SubscriberListener_T (void); + + virtual void on_requested_incompatible_qos ( + ::DDS::DataReader_ptr reader, + const ::DDS::RequestedIncompatibleQosStatus & status); + + virtual void on_liveliness_changed( + ::DDS::DataReader* reader, + const ::DDS::LivelinessChangedStatus& status); + + virtual void on_sample_rejected( + ::DDS::DataReader* reader, + const ::DDS::SampleRejectedStatus& status); + + virtual void on_subscription_matched( + ::DDS::DataReader* reader, + const ::DDS::SubscriptionMatchedStatus& status); + + virtual void on_data_on_readers( + ::DDS::Subscriber* subscriber); + + virtual void on_requested_deadline_missed ( + ::DDS::DataReader_ptr , + const ::DDS::RequestedDeadlineMissedStatus & ); + + virtual void on_data_available ( + ::DDS::DataReader_ptr ); + + virtual void on_sample_lost ( + ::DDS::DataReader_ptr , + const ::DDS::SampleLostStatus & ); + + static ::DDS::StatusMask get_mask ( + ::CCM_DDS::ConnectorStatusListener_ptr csl); + + private: + typename CCM_TYPE::context_type::_var_type context_; + + virtual void on_unexpected_status( + ::DDS::Entity_ptr entity, + ::DDS::StatusKind status_kind); + + ::CCM_DDS::ConnectorStatusListener_var error_listener_; + + ACE_Reactor* reactor_; + }; + } +} + +#include "dds4ccm/impl/ndds/SubscriberListener_T.cpp" + +#endif /* DDS_SUBSCRIBERLISTENER_T_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h new file mode 100644 index 00000000000..0460ac99fa7 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h @@ -0,0 +1,59 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_SUBSCRIBERQOS_H +#define DDS4CCM_SUBSCRIBERQOS_H + +#include "EntityFactoryQosPolicy.h" +#include "GroupDataQosPolicy.h" +#include "PartitionQosPolicy.h" +#include "PresentationQosPolicy.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::SubscriberQos DDS_SubscriberQos; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::SubscriberQos &ddsqos, const ::DDS_SubscriberQos & qos) +{ + ddsqos.presentation <<= qos.presentation; + ddsqos.partition <<= qos.partition; + ddsqos.group_data <<= qos.group_data; + ddsqos.entity_factory <<= qos.entity_factory; +} + +inline void +operator<<= (::DDS_SubscriberQos &ddsqos, const ::DDS::SubscriberQos & qos) +{ + 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; +} + +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/ndds/SubscriptionMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h new file mode 100644 index 00000000000..01a6f04c5e7 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h @@ -0,0 +1,62 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H +#define DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H + +#include "InstanceHandle_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::SubscriptionMatchedStatus DDS_SubscriptionMatchedStatus; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::SubscriptionMatchedStatus &ddsstatus, const ::DDS_SubscriptionMatchedStatus & status) +{ + 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<<= (::DDS_SubscriptionMatchedStatus &ddsstatus, const ::DDS::SubscriptionMatchedStatus & status) +{ + 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; +} + +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/ndds/TimeBasedFilterQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h new file mode 100644 index 00000000000..19aaaf31251 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h @@ -0,0 +1,44 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H +#define DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H + +#include "Duration_t.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::TimeBasedFilterQosPolicy DDS_TimeBasedFilterQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::TimeBasedFilterQosPolicy &ddsqos, const ::DDS_TimeBasedFilterQosPolicy & qos) +{ + ddsqos.minimum_separation <<= qos.minimum_separation; +} + +inline void +operator<<= (::DDS_TimeBasedFilterQosPolicy &ddsqos, const ::DDS::TimeBasedFilterQosPolicy & qos) +{ + 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/ndds/TimeUtilities.h b/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h new file mode 100644 index 00000000000..1ebb682c1b9 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h @@ -0,0 +1,48 @@ +// $Id$ + +//============================================================================= +/** + * @file TimeUtilities.h + * + * $Id$ + * + * @author Marcel Smit + */ +//============================================================================= + + +#ifndef DDS4CCM_TIME_UTILITIES_H +#define DDS4CCM_TIME_UTILITIES_H + +#include "ace/Time_Value.h" +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" + +inline void +operator<<= (::DDS::Time_t & dds_time, const ::ACE_Time_Value & ace_time) +{ + dds_time.sec = static_cast < ::CORBA::Long> (ace_time.sec ()); + dds_time.nanosec = ace_time.usec () * 1000; +} + +inline void +operator<<= (::ACE_Time_Value & ace_time, const ::DDS::Time_t &dds_time) +{ + ace_time.sec (dds_time.sec); + 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/ndds/Time_t.h b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h new file mode 100644 index 00000000000..a78b01a4058 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h @@ -0,0 +1,41 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_TIME_T_H +#define DDS4CCM_TIME_T_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::Time_t DDS_Time_t; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::Time_t &ddstime, const ::DDS_Time_t & time) +{ + ddstime.sec = time.sec; + ddstime.nanosec = time.nanosec; +} + +inline void +operator<<= (::DDS_Time_t &ddstime, const ::DDS::Time_t & time) +{ + ddstime.sec = time.sec; + 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/ndds/Topic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp new file mode 100644 index 00000000000..935db7d77e3 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp @@ -0,0 +1,214 @@ +// $Id$ + +#include "Topic.h" +#include "ContentFilteredTopic.h" +#include "StatusCondition.h" +#include "TopicListener.h" +#include "InstanceHandle_t.h" +#include "InconsistentTopicStatus.h" +#include "TopicQos.h" +#include "dds4ccm/impl/logger/Log_Macros.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_Topic_i::CCM_DDS_Topic_i (DDSTopic* topic) + : impl_ (topic) + { + } + + CCM_DDS_Topic_i::~CCM_DDS_Topic_i (void) + { + } + + ::DDS::ReturnCode_t + CCM_DDS_Topic_i::set_qos (const ::DDS::TopicQos &qos) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_TopicQos ddsqos; + ddsqos <<= qos; + return this->impl ()->set_qos (ddsqos); +#else + return this->impl ()->set_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_Topic_i::get_qos (::DDS::TopicQos &qos) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_TopicQos ddsqos; + ::DDS_ReturnCode_t const retval = this->impl ()->get_qos (ddsqos); + qos <<= ddsqos; + return retval; +#else + return this->impl ()->get_qos (qos); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_Topic_i::set_listener ( + ::DDS::TopicListener_ptr a_listener, + ::DDS::StatusMask mask) + { + DDS4CCM_TRACE ("CCM_DDS_Topic_i::set_listener"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + CCM_DDS_TopicListener_i *rti_impl_list = 0; + if (!CORBA::is_nil (a_listener)) + { + ACE_NEW_THROW_EX (rti_impl_list, + CCM_DDS_TopicListener_i (a_listener), + CORBA::NO_MEMORY ()); + } + return this->impl ()->set_listener (rti_impl_list, mask); +#else + return this->impl ()->set_listener (a_listener, mask); +#endif + } + + ::DDS::TopicListener_ptr + CCM_DDS_Topic_i::get_listener (void) + { + DDS4CCM_TRACE ("CCM_DDS_Topic_i::get_listener"); + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSTopicListener *rti_topic_list = this->impl ()->get_listener (); + CCM_DDS_TopicListener_i *list_proxy = dynamic_cast (rti_topic_list); + if (!list_proxy) + { + DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Topic_i::get_listener - " + "DDS returned a NIL listener.\n")); + return ::DDS::TopicListener::_nil (); + } + return list_proxy->get_topiclistener (); +#else + return this->impl ()->get_listener (); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_Topic_i::get_inconsistent_topic_status ( + ::DDS::InconsistentTopicStatus & a_status) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDS_InconsistentTopicStatus ddsstatus; + ::DDS::ReturnCode_t const retval = this->impl ()->get_inconsistent_topic_status (ddsstatus); + a_status <<= ddsstatus;; + return retval; +#else + return this->impl ()->get_inconsistent_topic_status (a_status); +#endif + } + + ::DDS::ReturnCode_t + CCM_DDS_Topic_i::enable (void) + { + return this->impl ()->enable (); + } + + ::DDS::StatusCondition_ptr + CCM_DDS_Topic_i::get_statuscondition (void) + { + ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSStatusCondition* sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc), + CORBA::NO_MEMORY ()); +#else + ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); + ACE_NEW_THROW_EX (retval, + CCM_DDS_StatusCondition_i (sc.in ()), + CORBA::NO_MEMORY ()); +#endif + return retval._retn (); + } + + ::DDS::StatusMask + CCM_DDS_Topic_i::get_status_changes (void) + { + return this->impl ()->get_status_changes (); + } + + ::DDS::InstanceHandle_t + CCM_DDS_Topic_i::get_instance_handle (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle (); + ::DDS::InstanceHandle_t handle; + handle <<= rtihandle; + return handle; +#else + return this->impl ()->get_instance_handle (); +#endif + } + + char * + CCM_DDS_Topic_i::get_type_name (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + return CORBA::string_dup (this->impl ()->get_type_name ()); +#else + return this->impl ()->get_type_name (); +#endif + } + + char * + CCM_DDS_Topic_i::get_name (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + return CORBA::string_dup (this->impl ()->get_name ()); +#else + return this->impl ()->get_name (); +#endif + } + + ::DDS::DomainParticipant_ptr + CCM_DDS_Topic_i::get_participant (void) + { + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDomainParticipant* p = this->impl ()->get_participant (); + if (p) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p), + CORBA::NO_MEMORY ()); + } +#else + ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); + if (!CORBA::is_nil (p.in ())) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p.in ()), + CORBA::NO_MEMORY ()); + } +#endif + return retval._retn (); + } + + DDSTopic * + CCM_DDS_Topic_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_Topic_i::set_impl (DDSTopic * topic) + { + this->impl_ = topic; + } + + DDSTopic * + CCM_DDS_Topic_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; + } + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.h b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h new file mode 100644 index 00000000000..20b40839cd9 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h @@ -0,0 +1,83 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef CIAO_NDDS_TOPIC_H +#define CIAO_NDDS_TOPIC_H + +#include "DomainParticipant.h" + +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" +#include "tao/LocalObject.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::Topic DDSTopic; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_Topic_i : + public virtual ::DDS::CCM_Topic, + public virtual ::CORBA::LocalObject + { + public: + /// Constructor + CCM_DDS_Topic_i (DDSTopic* topic); + + /// Destructor + virtual ~CCM_DDS_Topic_i (void); + + virtual ::DDS::ReturnCode_t set_qos (const ::DDS::TopicQos & qos); + + virtual ::DDS::ReturnCode_t get_qos (::DDS::TopicQos & qos); + + virtual ::DDS::ReturnCode_t set_listener ( + ::DDS::TopicListener_ptr a_listener, + ::DDS::StatusMask mask); + + virtual ::DDS::TopicListener_ptr get_listener (void); + + virtual ::DDS::ReturnCode_t get_inconsistent_topic_status ( + ::DDS::InconsistentTopicStatus & a_status); + + virtual + ::DDS::ReturnCode_t enable (void); + + virtual + ::DDS::StatusCondition_ptr get_statuscondition (void); + + virtual + ::DDS::StatusMask get_status_changes (void); + + virtual + ::DDS::InstanceHandle_t get_instance_handle (void); + + virtual + char * get_type_name (void); + + virtual + char * get_name (void); + + virtual + ::DDS::DomainParticipant_ptr get_participant (void); + + DDSTopic * get_impl (void); + + void set_impl (DDSTopic* topic); + + private: + DDSTopic * impl_; + + DDSTopic * impl (void); + }; + } +} + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h new file mode 100644 index 00000000000..0769149068f --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h @@ -0,0 +1,51 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_TOPICDATAQOSPOLICY_H +#define DDS4CCM_TOPICDATAQOSPOLICY_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::TopicDataQosPolicy DDS_TopicDataQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::TopicDataQosPolicy &ddsqos, const ::DDS_TopicDataQosPolicy & qos) +{ + // @todo + ACE_UNUSED_ARG (ddsqos); + ACE_UNUSED_ARG (qos); +// ddsqos.value = qos.value; +} + +inline void +operator<<= (::DDS_TopicDataQosPolicy &ddsqos, const ::DDS::TopicDataQosPolicy & qos) +{ + 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/ndds/TopicDescription.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp new file mode 100644 index 00000000000..95a71927d4c --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp @@ -0,0 +1,90 @@ +// $Id$ + +#include "TopicDescription.h" +#include "DomainParticipant.h" + +#include "dds4ccm/idl/dds4ccm_BaseC.h" + +#include "dds4ccm/impl/logger/Log_Macros.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_TopicDescription_i::CCM_DDS_TopicDescription_i ( + DDSTopicDescription * rc) : impl_ (rc) + { + } + + CCM_DDS_TopicDescription_i::~CCM_DDS_TopicDescription_i (void) + { + } + + char * + CCM_DDS_TopicDescription_i::get_type_name (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + return CORBA::string_dup (this->impl ()->get_type_name ()); +#else + return this->impl ()->get_type_name (); +#endif + } + + char * + CCM_DDS_TopicDescription_i::get_name (void) + { +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + return CORBA::string_dup (this->impl ()->get_name ()); +#else + return this->impl ()->get_name (); +#endif + } + + ::DDS::DomainParticipant_ptr + CCM_DDS_TopicDescription_i::get_participant (void) + { + ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + DDSDomainParticipant* p = this->impl ()->get_participant (); + if (p) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p), + CORBA::NO_MEMORY ()); + } +#else + ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); + if (!CORBA::is_nil (p.in ())) + { + ACE_NEW_THROW_EX (retval, + CCM_DDS_DomainParticipant_i (p.in ()), + CORBA::NO_MEMORY ()); + } +#endif + return retval._retn (); + } + + DDSTopicDescription * + CCM_DDS_TopicDescription_i::get_impl (void) + { + return this->impl_; + } + + void + CCM_DDS_TopicDescription_i::set_impl (DDSTopicDescription * rc) + { + this->impl_ = rc; + } + + DDSTopicDescription * + CCM_DDS_TopicDescription_i::impl (void) + { + if (!this->impl_) + { + throw ::CORBA::BAD_INV_ORDER (); + } + return this->impl_; + } + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h new file mode 100644 index 00000000000..e00754ba14e --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h @@ -0,0 +1,63 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef CIAO_DDS4CCM_TOPICDESCRIPTION_H +#define CIAO_DDS4CCM_TOPICDESCRIPTION_H + +#include "tao/LocalObject.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsEC.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h" + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +#include "ndds/ndds_cpp.h" +#endif + +#include "tao/LocalObject.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::TopicDescription DDSTopicDescription; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_TopicDescription_i : + public virtual ::DDS::CCM_TopicDescription, + public virtual ::CORBA::LocalObject + { + public: + /// Constructor + CCM_DDS_TopicDescription_i (DDSTopicDescription * rc); + + /// Destructor + virtual ~CCM_DDS_TopicDescription_i (void); + + virtual char * get_type_name (void); + + virtual char * get_name (void); + + virtual ::DDS::DomainParticipant_ptr get_participant (void); + + DDSTopicDescription * get_impl (void); + + void set_impl (DDSTopicDescription * rc); + + private: + DDSTopicDescription * impl_; + + DDSTopicDescription * impl (void); + }; + } +} + +#endif /* CIAO_DDS4CCM_TOPICDESCRIPTION_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp new file mode 100644 index 00000000000..0a2b0f673a8 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp @@ -0,0 +1,48 @@ +// $Id$ + +#include "TopicListener.h" +#include "Topic.h" +#include "InconsistentTopicStatus.h" + +#include "dds4ccm/idl/dds4ccm_BaseC.h" + +#include "dds4ccm/impl/logger/Log_Macros.h" + +namespace CIAO +{ + namespace DDS4CCM + { + CCM_DDS_TopicListener_i::CCM_DDS_TopicListener_i (::DDS::TopicListener_ptr p) + : impl_ (::DDS::TopicListener::_duplicate (p)) + { + } + + CCM_DDS_TopicListener_i::~CCM_DDS_TopicListener_i (void) + { + } + + void + CCM_DDS_TopicListener_i::on_inconsistent_topic ( + ::DDSTopic* the_topic, + const ::DDS_InconsistentTopicStatus & status) + { + ::DDS::Topic_var dds_topic = ::DDS::Topic::_nil (); + ACE_NEW (dds_topic, + CCM_DDS_Topic_i (the_topic)); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + ::DDS::InconsistentTopicStatus ddsstatus; + ddsstatus <<= status; + this->impl_->on_inconsistent_topic (dds_topic.in (), ddsstatus); +#else + this->impl_->on_inconsistent_topic (dds_topic.in (), status); +#endif + } + + ::DDS::TopicListener_ptr + CCM_DDS_TopicListener_i::get_topiclistener (void) + { + return ::DDS::TopicListener::_duplicate (this->impl_.in ()); + } + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h new file mode 100644 index 00000000000..e991ac8257e --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h @@ -0,0 +1,52 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_TOPICLISTENER_H +#define DDS4CCM_TOPICLISTENER_H + +#include "tao/LocalObject.h" + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm_ndds_impl_export.h" + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +# include "ndds/ndds_cpp.h" +#endif + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::TopicListener DDSTopicListener; +typedef ::DDS::Topic DDSTopic; +typedef ::DDS::InconsistentTopicStatus DDS_InconsistentTopicStatus; +#endif + +namespace CIAO +{ + namespace DDS4CCM + { + class DDS4CCM_NDDS_IMPL_Export CCM_DDS_TopicListener_i : + public virtual ::DDSTopicListener + { + public: + /// Constructor + CCM_DDS_TopicListener_i (::DDS::TopicListener_ptr p); + + /// Destructor + virtual ~CCM_DDS_TopicListener_i (void); + + virtual void on_inconsistent_topic( + ::DDSTopic* topic, + const ::DDS_InconsistentTopicStatus& status); + + ::DDS::TopicListener_ptr get_topiclistener (void); + private: + ::DDS::TopicListener_var impl_; + }; + } +} + +#endif /* DDS4CCM_TOPICLISTENER_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.cpp new file mode 100644 index 00000000000..2f018babcf5 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.cpp @@ -0,0 +1,78 @@ +// $Id$ +#include "dds4ccm/impl/ndds/Utils.h" + +#include "dds4ccm/impl/ndds/Topic.h" +#include "dds4ccm/impl/ndds/DDSCallbackStatusHandler.h" +#include "dds4ccm/impl/logger/Log_Macros.h" + +template +CIAO::DDS4CCM::TopicListener_T::TopicListener_T ( + ::CCM_DDS::ConnectorStatusListener_ptr error_listener, + ACE_Reactor* reactor) : + error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)), + reactor_ (reactor) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::TopicListener_T"); +} + +template +CIAO::DDS4CCM::TopicListener_T::~TopicListener_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::~TopicListener_T"); +} + +template +void +CIAO::DDS4CCM::TopicListener_T::on_inconsistent_topic ( + ::DDS::Topic_ptr the_topic, + const ::DDS::InconsistentTopicStatus & status) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::on_inconsistent_topic"); + + DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO + ACE_TEXT ("TopicListener_T::on_inconsistent_topic: ") + ACE_TEXT ("total count <%d> - total change <%d> - "), + status.total_count, status.total_count_change)); + + if (!CORBA::is_nil (this->error_listener_.in ())) + { + if (this->reactor_) + { + ::CIAO::DDS4CCM::OnInconsistentTopicHandler* rh = 0; + ACE_NEW (rh, + ::CIAO::DDS4CCM::OnInconsistentTopicHandler ( + this->error_listener_, + the_topic, + status)); + ACE_Event_Handler_var safe_handler (rh); + if (this->reactor_->notify (rh) != 0) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO + ACE_TEXT ("TopicListener_T::on_inconsistent_topic: ") + ACE_TEXT ("failed to use reactor.\n"))); + } + } + else + { + this->error_listener_->on_inconsistent_topic (the_topic, status); + } + } +} + +template +::DDS::StatusMask +CIAO::DDS4CCM::TopicListener_T::get_mask ( + CCM_DDS::ConnectorStatusListener_ptr error_listener) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::get_mask"); + + if (!CORBA::is_nil (error_listener) || CIAO_debug_level >= 10) + { + return ::DDS::INCONSISTENT_TOPIC_STATUS; + } + else + { + return 0; + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.h new file mode 100644 index 00000000000..1fdb833b885 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.h @@ -0,0 +1,47 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Copy_Disabled.h" + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL +class ACE_Reactor; +ACE_END_VERSIONED_NAMESPACE_DECL + +namespace CIAO +{ + namespace DDS4CCM + { + template + class TopicListener_T : + public ::DDS::TopicListener, + private ACE_Copy_Disabled + { + public: + /// Constructor + TopicListener_T (::CCM_DDS::ConnectorStatusListener_ptr error_listener, + ACE_Reactor* reactor); + + /// Destructor + virtual ~TopicListener_T (void); + + virtual void on_inconsistent_topic ( + ::DDS::Topic_ptr the_topic, + const ::DDS::InconsistentTopicStatus & status); + + static ::DDS::StatusMask get_mask ( + CCM_DDS::ConnectorStatusListener_ptr error_listener); + + private: + CCM_DDS::ConnectorStatusListener_var error_listener_; + ACE_Reactor* reactor_; + }; + } +} + +#include "dds4ccm/impl/ndds/TopicListener_T.cpp" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h new file mode 100644 index 00000000000..f26f376dd6c --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h @@ -0,0 +1,104 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_TOPICQOS_H +#define DDS4CCM_TOPICQOS_H + +#include "TopicDataQosPolicy.h" +#include "DurabilityQosPolicy.h" +#include "DurabilityServiceQosPolicy.h" +#include "DeadlineQosPolicy.h" +#include "LatencyBudgetQosPolicy.h" +#include "LivelinessQosPolicy.h" +#include "ReliabilityQosPolicy.h" +#include "DestinationOrderQosPolicy.h" +#include "HistoryQosPolicy.h" +#include "ResourceLimitsQosPolicy.h" +#include "TransportPriorityQosPolicy.h" +#include "LifespanQosPolicy.h" +#include "OwnershipQosPolicy.h" + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::TopicQos DDS_TopicQos; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::TopicQos &ddsqos, const ::DDS_TopicQos & qos) +{ + 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<<= (::DDS_TopicQos &ddsqos, const ::DDS::TopicQos & qos) +{ + 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; +} + +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/ndds/TransportPriorityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h new file mode 100644 index 00000000000..7778cdce0d5 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h @@ -0,0 +1,42 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H +#define DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::TransportPriorityQosPolicy DDS_TransportPriorityQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::TransportPriorityQosPolicy &ddsqos, const ::DDS_TransportPriorityQosPolicy & qos) +{ + ddsqos.value <<= qos.value; +} + +inline void +operator<<= (::DDS_TransportPriorityQosPolicy &ddsqos, const ::DDS::TransportPriorityQosPolicy & qos) +{ + 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/ndds/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp new file mode 100644 index 00000000000..da03259c7ab --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp @@ -0,0 +1,304 @@ +// $Id$ + +#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 +CIAO::DDS4CCM::Updater_T::Updater_T (void) + : InstanceHandleManager_T (), + is_global_scope_ (false), + is_coherent_write_ (false) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::Updater_T"); +} + +template +CIAO::DDS4CCM::Updater_T::~Updater_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::~Updater_T"); +} + +template +bool +CIAO::DDS4CCM::Updater_T::is_global_scope () +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_global_scope"); + return this->is_global_scope_; +} + +template +bool +CIAO::DDS4CCM::Updater_T::is_coherent_write () +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_coherent_write"); + return this->is_coherent_write_; +} + +template +void +CIAO::DDS4CCM::Updater_T::is_coherent_write (bool value) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_coherent_write"); + this->is_coherent_write_ = value; +} + +template +void +CIAO::DDS4CCM::Updater_T::create_i ( + const typename DDS_TYPE::value_type & an_instance, + ::CCM_DDS::DataNumber_t index) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_i"); + DDS_InstanceHandle_t const hnd = this->impl ()->register_instance (an_instance); + if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) + { + DDS4CCM_ERROR (1, (LM_ERROR, + ACE_TEXT ("CIAO::DDS4CCM::Updater_T::create_i: ") + ACE_TEXT ("Unable to unregister instance, nil handle.\n"))); + throw CCM_DDS::InternalError (::DDS_RETCODE_ERROR, index); + } + ::DDS_ReturnCode_t const result = this->impl ()->write (an_instance, hnd); + if (result != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, + ACE_TEXT ("CIAO::DDS4CCM::Updater_T::create_i: ") + ACE_TEXT ("Unable to update data, error %C.\n"), + translate_retcode (result))); + throw CCM_DDS::InternalError (result, index); + } +} + +template +void +CIAO::DDS4CCM::Updater_T::create_one ( + const typename DDS_TYPE::value_type & an_instance) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_one"); + DDS_InstanceHandle_t const hnd = this->impl ()->lookup_instance (an_instance); + if (!DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) + { + throw CCM_DDS::AlreadyCreated (0); + } + + this->create_i (an_instance, 0); +} + +template +void +CIAO::DDS4CCM::Updater_T::update_i ( + const typename DDS_TYPE::value_type & an_instance, + const ::DDS::InstanceHandle_t & instance_handle, + ::CCM_DDS::DataNumber_t index) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_i"); + DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; + hnd <<= instance_handle; + ::DDS_ReturnCode_t const result = this->impl ()->write (an_instance, hnd); + if (result != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, + ACE_TEXT ("CIAO::DDS4CCM::Updater_T::update_i: ") + ACE_TEXT ("Unable to update data, error %C.\n"), + translate_retcode (result))); + throw CCM_DDS::InternalError (result, index); + } +} + +template +void +CIAO::DDS4CCM::Updater_T::update_one ( + const typename DDS_TYPE::value_type & an_instance, + const ::DDS::InstanceHandle_t & instance_handle) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_one"); + DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; + hnd <<= instance_handle; + if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) + { + hnd = this->impl ()->lookup_instance (an_instance); + } + else + { + // Check explicitly if the instance handle matches the instance, this + // is not checked by RTI DDS + DDS_InstanceHandle_t const instance_handle = + this->impl ()->lookup_instance (an_instance); + + if (!DDS_InstanceHandle_equals (&hnd, &instance_handle)) + { + throw CCM_DDS::InternalError (::DDS_RETCODE_BAD_PARAMETER, 0); + } + } + if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) + { + throw CCM_DDS::NonExistent (0); + } + this->update_i (an_instance, instance_handle, 0); +} + +template +void +CIAO::DDS4CCM::Updater_T::delete_i ( + const typename DDS_TYPE::value_type & an_instance, + const ::DDS::InstanceHandle_t & instance_handle, + ::CCM_DDS::DataNumber_t index) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_i"); + DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; + hnd <<= instance_handle; + ::DDS_ReturnCode_t result = this->impl ()->dispose (an_instance, hnd); + if (result != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, + ACE_TEXT ("CIAO::DDS4CCM::Updater_T::delete_i: ") + ACE_TEXT ("Unable to dispose instance, error %C.\n"), + translate_retcode (result))); + throw CCM_DDS::InternalError (result, index); + } + result = + this->impl ()->unregister_instance (an_instance, hnd); + if (result != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, + ACE_TEXT ("CIAO::DDS4CCM::Updater_T::delete_i: ") + ACE_TEXT ("Unable to unregister instance, error %C.\n"), + translate_retcode (result))); + throw CCM_DDS::InternalError (result, index); + } +} + +template +void +CIAO::DDS4CCM::Updater_T::delete_one ( + const typename DDS_TYPE::value_type & an_instance, + const ::DDS::InstanceHandle_t & instance_handle) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_one"); + DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; + hnd <<= instance_handle; + if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) + { + hnd = this->impl ()->lookup_instance (an_instance); + } + else + { + // Check explicitly if the instance handle matches the instance, this + // is not checked by RTI DDS + DDS_InstanceHandle_t const instance_handle = + this->impl ()->lookup_instance (an_instance); + + if (!DDS_InstanceHandle_equals (&hnd, &instance_handle)) + { + throw CCM_DDS::InternalError (::DDS_RETCODE_BAD_PARAMETER, 0); + } + } + if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) + { + throw CCM_DDS::NonExistent (0); + } + this->delete_i (an_instance, instance_handle, 0); +} + +template +void +CIAO::DDS4CCM::Updater_T::create_many ( + const typename CCM_TYPE::seq_type& data) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_many"); + + // Check for existance of instances + this->check_already_created (data); + + Coherent_Changes_Guard guard (this->impl ()->get_publisher(), + this->is_coherent_write_); + + for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) + { + this->create_i (data[index], index); + } +} + +template +void +CIAO::DDS4CCM::Updater_T::check_existent ( + const typename CCM_TYPE::seq_type& data) +{ + ::CCM_DDS::NonExistent exception; + for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) + { + DDS_InstanceHandle_t const hnd = this->impl ()->lookup_instance (data[index]); + if (::DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) + { + CORBA::ULong const length = exception.indexes.length (); + exception.indexes.length (length + 1); + exception.indexes[length] = index; + } + } + + if (exception.indexes.length () > 0) + { + throw exception; + } +} + +template +void +CIAO::DDS4CCM::Updater_T::check_already_created ( + const typename CCM_TYPE::seq_type& data) +{ + ::CCM_DDS::AlreadyCreated exception; + for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) + { + DDS_InstanceHandle_t const hnd = this->impl ()->lookup_instance (data[index]); + if (!::DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) + { + CORBA::ULong const length = exception.indexes.length (); + exception.indexes.length (length + 1); + exception.indexes[length] = index; + } + } + + if (exception.indexes.length () > 0) + { + throw exception; + } +} + +template +void +CIAO::DDS4CCM::Updater_T::update_many ( + const typename CCM_TYPE::seq_type& data) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_many"); + + // Check for existance of instances + this->check_existent (data); + + Coherent_Changes_Guard guard (this->impl ()->get_publisher(), this->is_coherent_write_); + + for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) + { + this->update_i (data[index], ::DDS::HANDLE_NIL, index); + } +} + +template +void +CIAO::DDS4CCM::Updater_T::delete_many ( + const typename CCM_TYPE::seq_type& data) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_many"); + + // Check for existance of instances + this->check_existent (data); + + Coherent_Changes_Guard guard (this->impl ()->get_publisher(), this->is_coherent_write_); + + for (typename CCM_TYPE::seq_type::size_type index = 0; index < data.length (); index++) + { + this->delete_i (data[index], ::DDS::HANDLE_NIL, index); + } +} + diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h new file mode 100644 index 00000000000..49ab380604e --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h @@ -0,0 +1,86 @@ +/** + * @author Marcel Smit + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_UPDATER_H +#define DDS4CCM_UPDATER_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Copy_Disabled.h" +#include "InstanceHandleManager_T.h" + +namespace CIAO +{ + namespace DDS4CCM + { + template + class Updater_T : + public InstanceHandleManager_T + { + public: + /// Constructor + Updater_T (void); + + /// Destructor + virtual ~Updater_T (void); + + virtual void create_one ( + const typename DDS_TYPE::value_type& an_instance); + + virtual void update_one ( + const typename DDS_TYPE::value_type& an_instance, + const ::DDS::InstanceHandle_t & instance_handle); + + virtual void delete_one ( + const typename DDS_TYPE::value_type& an_instance, + const ::DDS::InstanceHandle_t & instance_handle); + + virtual void create_many ( + const typename CCM_TYPE::seq_type& data); + + virtual void update_many ( + const typename CCM_TYPE::seq_type& data); + + virtual void delete_many ( + const typename CCM_TYPE::seq_type& data); + + virtual bool is_global_scope (); + + virtual bool is_coherent_write (); + + virtual void is_coherent_write (bool value_); + + private: + void create_i ( + const typename DDS_TYPE::value_type& an_instance, + ::CCM_DDS::DataNumber_t index); + + void update_i ( + const typename DDS_TYPE::value_type& an_instance, + const ::DDS::InstanceHandle_t & instance_handle, + ::CCM_DDS::DataNumber_t index); + + void delete_i ( + const typename DDS_TYPE::value_type& an_instance, + const ::DDS::InstanceHandle_t & instance_handle, + ::CCM_DDS::DataNumber_t index); + + void check_existent ( + const typename CCM_TYPE::seq_type& data); + + void check_already_created ( + const typename CCM_TYPE::seq_type& data); + + bool is_global_scope_; + bool is_coherent_write_; + }; + } +} + +#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 + * + * $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/ndds/Utils.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp new file mode 100644 index 00000000000..0f270083afb --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp @@ -0,0 +1,10 @@ +// $Id$ + +#include "Utils.h" + +namespace CIAO +{ + namespace DDS4CCM + { + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Utils.h b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h new file mode 100644 index 00000000000..5401a887ce1 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h @@ -0,0 +1,90 @@ +/** + * @file Utils.h + * @author William R. Otte + * + * $Id$ + * + * Misc utility classes for NDDS. + */ + +#ifndef NDDS_UTILS_H +#define NDDS_UTILS_H + +#include "dds4ccm_ndds_impl_export.h" +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" + +namespace CIAO +{ + namespace DDS4CCM + { + inline const char * translate_retcode (::DDS::ReturnCode_t ret) + { +#define RTI_DDS_RETCODE(X) case X: return #X + switch (ret) + { + RTI_DDS_RETCODE (DDS::RETCODE_OK); + RTI_DDS_RETCODE (DDS::RETCODE_ERROR); + RTI_DDS_RETCODE (DDS::RETCODE_UNSUPPORTED); + RTI_DDS_RETCODE (DDS::RETCODE_BAD_PARAMETER); + RTI_DDS_RETCODE (DDS::RETCODE_PRECONDITION_NOT_MET); + RTI_DDS_RETCODE (DDS::RETCODE_OUT_OF_RESOURCES); + RTI_DDS_RETCODE (DDS::RETCODE_NOT_ENABLED); + RTI_DDS_RETCODE (DDS::RETCODE_IMMUTABLE_POLICY); + RTI_DDS_RETCODE (DDS::RETCODE_INCONSISTENT_POLICY); + RTI_DDS_RETCODE (DDS::RETCODE_ALREADY_DELETED); + RTI_DDS_RETCODE (DDS::RETCODE_TIMEOUT); + RTI_DDS_RETCODE (DDS::RETCODE_NO_DATA); + RTI_DDS_RETCODE (DDS::RETCODE_ILLEGAL_OPERATION); + } + return "***Unknown enum value, update RTI::translate_retcode()"; +#undef RTI_DDS_RETCODE + } + + inline const char * translate_statuskind (DDS::StatusKind ret) + { +#define RTI_DDS_RETCODE(X) case X: return #X + switch (ret) + { + RTI_DDS_RETCODE (DDS::INCONSISTENT_TOPIC_STATUS); + RTI_DDS_RETCODE (DDS::OFFERED_DEADLINE_MISSED_STATUS); + RTI_DDS_RETCODE (DDS::REQUESTED_DEADLINE_MISSED_STATUS); + RTI_DDS_RETCODE (DDS::OFFERED_INCOMPATIBLE_QOS_STATUS); + RTI_DDS_RETCODE (DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS); + RTI_DDS_RETCODE (DDS::SAMPLE_LOST_STATUS); + RTI_DDS_RETCODE (DDS::SAMPLE_REJECTED_STATUS); + RTI_DDS_RETCODE (DDS::DATA_ON_READERS_STATUS); + RTI_DDS_RETCODE (DDS::DATA_AVAILABLE_STATUS); + RTI_DDS_RETCODE (DDS::LIVELINESS_LOST_STATUS); + RTI_DDS_RETCODE (DDS::LIVELINESS_CHANGED_STATUS); + RTI_DDS_RETCODE (DDS::PUBLICATION_MATCHED_STATUS); + RTI_DDS_RETCODE (DDS::SUBSCRIPTION_MATCHED_STATUS); + //RTI_DDS_RETCODE (DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS); +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) + RTI_DDS_RETCODE (DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS); +#endif + //RTI_DDS_RETCODE (DDS::DATA_WRITER_CACHE_STATUS); + //RTI_DDS_RETCODE (DDS::DATA_WRITER_PROTOCOL_STATUS); + //RTI_DDS_RETCODE (DDS::DATA_READER_CACHE_STATUS); + //RTI_DDS_RETCODE (DDS::DATA_READER_PROTOCOL_STATUS); + } + return "***Unknown enum value, update RTI::translate_statuskind()"; +#undef RTI_DDS_RETCODE + } + + inline const char * translate_rejectedstatuskind (DDS::SampleRejectedStatusKind ret) + { +#define RTI_DDS_RETCODE(X) case X: return #X + switch (ret) + { + RTI_DDS_RETCODE (DDS::NOT_REJECTED); + RTI_DDS_RETCODE (DDS::REJECTED_BY_INSTANCES_LIMIT); + RTI_DDS_RETCODE (DDS::REJECTED_BY_SAMPLES_LIMIT); + RTI_DDS_RETCODE (DDS::REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT); + } + return "***Unknown enum value, update RTI::translate_rejectedstatuskind()"; +#undef RTI_DDS_RETCODE + } + } +} + +#endif diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h new file mode 100644 index 00000000000..09b32871a32 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h @@ -0,0 +1,42 @@ +/** + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H +#define DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H + +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) +typedef ::DDS::WriterDataLifecycleQosPolicy DDS_WriterDataLifecycleQosPolicy; +#endif + +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +inline void +operator<<= (::DDS::WriterDataLifecycleQosPolicy &ddsqos, const ::DDS_WriterDataLifecycleQosPolicy & qos) +{ + ddsqos.autodispose_unregistered_instances = qos.autodispose_unregistered_instances; +} + +inline void +operator<<= (::DDS_WriterDataLifecycleQosPolicy &ddsqos, const ::DDS::WriterDataLifecycleQosPolicy & qos) +{ + 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/ndds/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp new file mode 100644 index 00000000000..e0a83492589 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp @@ -0,0 +1,96 @@ +// $Id$ + +#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 +CIAO::DDS4CCM::Writer_T::Writer_T (void) + : InstanceHandleManager_T (), + is_coherent_write_ (false) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::Writer_T"); +} + +template +CIAO::DDS4CCM::Writer_T::~Writer_T (void) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::~Writer_T"); +} + +template +void +CIAO::DDS4CCM::Writer_T::write_i ( + const typename DDS_TYPE::value_type& datum, + const ::DDS::InstanceHandle_t& instance_handle, + ::CCM_DDS::DataNumber_t index) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_i"); + + ::DDS_InstanceHandle_t handle = ::DDS_HANDLE_NIL; + handle <<= instance_handle; + DDS_ReturnCode_t const retval = this->impl ()->write (datum, handle); + + if (retval != DDS_RETCODE_OK) + { + DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::Writer_T::write_i - " + "Write unsuccessful, received error code %C\n", + translate_retcode (retval))); + throw CCM_DDS::InternalError (retval, index); + } +} + +template +void +CIAO::DDS4CCM::Writer_T::write_one ( + const typename DDS_TYPE::value_type & an_instance, + const ::DDS::InstanceHandle_t & instance_handle) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_one"); + + this->write_i (an_instance, instance_handle, 0); + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::Writer_T::write_one - " + "Write successful\n")); +} + +template +void +CIAO::DDS4CCM::Writer_T::write_many ( + const typename CCM_TYPE::seq_type& instances) +{ + DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_many"); + + Coherent_Changes_Guard guard (this->impl ()->get_publisher(), + this->is_coherent_write_); + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::Writer_T::write_many - " + "Preparing to write to DDS\n")); + + for (typename CCM_TYPE::seq_type::size_type index = 0; + index < instances.length(); + index++) + { + this->write_i (instances[index], ::DDS::HANDLE_NIL, index); + } + + DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::Writer_T::write_many - " + "Write successful\n")); +} + +template +::CORBA::Boolean +CIAO::DDS4CCM::Writer_T::is_coherent_write (void) +{ + return this->is_coherent_write_; +} + +template +void +CIAO::DDS4CCM::Writer_T::is_coherent_write ( + ::CORBA::Boolean value) +{ + this->is_coherent_write_ = value; +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h new file mode 100644 index 00000000000..2565f8337e8 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h @@ -0,0 +1,55 @@ +/** + * @author William R. Otte + * @author Johnny Willemsen + * + * $Id$ + * + * Wrapper facade for NDDS. + */ + +#ifndef WRITER_T_H +#define WRITER_T_H + +#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ace/Copy_Disabled.h" +#include "InstanceHandleManager_T.h" + +namespace CIAO +{ + namespace DDS4CCM + { + template + class Writer_T : + public InstanceHandleManager_T + { + public: + /// Constructor + Writer_T (void); + + /// Destructor + virtual ~Writer_T (void); + + virtual void write_one ( + const typename DDS_TYPE::value_type& an_instance, + const ::DDS::InstanceHandle_t & instance_handle); + + virtual void write_many ( + const typename CCM_TYPE::seq_type& instances); + + virtual ::CORBA::Boolean is_coherent_write (void); + + virtual void is_coherent_write ( ::CORBA::Boolean value); + + private: + void write_i (const typename DDS_TYPE::value_type& datum, + const ::DDS::InstanceHandle_t& instance_handle, + ::CCM_DDS::DataNumber_t index); + + bool is_coherent_write_; + }; + } +} + +#include "dds4ccm/impl/ndds/Writer_T.cpp" + +#endif /* WRITER_T_H */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h b/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h new file mode 100644 index 00000000000..7ca68d771eb --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl DDS4CCM_NDDS_IMPL +// ------------------------------ +#ifndef DDS4CCM_NDDS_IMPL_EXPORT_H +#define DDS4CCM_NDDS_IMPL_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_NDDS_IMPL_HAS_DLL) +# define DDS4CCM_NDDS_IMPL_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_NDDS_IMPL_HAS_DLL */ + +#if !defined (DDS4CCM_NDDS_IMPL_HAS_DLL) +# define DDS4CCM_NDDS_IMPL_HAS_DLL 1 +#endif /* ! DDS4CCM_NDDS_IMPL_HAS_DLL */ + +#if defined (DDS4CCM_NDDS_IMPL_HAS_DLL) && (DDS4CCM_NDDS_IMPL_HAS_DLL == 1) +# if defined (DDS4CCM_NDDS_IMPL_BUILD_DLL) +# define DDS4CCM_NDDS_IMPL_Export ACE_Proper_Export_Flag +# define DDS4CCM_NDDS_IMPL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define DDS4CCM_NDDS_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* DDS4CCM_NDDS_IMPL_BUILD_DLL */ +# define DDS4CCM_NDDS_IMPL_Export ACE_Proper_Import_Flag +# define DDS4CCM_NDDS_IMPL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define DDS4CCM_NDDS_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* DDS4CCM_NDDS_IMPL_BUILD_DLL */ +#else /* DDS4CCM_NDDS_IMPL_HAS_DLL == 1 */ +# define DDS4CCM_NDDS_IMPL_Export +# define DDS4CCM_NDDS_IMPL_SINGLETON_DECLARATION(T) +# define DDS4CCM_NDDS_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* DDS4CCM_NDDS_IMPL_HAS_DLL == 1 */ + +// Set DDS4CCM_NDDS_IMPL_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (DDS4CCM_NDDS_IMPL_NTRACE) +# if (ACE_NTRACE == 1) +# define DDS4CCM_NDDS_IMPL_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define DDS4CCM_NDDS_IMPL_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !DDS4CCM_NDDS_IMPL_NTRACE */ + +#if (DDS4CCM_NDDS_IMPL_NTRACE == 1) +# define DDS4CCM_NDDS_IMPL_TRACE(X) +#else /* (DDS4CCM_NDDS_IMPL_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define DDS4CCM_NDDS_IMPL_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (DDS4CCM_NDDS_IMPL_NTRACE == 1) */ + +#endif /* DDS4CCM_NDDS_IMPL_EXPORT_H */ + +// End of auto generated file. diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc b/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc new file mode 100644 index 00000000000..1edb2b0195d --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc @@ -0,0 +1,41 @@ +// $Id$ + +project(CIAO_DDS4CCM_NDDS_Impl) : dds4ccm_skel, taolib, ciao_output, ccm_stub, ciao_logger { + + after += DDS4CCM_lem_stub + libs += DDS4CCM_lem_stub + + dynamicflags = DDS4CCM_NDDS_IMPL_BUILD_DLL + macros += BUILDING_NDDS_LIB + Header_Files { + *.h + } + + Template_Files { + *_T.cpp + } + + Source_Files { + Coherent_Changes_Guard.cpp + DataWriter.cpp + DataWriterListener.cpp + DataReader.cpp + DataReaderListener.cpp + DomainParticipant.cpp + DomainParticipantListener.cpp + DomainParticipantFactory.cpp + ContentFilteredTopic.cpp + Topic.cpp + TopicDescription.cpp + Publisher.cpp + PublisherListener.cpp + Subscriber.cpp + SubscriberListener.cpp + StatusCondition.cpp + ReadCondition.cpp + QueryCondition.cpp + Utils.cpp + TopicListener.cpp + DDSCallbackStatusHandler.cpp + } +} 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 OctetSeq; +typedef sequence 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 (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 Atomic_Long; - typedef ACE_Atomic_Op Atomic_ULong; - typedef ACE_Atomic_Op Atomic_Boolean; + typedef ACE_Atomic_Op Atomic_ULong; + typedef ACE_Atomic_Op 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 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 @@ -231,6 +231,17 @@ + + keys + + + tk_ushort + + + 1 + + + iterations @@ -238,7 +249,7 @@ tk_ulong - 1000 + 10000 @@ -249,7 +260,7 @@ tk_ushort - 100 + 2 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 @@ tk_string - HelloTest_Library#LatencyPubQoS + HelloTest_Library#LatencyQoS @@ -144,6 +144,17 @@ + + keys + + + tk_ushort + + + 1 + + + iterations 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 @@ tk_string - HelloTest_Library#LatencySubQoS + HelloTest_Library#LatencyQoS 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. KEEP_ALL_HISTORY_QOS - - VOLATILE_DURABILITY_QOS - true + TRANSIENT_DURABILITY_QOS 1 @@ -72,86 +70,22 @@ RTI Data Distribution Service user manual. LENGTH_UNLIMITED - - VOLATILE_DURABILITY_QOS - true + TRANSIENT_DURABILITY_QOS + - - - - - - RELIABLE_RELIABILITY_QOS - - DURATION_INFINITE_SEC - DURATION_INFINITE_NSEC - - - - KEEP_ALL_HISTORY_QOS - - - - VOLATILE_DURABILITY_QOS - true - - - 1 - 1 - LENGTH_UNLIMITED - 100 - LENGTH_UNLIMITED - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - 100 - 1 - LENGTH_UNLIMITED - 1 - LENGTH_UNLIMITED - - - - VOLATILE_DURABILITY_QOS - true - - - EXCLUSIVE_OWNERSHIP_QOS - - - - - + - RELIABLE_RELIABILITY_QOS - - DURATION_INFINITE_SEC - DURATION_INFINITE_NSEC - - + BEST_EFFORT_RELIABILITY_QOS + KEEP_ALL_HISTORY_QOS - VOLATILE_DURABILITY_QOS - true + TRANSIENT_DURABILITY_QOS 1 @@ -160,12 +94,6 @@ RTI Data Distribution Service user manual. 100 LENGTH_UNLIMITED - - EXCLUSIVE_OWNERSHIP_QOS - - - 2 - 10 @@ -175,7 +103,7 @@ RTI Data Distribution Service user manual. - RELIABLE_RELIABILITY_QOS + BEST_EFFORT_RELIABILITY_QOS KEEP_ALL_HISTORY_QOS @@ -188,12 +116,9 @@ RTI Data Distribution Service user manual. LENGTH_UNLIMITED - - VOLATILE_DURABILITY_QOS - true + TRANSIENT_DURABILITY_QOS - 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 - */ - -#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_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 - */ - -#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 - */ - -#ifndef COHERENT_WRITE_TEST_CONNECTOR_IDL_ -#define COHERENT_WRITE_TEST_CONNECTOR_IDL_ - -#include -#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 - */ - -#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 - -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 - * - * 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 @@ - - - CoherentWrite_Test_Depl_1 - - - ReceiverComponentImplementation - - - - - - component factory - - - tk_string - - - create_CoherentWrite_Test_Receiver_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CoherentWrite_Test_Receiver_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Receiver_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Receiver_exec - - - - - - - CoherentWrite_Test_ConnectorComponentImplementation - - - - - - component factory - - - tk_string - - - create_CoherentWrite_Test_CoherentWrite_Test_Connector_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CoherentWrite_Test_CoherentWrite_Test_Connector_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - CoherentWrite_Test_Connector_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - CoherentWrite_Test_Connector_exec - - - - - - SenderComponentImplementation - - - - - - component factory - - - tk_string - - - create_CoherentWrite_Test_Sender_Impl - - - - - edu.vanderbilt.dre.CIAO.ServantEntrypoint - - - tk_string - - - create_CoherentWrite_Test_Sender_Servant - - - - - edu.vanderbilt.dre.CIAO.ServantArtifact - - - tk_string - - - Sender_svnt - - - - - edu.vanderbilt.dre.CIAO.ExecutorArtifact - - - tk_string - - - Sender_exec - - - - - - ReceiverComponent - ReceiverNode - - - - - nr_runs - - - tk_ushort - - - 5 - - - - - - CoherentWrite_Test_ConnectorComponent - SenderNode - - - - - qos_profile - - - tk_string - - - QueryFilter_Library#QueryFilter_Profile - - - - - topic_name - - - tk_string - - - CoherentWrite_Test - - - - - - CoherentWrite_Test_ConnectorComponent2 - ReceiverNode - - - - - qos_profile - - - tk_string - - - QueryFilter_Library#QueryFilter_Profile - - - - - topic_name - - - tk_string - - - CoherentWrite_Test - - - - - - SenderComponent - SenderNode - - - - - iterations - - - tk_ushort - - - 4 - - - - - - - info_out_data - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_data - false - SimplexReceptacle - - - - push_consumer_data - true - Facet - - - - - - info_out_connector_status_sender - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_out_connector_status - true - Facet - - - - error_listener - false - SimplexReceptacle - - - - - - writer_connection - - edu.dre.vanderbilt.DAnCE.ConnectionType - Local_Interface - - - info_write_data - false - SimplexReceptacle - - - - supplier_data - true - Facet - - - - - - reader_starter - - start_reader - false - SimplexReceptacle - - - - reader_start - true - Facet - - - - - - restart_writer - - writer_restart - false - SimplexReceptacle - - - - restart_writer - true - Facet - - - - - - Sender_exec - - - Sender_exec - - - Sender_svnt - - - Sender_svnt - - - Sender_stub - - - Sender_stub - - - CoherentWrite_Test_Connector_exec - - - CoherentWrite_Test_Connector_exec - - - CoherentWrite_Test_Connector_svnt - - - CoherentWrite_Test_Connector_svnt - - - CoherentWrite_Test_Connector_stub - - - CoherentWrite_Test_Connector_stub - - - Receiver_exec - - - Receiver_exec - - - Receiver_svnt - - - Receiver_svnt - - - Receiver_stub - - - Receiver_stub - - 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 @@ - - - - - - - - - - - RELIABLE_RELIABILITY_QOS - - 10 - 0 - - - - TRANSIENT_DURABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - - 10 - - - - - - - RELIABLE_RELIABILITY_QOS - - - KEEP_ALL_HISTORY_QOS - - - TRANSIENT_LOCAL_DURABILITY_QOS - - - - - \ 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 (dds_dw.in ()); - DDSDataWriter * p = ccm_dds_rd->get_impl (); + DDSDataWriter * p = rti_rd->get_impl (); this->writer_ = dynamic_cast (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 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 (dds_dw.in ()); - DDSDataWriter * p = ccm_dds_rd->get_impl (); + DDSDataWriter * p = rti_rd->get_impl (); this->dds_writer_ = dynamic_cast (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 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 (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 (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 (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 (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 (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 (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 (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 (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 (qos.access_scope) && - dds_qos.coherent_access == - static_cast (qos.coherent_access) && - dds_qos.ordered_access == - static_cast (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 (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 (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 (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 (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 (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 (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 (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 (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 (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_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_Seq; -typedef sequence TopicString_Seq; -typedef sequence TopicArray_Seq; -typedef sequence TopicUnion_Seq; -typedef sequence TopicSeq_Seq; -typedef sequence TopicValuetype_Seq; + typedef sequence TestTopic_Seq; + typedef sequence TopicString_Seq; + typedef sequence TopicArray_Seq; + // typedef sequence TopicUnion_Seq; + typedef sequence 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_seq; + */ -struct TopicSeq { - string key; //@key - test_seq x_seq; + struct test { + short x_test; + string x_teststr; }; + typedef sequence 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_Seq; + typedef sequence TopicString_Seq; + typedef sequence TopicArray_Seq; + // typedef sequence TopicUnion_Seq; + typedef sequence TopicSeq_Seq; -// Sequences -typedef sequence TestTopic_Seq; -typedef sequence TopicString_Seq; -typedef sequence TopicArray_Seq; -typedef sequence TopicUnion_Seq; -typedef sequence TopicSeq_Seq; -typedef sequence 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) { diff --git a/CIAO/examples/BasicSP/descriptors/run_test.pl b/CIAO/examples/BasicSP/descriptors/run_test.pl index 039d8a2cefd..8f071eff54d 100755 --- a/CIAO/examples/BasicSP/descriptors/run_test.pl +++ b/CIAO/examples/BasicSP/descriptors/run_test.pl @@ -208,7 +208,7 @@ 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"); + "-x $cdp_file -k file://$ior_emfile"); $E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ()); for ($i = 0; $i < $$daemons; ++$i) { @@ -237,7 +237,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/examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl b/CIAO/examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl index f8d27e09926..6b0e99a9697 100755 --- a/CIAO/examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl +++ b/CIAO/examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl @@ -81,7 +81,7 @@ $EX = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", #Stop the plan launcher $EX2 = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$emior -x Application-flattened_Unhomed.cdp -s"); + "-k file://$emior -x Application-flattened_Unhomed.cdp"); $Ret6 = $EX->Spawn (); if($Ret6 == -1) { diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl b/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl index 8b4dcd571dd..6b0e99a9697 100755 --- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl +++ b/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl @@ -77,11 +77,11 @@ if ($tg->WaitForFileTimed ($embase, sleep(5); #Start the plan launcher $EX = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x Application-flattened_Unhomed.cdp -k file://$emior "); + "-x Application-flattened_Unhomed.cdp -k file://$emior "); #Stop the plan launcher $EX2 = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$emior -x Application-flattened_Unhomed.cdp -s"); + "-k file://$emior -x Application-flattened_Unhomed.cdp"); $Ret6 = $EX->Spawn (); if($Ret6 == -1) { diff --git a/CIAO/examples/Hello/descriptors/run_test.pl b/CIAO/examples/Hello/descriptors/run_test.pl index f04b61977fe..b039e2b056f 100755 --- a/CIAO/examples/Hello/descriptors/run_test.pl +++ b/CIAO/examples/Hello/descriptors/run_test.pl @@ -200,9 +200,9 @@ $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 -l\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 -l"); + "-x $cdp_file -k file://$ior_emfile"); $E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ()); for ($i = 0; $i < $nr_daemon; ++$i) { @@ -225,10 +225,10 @@ if ($result != 0) { # 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 ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl index 9bab32d7c69..aee24442fc6 100755 --- a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl +++ b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl @@ -188,7 +188,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/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl index e23c532affa..38652fafbcb 100755 --- a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl +++ b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl @@ -188,7 +188,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/examples/Hello/descriptors/run_test_alias.pl b/CIAO/examples/Hello/descriptors/run_test_alias.pl index 4c94292d889..c746f4d80b0 100755 --- a/CIAO/examples/Hello/descriptors/run_test_alias.pl +++ b/CIAO/examples/Hello/descriptors/run_test_alias.pl @@ -228,7 +228,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/examples/Hello/descriptors/run_test_without_ns.pl b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl index d05a213cacd..9428f0be8a0 100755 --- a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl +++ b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl @@ -162,7 +162,7 @@ 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"); + "-x $cdp_file -k file://$ior_emfile"); $E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ()); for ($i = 0; $i < $$daemons; ++$i) { @@ -188,7 +188,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/examples/Null_Component/descriptors/run_test.pl b/CIAO/examples/Null_Component/descriptors/run_test.pl index cc7cc6a72c9..4dbec45bc99 100755 --- a/CIAO/examples/Null_Component/descriptors/run_test.pl +++ b/CIAO/examples/Null_Component/descriptors/run_test.pl @@ -201,13 +201,13 @@ foreach $file (@files) { print "Start dance_plan_launcher.exe with -x $file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $file -k file://$ior_emfile"); + "-x $file -k file://$ior_emfile"); $E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ()); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $file -s"); + "-k file://$ior_emfile -x $file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl b/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl index 109961d44fb..8c7f52d70eb 100755 --- a/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl +++ b/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl @@ -181,7 +181,7 @@ foreach $file (@files) { # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $file -s"); + "-k file://$ior_emfile -x $file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl b/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl index cc7cc6a72c9..4dbec45bc99 100755 --- a/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl +++ b/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl @@ -201,13 +201,13 @@ foreach $file (@files) { print "Start dance_plan_launcher.exe with -x $file -k file://$ior_emfile\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-x $file -k file://$ior_emfile"); + "-x $file -k file://$ior_emfile"); $E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ()); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", - "-k file://$ior_emfile -x $file -s"); + "-k file://$ior_emfile -x $file -q"); $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ()); print "Executor returned.\n"; diff --git a/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl b/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl index e69165188a4..936165ab7b8 100644 --- a/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl +++ b/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl @@ -198,7 +198,7 @@ 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"); + "-x $cdp_file -k file://$ior_emfile"); $E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ()); for ($i = 0; $i < $nr_daemon; ++$i) { @@ -218,7 +218,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/tests/IDL_Test/IDL3_Plus/KitchenSink.idl b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl index 4b41d465363..7fe1f478774 100644 --- a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl +++ b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl @@ -155,11 +155,6 @@ module V }; }; -connector Comp3_T -{ - provides iface Conn_T_Port; -}; - module B::second_B second_B_Inst; module Ast Ast_Inst; -module M +module M { module N { diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b639ca1f787..5c5bf59e101 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,28 +1,6553 @@ -Thu Mar 4 12:01:54 UTC 2010 Johnny Willemsen +Wed Mar 03 01:18:08 CST 2010 Johnny Willemsen - * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * TAO version 1.7.7 released. + +Tue Mar 2 09:58:04 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_visitor_interface.cpp: + * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp: + * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp: + * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp: + * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp: + * TAO_IDL/be_include/be_component.h: + * TAO_IDL/be_include/be_connector.h: + * TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h: + * TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h: + * TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h: + * TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h: + Generate direct and through poa proxy brokers for connectors + +Thu Feb 25 17:04:04 UTC 2010 Jeff Parsons + + * NEWS: + + Updated TAO_IDL cleanup item. + +Thu Feb 25 16:50:09 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp: + * TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp: + * TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp: + * TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp: + * TAO_IDL/be_include/be_visitor_interface/base_proxy_broker_ch.h: + * TAO_IDL/be_include/be_visitor_interface/proxy_brokers_ch.h: + * TAO_IDL/be_include/be_visitor_interface/remote_proxy_impl_ch.h: + * TAO_IDL/be_include/be_visitor_interface/proxy_impls_ch.h: + * TAO_IDL/be_include/be_visitor_interface/base_proxy_impl_ch.h: + * TAO_IDL/be_include/be_visitor_interface/remote_proxy_broker_ch.h: + * TAO_IDL/be_include/be_visitor_interface/remote_proxy_broker_cs.h: + + Removed these files, the visitors are never used. This fix closes + [BUGID:2200]. + +Thu Feb 25 13:19:16 UTC 2010 Vladimir Zykov + + * bin/tao_orb_tests.lst: + Disabled running the test for bug#3827 on single threaded builds + and on CORBA_e_micro builds. + +Thu Feb 25 08:58:47 UTC 2010 Johnny Willemsen + + * tests/IDL_Test/IDL_Test.mpc: + Added no_strict_aliasing for ndds + +Thu Feb 25 08:46:47 UTC 2010 Johnny Willemsen + + * ChangeLogs/*: + Use full year + +Thu Feb 25 08:01:47 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_codegen.cpp: + Fixed argument not used warning + +Wed Feb 24 21:00:11 UTC 2010 Jeff Parsons + + * TAO_IDL/include/idl_global.h: + * TAO_IDL/util/utl_global.cpp: + + Added additional lists to store the filenames gathered + from pragmas specifying DDS typesupport files from + various DDS vendors to include in generated code. + + * TAO_IDL/be/be_codegen.cpp: + + Added more checks for the generation of export header + files. Now a given export header file won't be + generated unless all the command line options are + present for + + - generating the export header file + - specifying the export macro + - specifying the export header file name + + * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: + + Minor change to the format of generated code. + + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/fe/idl.ll: + + Added pragmas for including typesupport files from + other DDS vendors, to ultimately make the generated + connector code portable to any of the C++ DDS vendors. + +Wed Feb 24 16:53:55 UTC 2010 Jeff Parsons + + * TAO_IDL/util/utl_scope.cpp: + + Fixed bug introduced by consolidation of fe_add_* + methods for exceptions. + + * TAO_IDL/be/be_codegen.cpp: + + Fixed compile error on MacOSX due to inappropriate + C++-style cast. + +Wed Feb 24 16:29:51 UTC 2010 Vladimir Zykov + + * tests/Bug_3826_Regression/svc.conf: + * tests/Bug_3826_Regression/run_test.pl: + * tao/TAO_Internal.cpp: + Extended the fix for bug#3826 and adjusted the test. Initial fix + was not complete. If there is a svc.conf which is processed by + ACE unconditionally then it's processed in a global gestalt even + if -ORBGestalt LOCAL is provided. Current change must fix this + behaviour. + +Tue Feb 23 18:55:21 UTC 2010 Yan Dai + + * bin/tao_orb_tests.lst: + + Added Bug_3812_Regression as not fixed test. + + * tests/Bug_3812_Regression/Bug_3812_Regression.cpp: + * tests/Bug_3812_Regression/mock_transport.h: + + Fixed fuzz errors. + +Tue Feb 23 10:35:39 UTC 2010 Vladimir Zykov + + * tao/TAO_Internal.cpp: + Changed a code layout for return values in forward declarations + according to TAO code conventions. Thanks to Johnny Willemsen + for pointing this out. + +Tue Feb 23 09:46:57 UTC 2010 Vladimir Zykov + + * tests/Bug_3827_Regression/test.cpp: + * tests/Bug_3827_Regression/Message.idl: + * tests/Bug_3827_Regression/run_test.pl: + * tests/Bug_3827_Regression/README: + * tests/Bug_3827_Regression/Bug_3827_Regression.mpc: + * tao/ORB_Core.cpp: + * tao/ORB.cpp: + * tao/ORB_Core.h: + Added a test for bug#3827 and fixed it. Now access or changes to + valuetype_adapter_ in ORB_Core is protected by a lock. + + * tests/Bug_3826_Regression/orb_svc.conf: + * tests/Bug_3826_Regression/server.cpp: + * tests/Bug_3826_Regression/README: + * tests/Bug_3826_Regression/Bug_3826_Regression.mpc: + * tests/Bug_3826_Regression/run_test.pl: + * tao/TAO_Internal.cpp: + Added a test for bug#3826 and fixed it. If the first ORB in created + with -ORBGestalt LOCAL it will have a local configuration and this + configuration will not leak into any ORBs created afterwards. + + * bin/tao_orb_tests.lst: + Scheduled tests for bug#3826 and bug#3827 to run in the nightly + builds. + +Mon Feb 22 23:04:23 UTC 2010 Yan Dai + + + * tests/Bug_3812_Regression/Bug_3812_Regression.cpp: + * tests/Bug_3812_Regression/Makefile.am: + * tests/Bug_3812_Regression/mock_ps.h: + * tests/Bug_3812_Regression/mock_tdi.h: + * tests/Bug_3812_Regression/mock_transport.h: + * tests/Bug_3812_Regression/run_test.pl: + + Added a regression test for bugzilla #3812. + +Mon Feb 22 21:20:15 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be_include/be_codegen.h: + + Added random 6-character string to #ifdef guard generation, + to prevent hiding when IDL files have the same name (but + are in different directories, the #ifdef guard uses only + the local filename). + + * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: + + Added logic to check for inheritance from DDS_State or + DDS_Event connectors, to generate inheritance in the + connector impl from the correct Base connector template. + +Mon Feb 22 13:47:47 UTC 2010 Johnny Willemsen + + * TAO_IDL/fe/idl.ll: + * TAO_IDL/fe/lex.yy.cpp: + Updated rti typesupport to ndds typesupport, everywhere we talk + about ndds + +Fri Feb 19 15:16:49 UTC 2010 jeff Parsons + + * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: + + Removed unused variable 'dt_name'. + + * TAO_IDL/fe/fe_component_header.cpp: + * TAO_IDL/fe/fe_extern.cpp: + * TAO_IDL/fe/fe_home_header.cpp: + * TAO_IDL/fe/fe_init.cpp: + * TAO_IDL/fe/fe_interface_header.cpp: + * TAO_IDL/fe/fe_obv_header.cpp: + * TAO_IDL/fe/idl.ll: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/include/idl_global.h: + * TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp: + * TAO_IDL/util/utl_global.cpp: + * TAO_IDL/util/utl_scope.cpp: + * TAO_IDL/ast/ast_attribute.cpp: + * TAO_IDL/ast/ast_check.cpp: + + Reordered #includes to eliminate a circular dependency + introduced by the addition of the template source file + UTL_Scope_T.cpp. + +Fri Feb 19 12:54:47 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: + + Generate an additional boolean that is used to indicate + whether we have a fixed or non fixed type + +Fri Feb 19 08:53:47 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_codegen.cpp: + + Always generate the state connector header, this needs more tweaks + in the near future + +Thu Feb 18 22:53:29 UTC 2010 Jeff Parsons + + * TAO_IDL/include/ast_root.h: + * TAO_IDL/include/ast_valuebox.h: + * TAO_IDL/include/ast_module.h: + * TAO_IDL/include/ast_union_label.h: + * TAO_IDL/include/ast_union.h: + * TAO_IDL/include/ast_interface_fwd.h: + * TAO_IDL/include/ast_structure.h: + * TAO_IDL/include/ast_component_fwd.h: + * TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp: + * TAO_IDL/include/ast_string.h: + * TAO_IDL/include/ast_decl.h: + * TAO_IDL/include/ast_factory.h: + * TAO_IDL/include/ast_valuetype.h: + * TAO_IDL/include/ast_argument.h: + * TAO_IDL/include/ast_eventtype.h: + * TAO_IDL/include/ast_native.h: + * TAO_IDL/include/ast_union_fwd.h: + * TAO_IDL/include/ast_home.h: + * TAO_IDL/include/ast_structure_fwd.h: + * TAO_IDL/include/ast_enum_val.h: + * TAO_IDL/include/ast_sequence.h: + * TAO_IDL/include/ast_valuetype_fwd.h: + * TAO_IDL/include/ast_eventtype_fwd.h: + * TAO_IDL/include/ast_exception.h: + * TAO_IDL/include/ast_attribute.h: + * TAO_IDL/include/ast_enum.h: + * TAO_IDL/include/ast_union_branch.h: + * TAO_IDL/include/ast_type.h: + * TAO_IDL/include/ast_field.h: + * TAO_IDL/include/ast_constant.h: + * TAO_IDL/include/ast_interface.h: + * TAO_IDL/include/ast_operation.h: + * TAO_IDL/include/ast_component.h: + * TAO_IDL/include/ast_concrete_type.h: + * TAO_IDL/include/ast_predefined_type.h: + * TAO_IDL/include/ast_array.h: + * TAO_IDL/be/be_union.cpp: + * TAO_IDL/be/be_interface_fwd.cpp: + * TAO_IDL/be/be_attribute.cpp: + * TAO_IDL/be/be_factory.cpp: + * TAO_IDL/be/be_valuetype.cpp: + * TAO_IDL/be/be_union_fwd.cpp: + * TAO_IDL/be/be_union_branch.cpp: + * TAO_IDL/be/be_valuetype_fwd.cpp: + * TAO_IDL/be/be_type.cpp: + * TAO_IDL/be/be_home.cpp: + * TAO_IDL/be/be_enum_val.cpp: + * TAO_IDL/be/be_mirror_port.cpp: + * TAO_IDL/be/be_valuebox.cpp: + * TAO_IDL/be/be_component.cpp: + * TAO_IDL/be/be_decl.cpp: + * TAO_IDL/be/be_util.cpp: + * TAO_IDL/be/be_eventtype_fwd.cpp: + * TAO_IDL/be/be_expression.cpp: + * TAO_IDL/be/be_typedef.cpp: + * TAO_IDL/be/be_structure.cpp: + * TAO_IDL/be/be_component_fwd.cpp: + * TAO_IDL/be/be_operation_strategy.cpp: + * TAO_IDL/be/be_interface_strategy.cpp: + * TAO_IDL/be/be_field.cpp: + * TAO_IDL/be/be_module.cpp: + * TAO_IDL/be/be_structure_fwd.cpp: + * TAO_IDL/be/be_predefined_type.cpp: + * TAO_IDL/be/be_argument.cpp: + * TAO_IDL/be/be_constant.cpp: + * TAO_IDL/be/be_exception.cpp: + * TAO_IDL/be/be_extended_port.cpp: + * TAO_IDL/be/be_sequence.cpp: + * TAO_IDL/be/be_eventtype.cpp: + * TAO_IDL/be/be_root.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_operation.cpp: + * TAO_IDL/be/be_enum.cpp: + * TAO_IDL/be/be_string.cpp: + * TAO_IDL/be/be_array.cpp: + * TAO_IDL/be/be_template_module.cpp: + * TAO_IDL/be/be_native.cpp: + * TAO_IDL/be/be_porttype.cpp: + * TAO_IDL/be/be_union_label.cpp: + * TAO_IDL/ast/ast_home.cpp: + * TAO_IDL/ast/ast_union_fwd.cpp: + * TAO_IDL/ast/ast_constant.cpp: + * TAO_IDL/ast/ast_structure_fwd.cpp: + * TAO_IDL/ast/ast_operation.cpp: + * TAO_IDL/ast/ast_interface.cpp: + * TAO_IDL/ast/ast_component.cpp: + * TAO_IDL/ast/ast_concrete_type.cpp: + * TAO_IDL/ast/ast_predefined_type.cpp: + * TAO_IDL/ast/ast_enum_val.cpp: + * TAO_IDL/ast/ast_sequence.cpp: + * TAO_IDL/ast/ast_valuetype_fwd.cpp: + * TAO_IDL/ast/ast_array.cpp: + * TAO_IDL/ast/ast_eventtype_fwd.cpp: + * TAO_IDL/ast/ast_root.cpp: + * TAO_IDL/ast/ast_valuebox.cpp: + * TAO_IDL/ast/ast_module.cpp: + * TAO_IDL/ast/ast_union_label.cpp: + * TAO_IDL/ast/ast_union.cpp: + * TAO_IDL/ast/ast_exception.cpp: + * TAO_IDL/ast/ast_interface_fwd.cpp: + * TAO_IDL/ast/ast_structure.cpp: + * TAO_IDL/ast/ast_component_fwd.cpp: + * TAO_IDL/ast/ast_attribute.cpp: + * TAO_IDL/ast/ast_enum.cpp: + * TAO_IDL/ast/ast_union_branch.cpp: + * TAO_IDL/ast/ast_string.cpp: + * TAO_IDL/ast/ast_decl.cpp: + * TAO_IDL/ast/ast_factory.cpp: + * TAO_IDL/ast/ast_valuetype.cpp: + * TAO_IDL/ast/ast_type.cpp: + * TAO_IDL/ast/ast_argument.cpp: + * TAO_IDL/ast/ast_field.cpp: + * TAO_IDL/ast/ast_eventtype.cpp: + * TAO_IDL/ast/ast_native.cpp: + * TAO_IDL/be_include/be_field.h: + * TAO_IDL/be_include/be_interface.h: + * TAO_IDL/be_include/be_operation.h: + * TAO_IDL/be_include/be_component.h: + * TAO_IDL/be_include/be_enum.h: + * TAO_IDL/be_include/be_union_branch.h: + * TAO_IDL/be_include/be_type.h: + * TAO_IDL/be_include/be_union.h: + * TAO_IDL/be_include/be_interface_fwd.h: + * TAO_IDL/be_include/be_component_fwd.h: + * TAO_IDL/be_include/be_root.h: + * TAO_IDL/be_include/be_eventtype.h: + * TAO_IDL/be_include/be_valuebox.h: + * TAO_IDL/be_include/be_union_fwd.h: + * TAO_IDL/be_include/be_predefined_type.h: + * TAO_IDL/be_include/be_argument.h: + * TAO_IDL/be_include/be_union_label.h: + * TAO_IDL/be_include/be_home.h: + * TAO_IDL/be_include/be_exception.h: + * TAO_IDL/be_include/be_attribute.h: + * TAO_IDL/be_include/be_factory.h: + * TAO_IDL/be_include/be_module.h: + * TAO_IDL/be_include/be_string.h: + * TAO_IDL/be_include/be_array.h: + * TAO_IDL/be_include/be_native.h: + * TAO_IDL/be_include/be_constant.h: + * TAO_IDL/be_include/be_structure.h: + * TAO_IDL/be_include/be_typedef.h: + * TAO_IDL/be_include/be_valuetype.h: + * TAO_IDL/be_include/be_structure_fwd.h: + * TAO_IDL/be_include/be_decl.h: + * TAO_IDL/be_include/be_valuetype_fwd.h: + * TAO_IDL/be_include/be_eventtype_fwd.h: + * TAO_IDL/be_include/be_enum_val.h: + * TAO_IDL/be_include/be_sequence.h: + + Removed unused constructors. + + * TAO_IDL/util/utl_scope.cpp: + * TAO_IDL/include/utl_scope.h: + + - Moved static methods inside class UTL_Scope + and removed related static variables. + + - Re-implemented is_global_name() to + eliminate memory leaks and heap allocations. + +Thu Feb 18 20:36:04 UTC 2010 Jeff Parsons + + * TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp: + + New file, containing bodies of some newly + added template methods to class UTL_Scope. + + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/fe/idl.ll: + + Cosmetic changes. + + * TAO_IDL/include/ast_root.h: + * TAO_IDL/include/ast_module.h: + * TAO_IDL/include/ast_valuebox.h: + * TAO_IDL/include/ast_union.h: + * TAO_IDL/include/ast_param_holder.h: + * TAO_IDL/include/ast_structure.h: + * TAO_IDL/include/ast_interface_fwd.h: + * TAO_IDL/include/ast_component_fwd.h: + * TAO_IDL/include/ast_string.h: + * TAO_IDL/include/ast_decl.h: + * TAO_IDL/include/ast_factory.h: + * TAO_IDL/include/ast_template_module_ref.h: + * TAO_IDL/include/ast_valuetype.h: + * TAO_IDL/include/ast_mirror_port.h: + * TAO_IDL/include/ast_argument.h: + * TAO_IDL/include/ast_eventtype.h: + * TAO_IDL/include/ast_native.h: + * TAO_IDL/include/ast_home.h: + * TAO_IDL/include/ast_union_fwd.h: + * TAO_IDL/include/ast_connector.h: + * TAO_IDL/include/ast_provides.h: + * TAO_IDL/include/ast_structure_fwd.h: + * TAO_IDL/include/ast_enum_val.h: + * TAO_IDL/include/ast_finder.h: + * TAO_IDL/include/ast_sequence.h: + * TAO_IDL/include/ast_valuetype_fwd.h: + * TAO_IDL/include/ast_template_module.h: + * TAO_IDL/include/ast_eventtype_fwd.h: + * TAO_IDL/include/ast_exception.h: + * TAO_IDL/include/ast_typedef.h: + * TAO_IDL/include/ast_attribute.h: + * TAO_IDL/include/ast_extended_port.h: + * TAO_IDL/include/ast_enum.h: + * TAO_IDL/include/ast_union_branch.h: + * TAO_IDL/include/ast_template_module_inst. + * TAO_IDL/include/ast_uses.h: + * TAO_IDL/include/ast_field.h: + * TAO_IDL/include/utl_scope.h: + * TAO_IDL/include/ast_porttype.h: + * TAO_IDL/include/ast_constant.h: + * TAO_IDL/include/ast_consumes.h: + * TAO_IDL/include/ast_publishes.h: + * TAO_IDL/include/ast_interface.h: + * TAO_IDL/include/ast_operation.h: + * TAO_IDL/include/ast_component.h: + * TAO_IDL/include/ast_predefined_type.h: + * TAO_IDL/include/ast_array.h: + * TAO_IDL/include/ast_emits.h: + * TAO_IDL/be/be_visitor_union/union.cpp: + * TAO_IDL/be/be_root.cpp: + * TAO_IDL/ast/ast_home.cpp: + * TAO_IDL/ast/ast_union_fwd.cpp: + * TAO_IDL/ast/ast_constant.cpp: + * TAO_IDL/ast/ast_connector.cpp: + * TAO_IDL/ast/ast_provides.cpp: + * TAO_IDL/ast/ast_consumes.cpp: + * TAO_IDL/ast/ast_publishes.cpp: + * TAO_IDL/ast/ast_structure_fwd.cpp: + * TAO_IDL/ast/ast_operation.cpp: + * TAO_IDL/ast/ast_interface.cpp: + * TAO_IDL/ast/ast_component.cpp: + * TAO_IDL/ast/ast_enum_val.cpp: + * TAO_IDL/ast/ast_predefined_type.cpp: + * TAO_IDL/ast/ast_finder.cpp: + * TAO_IDL/ast/ast_sequence.cpp: + * TAO_IDL/ast/ast_array.cpp: + * TAO_IDL/ast/ast_valuetype_fwd.cpp: + * TAO_IDL/ast/ast_template_module.cpp: + * TAO_IDL/ast/ast_emits.cpp: + * TAO_IDL/ast/ast_root.cpp: + * TAO_IDL/ast/ast_eventtype_fwd.cpp: + * TAO_IDL/ast/ast_redef.cpp: + * TAO_IDL/ast/ast_module.cpp: + * TAO_IDL/ast/ast_valuebox.cpp: + * TAO_IDL/ast/ast_union.cpp: + * TAO_IDL/ast/ast_param_holder.cpp: + * TAO_IDL/ast/ast_exception.cpp: + * TAO_IDL/ast/ast_typedef.cpp: + * TAO_IDL/ast/ast_interface_fwd.cpp: + * TAO_IDL/ast/ast_structure.cpp: + * TAO_IDL/ast/ast_component_fwd.cpp: + * TAO_IDL/ast/ast_attribute.cpp: + * TAO_IDL/ast/ast_enum.cpp: + * TAO_IDL/ast/ast_extended_port.cpp: + * TAO_IDL/ast/ast_union_branch.cpp: + * TAO_IDL/ast/ast_string.cpp: + * TAO_IDL/ast/ast_factory.cpp: + * TAO_IDL/ast/ast_template_module_ref.cpp: + * TAO_IDL/ast/ast_template_module_inst.cpp: + * TAO_IDL/ast/ast_valuetype.cpp: + * TAO_IDL/ast/ast_mirror_port.cpp: + * TAO_IDL/ast/ast_uses.cpp: + * TAO_IDL/ast/ast_argument.cpp: + * TAO_IDL/ast/ast_field.cpp: + * TAO_IDL/ast/ast_eventtype.cpp: + * TAO_IDL/ast/ast_native.cpp: + * TAO_IDL/ast/ast_porttype.cpp: + * TAO_IDL/be_include/be_root.h: + * TAO_IDL/util/utl_scope.cpp: + + - Consolidated common code from all fe_add_* + methods into class UTL_Scope. All these + methods had large bodies, and most were + duplicated over several AST_* classes. + To encapsulate the forward declaration and + redefinition properties of AST_Interface + and it forward-declarable subtypes + AST_ValueType, AST_EventType, and + AST_Component), some template methods were + added to UTL_Scope. + + - Static constants were added to each AST_* + class to associated it with its corresponding + NodeType enum value, as an aid to template + programming. + + - Typedefs were added to forward_declarable + types to associate eachtype with its + AST_*Fwd counterpart, as an aid to template + programming. + +Thu Feb 18 14:46:16 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp(gen_connector_traits): + + Fixed bug in code generation of the context class name + when it appears as one of the template arguments in the + connector traits typedef. + +Wed Feb 17 15:13:40 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp(gen_dds_traits): + + Removed unused parameter. + +Tue Feb 16 21:10:35 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: + * TAO_IDL/be/be_visitor_typecode.cpp: + * TAO_IDL/be/be_visitor_component/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_component/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp: + * TAO_IDL/be_include/be_visitor_typecode/objref_typecode.h: + * TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h: + * TAO_IDL/be_include/be_visitor_component/cdr_op_cs.h: + * TAO_IDL/be_include/be_visitor_component/any_op_ch.h: + * TAO_IDL/be_include/be_visitor_component/any_op_cs.h: + * TAO_IDL/be_include/be_visitor_component/cdr_op_ch.h: + + More missing pieces of connector support. + +Tue Feb 16 20:22:15 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_provides.cpp: + * TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp: + * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp: + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_visitor_component/facet_exs.cpp: + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be/be_visitor_component/context_svh.cpp: + * TAO_IDL/be/be_visitor_component/component_ch.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + * TAO_IDL/be/be_visitor_component/executor_exs.cpp: + * TAO_IDL/be/be_visitor_component/context_svs.cpp: + * TAO_IDL/be/be_visitor_component/component_exs.cpp: + * TAO_IDL/be/be_visitor_component/component_svh.cpp: + * TAO_IDL/be/be_visitor_component/component_svs.cpp: + * TAO_IDL/be/be_produce.cpp: + * TAO_IDL/be/be_sequence.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_scope.cpp: + * TAO_IDL/ast/ast_visitor_reifying.cpp: + + - Filled in several small missing pieces of connector + support + + - Removed the check for the presence of components or + connectors that was restricting the AST passes that + generated servant, executor, or connector impl files. + As with skeleton files and the presence of interfaces, + we will just generate empty files even if the relevant + IDL construct is not seen + + - Reversed the order of generation of include files in + the connector implementation header file, so that the + list of lem stub header files (generated from the list + of #pragam ciao lem that is seen in the compilation + unit) comes before the include of DDS_Event_Connector_T.h, + since the latter contains C++ template declarations, + and thus also the associated source file + +Tue Feb 16 14:22:12 UTC 2010 Jeff Parsons + + * TAO_IDL/narrow/narrow.cpp: + + Added missing case to cast a connector to a scope. + +Tue Feb 16 09:16:47 UTC 2010 Johnny Willemsen + + * MPC/modules/IDLHelper.pm: + Handle connector export file + +Mon Feb 15 22:35:26 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_component/component_ih.cpp: + * TAO_IDL/be/be_visitor_component/component_is.cpp: + * TAO_IDL/be_include/be_visitor_component/component_is.h: + * TAO_IDL/be_include/be_visitor_component/component_ih.h: + + Removed these visitors, they are not applicable to + components since their servants aren't hand-written. + + * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp: + * TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h: + + Added base class visitor for class be_visitor_connector_dds_exh + and class be_visitor_connector_dds_exs, to capture common + code. + + * TAO_IDL/be/be_visitor_arg_traits.cpp: + * TAO_IDL/be/be_visitor_component.cpp: + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_visitor_connector.cpp: + * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: + * TAO_IDL/be/be_visitor_component/component_ch.cpp: + * TAO_IDL/be/be_visitor_component/facet_svs.cpp: + * TAO_IDL/be/be_visitor_component/component_ci.cpp: + * TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp: + * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp: + * TAO_IDL/be/be_visitor_component/component_cs.cpp: + * TAO_IDL/be/be_visitor_component/component_sh.cpp: + * TAO_IDL/be/be_visitor_component/component_si.cpp: + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be/be_visitor_component/context_svh.cpp: + * TAO_IDL/be/be_visitor_component/component_ss.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + * TAO_IDL/be/be_visitor_component/context_svs.cpp: + * TAO_IDL/be/be_visitor_component/component_svh.cpp: + * TAO_IDL/be/be_visitor_component/component_svs.cpp: + * TAO_IDL/be/be_visitor_module/module.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/be/be_visitor_traits.cpp: + * TAO_IDL/ast/ast_module.cpp: + * TAO_IDL/be_include/be_visitor_connector.h: + * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: + * TAO_IDL/be_include/be_visitor_component/component_sh.h: + * TAO_IDL/be_include/be_visitor_component/component_si.h: + * TAO_IDL/be_include/be_visitor_component/servant_svh.h: + * TAO_IDL/be_include/be_visitor_component/context_svh.h: + * TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h: + * TAO_IDL/be_include/be_visitor_component/component_ss.h: + * TAO_IDL/be_include/be_visitor_component/servant_svs.h: + * TAO_IDL/be_include/be_visitor_component/context_svs.h: + * TAO_IDL/be_include/be_visitor_component/component_svh.h: + * TAO_IDL/be_include/be_visitor_component/component_svs.h: + * TAO_IDL/be_include/be_visitor_component/facet_svh.h: + * TAO_IDL/be_include/be_visitor_component/context_ex_idl.h: + * TAO_IDL/be_include/be_visitor_component/component_ch.h: + * TAO_IDL/be_include/be_visitor_component/facet_svs.h: + * TAO_IDL/be_include/be_visitor_component/component_ci.h: + * TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h: + * TAO_IDL/be_include/be_visitor_component/component_ex_idl.h: + * TAO_IDL/be_include/be_visitor_component/component_cs.h: + * TAO_IDL/be_include/be_visitor_arg_traits.h: + * TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h: + * TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h: + * TAO_IDL/be_include/be_visitor_traits.h: + * TAO_IDL/be_include/be_visitor_component.h: + + Added visit_connector() methods to all visitors where the + code generation for connectors is the same as that for + components. The visit_connector() methods simply call + visit_component(). + +Mon Feb 15 16:32:24 UTC 2010 Jeff Parsons + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + - Changed connector grammar to allow an empty body + - Removed unused varables + - Added missing AST visitor creation + +Mon Feb 15 12:08:47 UTC 2010 Johnny Willemsen + + * catior/README + * catior/README.catior + * nslist/README + * nslist/README.nslist + Renamed to have the postfix to make packaging and installation easier + +Mon Feb 15 09:35:47 UTC 2010 Johnny Willemsen + + * tao/FoxResource/FoxResource_Loader.h: + User has to specify the full fox path now, some distributions now ship fox-1.6 and + fox-1.4 as directory names + +Mon Feb 15 09:17:47 UTC 2010 Johnny Willemsen + + * m4/tao.m4: + Moved to ACE, seems the latest autoconf tools only support one m4 + directory + + * configure.ac: + * Makefile.am: + * Release: + Updated for move above + +Sun Feb 14 15:57:47 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_codegen.cpp: + + Changed include generation for executor IDL files to + always generate include of CCM_Container.idl, regardless + of whether it is pulled in indirectly or not. An optimizing + check may be added at a later date. + +Fri Feb 12 22:08:24 UTC 2010 Jeff Parsons + + * TAO_IDL/include/idl_global.h: + * TAO_IDL/be/be_visitor_root.cpp: + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_visitor_root/root.cpp: + * TAO_IDL/be/be_visitor_component/component_exh.cpp: + * TAO_IDL/be/be_visitor_module.cpp: + * TAO_IDL/be/be_visitor_module/module.cpp: + * TAO_IDL/be/be_produce.cpp: + * TAO_IDL/be_include/be_visitor_root/root.h: + * TAO_IDL/be_include/be_visitor_module/module.h: + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/fe/idl.ll: + * TAO_IDL/util/utl_global.cpp: + + - Added pragma indicating RTI DDS TypeSupport + header file to include in the connector implementation + header file. + + - Added generation of client stub header file + inclusion in connector implementation header file. + + - Cosmetic changes to be_codegen.cpp + + - Added boilerplate for the spawning of the connector + implementation visitors. + +Thu Feb 11 19:12:11 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_codegen.cpp: + Don't generate any E.idl includes with -Glfa. -Glfa means: + . Generated E.idl won't depend on any other E.idl + . Any required CCM_ local interface for facets, etc will be + generated locally. + +Thu Feb 11 18:51:11 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_codegen.cpp + * TAO_IDL/be/be_global.cpp + * TAO_IDL/be/be_visitor_component/context_svh.cpp + * TAO_IDL/be/be_visitor_component/context_svs.cpp + * TAO_IDL/be/be_visitor_component/servant_svs.cpp + * TAO_IDL/be/be_visitor_component_scope.cpp + * TAO_IDL/be/be_visitor_home/home_svh.cpp + * TAO_IDL/be/be_visitor_home/home_svs.cpp + * TAO_IDL/be/be_visitor_operation/operation_svs.cpp + * TAO_IDL/be/be_visitor_root/root.cpp + * TAO_IDL/be_include/be_global.h + * TAO_IDL/be_include/be_scope.h + * TAO_IDL/be_include/be_visitor_component/context_svs.h + * TAO_IDL/be_include/be_visitor_component_scope.h + * TAO_IDL/be_include/be_visitor_home/home_svs.h + * TAO_IDL/be_include/be_visitor_operation/operation_svs.h + * TAO_IDL/util/utl_err.cpp + Removed swapping container support + +Thu Feb 11 17:04:59 UTC 2010 Jeff Parsons + + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/fe/idl.ll: + * TAO_IDL/tao_idl_fe.mpc: + + Changes to restore mods that Johnny Willemsen made to + lex.yy.cpp without corresponding changes to idl.ll and + tao_idl_fe.mpc. These changes are in + + Mon Feb 8 06:58:43 UTC 2010 Johnny Willemsen + +Wed Feb 10 22:16:15 UTC 2010 Jeff Parsons + + * TAO_IDL/include/idl_global.h: + + Fixed typo in comment. + + * TAO_IDL/be/be_codegen.cpp: + + Added code generation for included files in + the connector implementation. + + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Fixed incorrect comment. + + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/fe/idl.ll: + + Restored code that was added to the cpp file only and + got zapped in the last regeneration. + +Wed Feb 10 22:02:06 UTC 2010 Yan Dai + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: + + Added support for ORBKeepalive in SSL mode. + +Wed Feb 10 16:34:24 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp: + * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h: + + In the recreation of the home scope in the corresponding + explicit interface, added support for eventtypes, which + cannot be declared inside a home, but can be referenced. + +Wed Feb 10 10:52:00 UTC 2010 Simon Massey + + * examples/mfc/server.cpp: + + Fixed a long standing typo in mod that was committed by + ChangeLogTag: Mon Mar 5 07:59:00 2001 Michael Kircher + He was adding ACE_TRY_ENV and ACE_TRY_CHECKS to the existing code, + but put in an ACE_TRY_CHECK where an ACE_TRY_ENV was supposed to + go. This has never been touched since and has missed the grand + purge of this old excaption code as it didn't conform to the normal + useage patterns. If TAO is built with #define ACE_LACKS_DEPRECATED_MACROS + this caused this example to not build due to this missuse. + +Wed Feb 10 10:43:11 UTC 2010 Johnny Willemsen + + * tests/IDL_Test/IDL_Test.mpc: + Don't compile the 3821 RTI DDS generated files, they don't compile + at this moment. + +Tue Feb 9 22:55:11 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_root/root_cnh.cpp: + * TAO_IDL/be/be_visitor_root/root_cns.cpp: + * TAO_IDL/be_include/be_visitor_root/root_cnh.h: + * TAO_IDL/be_include/be_visitor_root/root_cns.h: + + New visitors that create the files and streams + for the connector header and source implementation + generation. + + * TAO_IDL/include/idl_global.h: + * TAO_IDL/be/be_visitor_root.cpp: + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_visitor_root/root.cpp: + * TAO_IDL/be/be_visitor_component/component.cpp: + * TAO_IDL/be/be_visitor_module/module.cpp: + * TAO_IDL/be/be_global.cpp: + * TAO_IDL/be/be_visitor_attribute/attribute.cpp: + * TAO_IDL/be/be_produce.cpp: + * TAO_IDL/ast/ast_connector.cpp: + * TAO_IDL/be_include/be_visitor_root/root_exs.h: + * TAO_IDL/be_include/be_visitor_root/root_exh.h: + * TAO_IDL/be_include/be_codegen.h: + * TAO_IDL/be_include/be_helper.h: + * TAO_IDL/be_include/be_visitor_root.h: + * TAO_IDL/be_include/be_global.h: + * TAO_IDL/util/utl_global.cpp: + + Added beginning support for code generation for + connectors. + + * docs/compiler.html: + + Updated IDL compiler docs with info about connector + code generation support. + +Tue Feb 9 18:12:00 UTC 2010 Jeff Parsons + + * TAO_IDL/astast_visitor_reifying.cpp: + + Added support for IDL native constructs. + + * TAO_IDL/be/be_visitor_native/native_ch.cpp: + + Cosmetic changes. + +Tue Feb 9 09:39:10 UTC 2010 Vladimir Zykov + + * TAO_IDL/be/be_helper.cpp: + Fixed generation of constants for case labels in switch statement + for unions with char discriminator. + +Mon Feb 8 23:23:48 UTC 2010 Jeff Parsons + + * TAO_IDL/include/ast_union.h: + * TAO_IDL/be/be_union.cpp: + * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp: + * TAO_IDL/ast/ast_visitor_reifying.cpp: + * TAO_IDL/be_include/be_union.h: + * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h: + + Added support for all legal home-scope declarations + in the generation of implied IDL for the explicit + home interface. + +Mon Feb 8 17:16:31 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp: + * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h: + + In transfer of scope contents from IDL home to the + implied IDL explicit interface, added support for + typedefs. This change fixes a build problem in + CIAO_ROOT/tests/IDL3/Lookup. Support for other + constructs legal for declaration inside a home is + pending. + +Mon Feb 8 14:48:43 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_component/component_ch.cpp: + * TAO_IDL/be/be_visitor_root/root.cpp: + * TAO_IDL/be/be_visitor_traits.cpp: + Layout changes for the generated code + +Mon Feb 8 13:52:43 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_helper.cpp: + Removed link to website which doesn't seem to exist anymore + +Mon Feb 8 11:57:33 UTC 2010 Vladimir Zykov + + * tests/IDL_Test/IDL_Test.mpc: + Added Bug_3821_Regression.idl to MPC. + +Mon Feb 8 10:58:21 UTC 2010 Vladimir Zykov + + * tests/Bug_3821_Regression/test.cpp: + * tests/Bug_3821_Regression/test.idl: + * tests/Bug_3821_Regression/Bug_3821_Regression.mpc: + * tests/Bug_3821_Regression/run_test.pl: + * tests/Bug_3821_Regression/README: + * tests/IDL_Test/Bug_3821_Regression.idl: + * bin/tao_orb_tests.lst: + Added a test for bug#3821 and scheduled it for run. Added the same + IDL file to IDL_Test, it can be useful for testing tao_idl's + behavior on unions. + + * TAO_IDL/be/be_union.cpp: + * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp: + * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_union/union_cs.cpp: + * TAO_IDL/ast/ast_union.cpp: + * TAO_IDL/be_include/be_union.h: + Fixed a bug#3821. In particular it changes how tao_idl generates + code for enum discriminated unions. Fixed other minor bugs. + +Mon Feb 8 10:35:30 UTC 2010 Martin Corino + + * orbsvcs/orbsvcs/Trader/Constraint_l.cpp: + * orbsvcs/tests/Concurrency/lex.CC_command.cpp: + * performance-tests/POA/Demux/demux_test_server.cpp: + * tests/Exposed_Policies/RT_Properties.cpp: + + Fixed new GCC 4.4.x warning about ignoring return values of + function marked by the new warn_unused_result attribute. + +Mon Feb 8 06:58:43 UTC 2010 Johnny Willemsen + + * TAO_IDL/fe/lex.yy.cpp: + Fixed Windows CE compile error + +Sat Feb 6 13:50:43 UTC 2010 Martin Corino + + * tao/GIOP_Message_State.cpp: + Fixed strict aliasing warning. + +Fri Feb 5 19:20:42 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_home/home_svs.cpp: + * TAO_IDL/be/be_visitor_home/home_svh.cpp: + * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp: + * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: + * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h: + + Fixed bug introduced by the recent change in handling of + home factories and finders, where the return type of an + inherited factory or finder was the type of the component + managed by the derived home, instead of the managed component + of the base home, as it should be. + +Thu Feb 4 14:13:32 UTC 2010 Vladimir Zykov + + * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp: + Changed code to generate octal numbers where they are meant instead + of decimals. Removed code for wchars since wchar discriminant is + not allowed in unions. + + * TAO_IDL/be/be_global.cpp: + Fixed a memory leak in tao_idl. + + * TAO_IDL/ast/ast_module.cpp: + Fixed bug#3819. Multiple forward declarations of valuetypes, + eventtypes, and components don't crash tao_idl now. + +Thu Feb 4 13:56:43 UTC 2010 Johnny Willemsen + + * TAO_IDL/Makefile.am: + Regenerated + +Thu Feb 4 09:25:43 UTC 2010 Johnny Willemsen + + Merged revision 88756-88826 from idl3_plus_backend2 to svn head. + + * orbsvcs/IFR_Service/ifr_adding_visitor.h: + * orbsvcs/IFR_Service/ifr_adding_visitor.cpp: + + Change IFR loader backend correspondingly with the + change above to home factories and finders. + +Thu Feb 4 09:15:43 UTC 2010 Johnny Willemsen + + * TAO_IDL/*.cpp: + Converted to doxygen style of documentation + +Thu Feb 4 09:01:43 UTC 2010 Johnny Willemsen + + * TAO_IDL/*.h: + Converted to doxygen style of documentation + +Thu Feb 4 08:36:43 UTC 2010 Johnny Willemsen + + Merged revision 88756-88826 from idl3_plus_backend2 to svn head. + + Wed Feb 3 21:37:08 UTC 2010 Jeff Parsons + + * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h: + * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp: + + New visitor specialized to generate the contents of + the home explicit implied IDL interface. + + * TAO_IDL/include/ast_home.h: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/ast/ast_home.cpp: + * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: + * TAO_IDL/util/utl_scope.cpp: + + Completed changes to handle home factories and finders + as part of the home scope rather than in separate list + members of the home class. + + Mon Feb 1 22:30:44 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_home/factory_svs.cpp: + * TAO_IDL/be_include/be_visitor_home/factory_svs.h: + + Removed this recently-added visitor, turned out + to be unnecessary. + + * TAO_IDL/be/be_visitor_home/home_svs.cpp: + * TAO_IDL/be/be_visitor_home/home_exs.cpp: + * TAO_IDL/be/be_visitor_home/home_svh.cpp: + * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp: + * TAO_IDL/be/be_visitor_home/home_exh.cpp: + * TAO_IDL/be/be_visitor_operation/arglist.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/arglist.cpp: + * TAO_IDL/be/be_decl.cpp: + * TAO_IDL/be/be_visitor_home.cpp: + * TAO_IDL/be/be_visitor_operation.cpp: + * TAO_IDL/be/be_scope.cpp: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: + * TAO_IDL/be_include/be_visitor_home/home_ex_idl.h: + * TAO_IDL/be_include/be_visitor_home/home_exh.h: + * TAO_IDL/be_include/be_visitor_home/home_svs.h: + * TAO_IDL/be_include/be_visitor_home/home_exs.h: + * TAO_IDL/be_include/be_visitor_home/home_svh.h: + * TAO_IDL/be_include/be_visitor_operation/arglist.h: + * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: + * TAO_IDL/be_include/be_visitor_home.h: + + More work toward handling home factories and + finders as members of the home's scope rather + than as a list in the home class. In progress. + + Fri Jan 29 22:03:03 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_home/factory_svs.cpp: + * TAO_IDL/be_include/be_visitor_home/factory_svs.h: + + New visitor for homes, encapsulating the issues of + factory and finder code generation in the servant + source file. + + * TAO_IDL/include/ast_valuetype.h: + * TAO_IDL/include/ast_home.h: + * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: + * TAO_IDL/include/utl_scope.h: + * TAO_IDL/be/be_visitor_home/home_svs.cpp: + * TAO_IDL/be/be_visitor_home/home_svh.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp: + * TAO_IDL/be/be_visitor_home.cpp: + * TAO_IDL/be/be_finder.cpp: + * TAO_IDL/ast/ast_home.cpp: + * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: + * TAO_IDL/ast/ast_finder.cpp: + * TAO_IDL/ast/ast_redef.cpp: + * TAO_IDL/be_include/be_visitor_home/home_svs.h: + * TAO_IDL/be_include/be_visitor_home/home_svh.h: + * TAO_IDL/be_include/be_visitor_home.h: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/util/utl_scope.cpp: + + In-progress change of home factory and finder handling. + Instead of being stored in lists in the home node, they + will be members of the home scope like any other legal + construct for a home scope. + + Fri Jan 29 18:08:41 UTC 2010 Jeff Parsons + + * TAO_IDL/include/ast_finder.h: + * TAO_IDL/be/be_finder.cpp: + * TAO_IDL/ast/ast_finder.cpp: + * TAO_IDL/be_include/be_finder.h: + + New AST node classes, representing an IDL home + finder construct. + + * orbsvcs/IFR_Service/ifr_visitor.h: + * orbsvcs/IFR_Service/ifr_visitor.cpp: + * orbsvcs/IFR_Service/ifr_adding_visitor.cpp: + + Updated backend with no-op overrides of + visit_* methods added to the front end. + + * TAO_IDL/include/ast_generator.h: + * TAO_IDL/include/ast_visitor_reifying.h: + * TAO_IDL/include/ast_decl.h: + * TAO_IDL/include/ast_factory.h: + * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: + * TAO_IDL/include/ast_visitor.h: + * TAO_IDL/be/be_factory.cpp: + * TAO_IDL/be/be_visitor.cpp: + * TAO_IDL/be/be_generator.cpp: + * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: + * TAO_IDL/ast/ast_generator.cpp: + * TAO_IDL/ast/ast_visitor_reifying.cpp: + * TAO_IDL/ast/ast_factory.cpp: + * TAO_IDL/be_include/be_visitor.h: + * TAO_IDL/be_include/be_factory.h: + * TAO_IDL/be_include/be_generator.h: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/narrow/narrow.cpp: + + Other changes corresponding to the addition + of the new AST classes and visit_* methods + above. + + Thu Jan 28 20:04:42 UTC 2010 Jeff Parsons + + * TAO_IDL/include/ast_decl.h: + * TAO_IDL/include/utl_scope.h: + * TAO_IDL/be/be_visitor_operation/arglist.cpp: + * TAO_IDL/be/be_visitor_operation/argument.cpp: + * TAO_IDL/be/be_sequence.cpp: + * TAO_IDL/ast/ast_interface.cpp: + * TAO_IDL/ast/ast_module.cpp: + * TAO_IDL/ast/ast_interface_fwd.cpp: + * TAO_IDL/ast/ast_decl.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/fe_extern.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/util/utl_scope.cpp: + + Removal of more unnecessary code. + + Thu Jan 28 18:13:19 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_union.cpp: + * TAO_IDL/be/be_visitor_exception/exception.cpp: + * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_exception/exception_cs.cpp: + * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp: + * TAO_IDL/be/be_visitor_exception/exception_ch.cpp: + * TAO_IDL/be/be_visitor_exception/exception_ci.cpp: + * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_exception/ctor_assign.cpp: + * TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_typedef/typedef.cpp: + * TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp: + * TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp: + * TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp: + * TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp: + * TAO_IDL/be/be_interface_fwd.cpp: + * TAO_IDL/be/be_attribute.cpp: + * TAO_IDL/be/be_visitor_native.cpp: + * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp: + * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: + * TAO_IDL/be/be_visitor_arg_traits.cpp: + * TAO_IDL/be/be_valuetype.cpp: + * TAO_IDL/be/be_visitor_argument/invoke_cs.cpp: + * TAO_IDL/be/be_visitor_argument/argument.cpp: + * TAO_IDL/be/be_visitor_argument/arglist.cpp: + * TAO_IDL/be/be_visitor_argument/upcall_ss.cpp: + * TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp: + * TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp: + * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp: + * TAO_IDL/be/be_visitor_argument/paramlist.cpp: + * TAO_IDL/be/be_visitor_home/home_ch.cpp: + * TAO_IDL/be/be_visitor_home/home_exs.cpp: + * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp: + * TAO_IDL/be/be_visitor_home/home_exh.cpp: + * TAO_IDL/be/be_visitor_home/home_cs.cpp: + * TAO_IDL/be/be_union_fwd.cpp: + * TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp: + * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp: + * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp: + * TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp: + * TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ci.cpp: + * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp: + * TAO_IDL/be/be_visitor_interface/amh_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ih.cpp: + * TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp: + * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp: + * TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_sh.cpp: + * TAO_IDL/be/be_visitor_interface/interface_si.cpp: + * TAO_IDL/be/be_visitor_interface/interface_is.cpp: + * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_interface/amh_sh.cpp: + * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp: + * TAO_IDL/be/be_visitor_interface/amh_si.cpp: + * TAO_IDL/be/be_visitor_interface/ami_interface_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ss.cpp: + * TAO_IDL/be/be_visitor_interface/amh_ss.cpp: + * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_interface/tie_sh.cpp: + * TAO_IDL/be/be_visitor_interface/interface_svh.cpp: + * TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp: + * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp: + * TAO_IDL/be/be_visitor_interface/tie_ss.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp: + * TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp: + * TAO_IDL/be/be_visitor_interface/interface_svs.cpp: + * TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp: + * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp: + * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp: + * TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp: + * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp: + * TAO_IDL/be/be_visitor_operation/arglist.cpp: + * TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp: + * TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp: + * TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp: + * TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ih.cpp: + * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp: + * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: + * TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp: + * TAO_IDL/be/be_visitor_operation/operation_sh.cpp: + * TAO_IDL/be/be_visitor_operation/operation_is.cpp: + * TAO_IDL/be/be_visitor_operation/rettype.cpp: + * TAO_IDL/be/be_visitor_operation/amh_sh.cpp: + * TAO_IDL/be/be_visitor_operation/operation.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ss.cpp: + * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp: + * TAO_IDL/be/be_visitor_operation/amh_ss.cpp: + * TAO_IDL/be/be_visitor_operation/tie_sh.cpp: + * TAO_IDL/be/be_visitor_operation/ami_ch.cpp: + * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp: + * TAO_IDL/be/be_visitor_operation/argument.cpp: + * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp: + * TAO_IDL/be/be_visitor_operation/tie_ss.cpp: + * TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp: + * TAO_IDL/be/be_visitor_operation/argument_marshal.cpp: + * TAO_IDL/be/be_visitor_operation/ami_cs.cpp: + * TAO_IDL/be/be_visitor_operation/argument_invoke.cpp: + * TAO_IDL/be/be_visitor_root.cpp: + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_union_branch.cpp: + * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_base.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp: + * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: + * TAO_IDL/be/be_visitor_union.cpp: + * TAO_IDL/be/be_valuetype_fwd.cpp: + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + * TAO_IDL/be/be_visitor_interface_fwd.cpp: + * TAO_IDL/be/be_visitor_root/root_ci.cpp: + * TAO_IDL/be/be_visitor_root/root_sth.cpp: + * TAO_IDL/be/be_visitor_root/root_exs.cpp: + * TAO_IDL/be/be_visitor_root/root_ih.cpp: + * TAO_IDL/be/be_visitor_root/root_svh.cpp: + * TAO_IDL/be/be_visitor_root/cdr_op.cpp: + * TAO_IDL/be/be_visitor_root/serializer_op.cpp: + * TAO_IDL/be/be_visitor_root/root_ex_idl.cpp: + * TAO_IDL/be/be_visitor_root/root_cs.cpp: + * TAO_IDL/be/be_visitor_root/root_sh.cpp: + * TAO_IDL/be/be_visitor_root/root_svs.cpp: + * TAO_IDL/be/be_visitor_root/root_is.cpp: + * TAO_IDL/be/be_visitor_root/root_si.cpp: + * TAO_IDL/be/be_visitor_root/root.cpp: + * TAO_IDL/be/be_visitor_root/any_op.cpp: + * TAO_IDL/be/be_visitor_root/root_exh.cpp: + * TAO_IDL/be/be_visitor_root/root_ss.cpp: + * TAO_IDL/be/be_visitor_root/root_ch.cpp: + * TAO_IDL/be/be_type.cpp: + * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp: + * TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox.cpp: + * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp: + * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuebox/field_ch.cpp: + * TAO_IDL/be/be_visitor_enum.cpp: + * TAO_IDL/be/be_home.cpp: + * TAO_IDL/be/be_visitor_template_export.cpp: + * TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/arglist.cpp: + * TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/obv_module.cpp: + * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp: + * TAO_IDL/be/be_helper.cpp: + * TAO_IDL/be/be_valuebox.cpp: + * TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd.cpp: + * TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp: + * TAO_IDL/be/be_component.cpp: + * TAO_IDL/be/be_visitor_exception.cpp: + * TAO_IDL/be/be_visitor_typedef.cpp: + * TAO_IDL/be/be_visitor_union_branch.cpp: + * TAO_IDL/be/be_visitor_typecode.cpp: + * TAO_IDL/be/be_visitor_argument.cpp: + * TAO_IDL/be/be_component_fwd.cpp: + * TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp: + * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_home.cpp: + * TAO_IDL/be/be_visitor_constant.cpp: + * TAO_IDL/be/be_visitor_amh_pre_proc.cpp: + * TAO_IDL/be/be_interface_strategy.cpp: + * TAO_IDL/be/be_operation_strategy.cpp: + * TAO_IDL/be/be_field.cpp: + * TAO_IDL/be/be_visitor_native/native_ch.cpp: + * TAO_IDL/be/be_module.cpp: + * TAO_IDL/be/be_visitor_sequence.cpp: + * TAO_IDL/be/be_visitor_constant/constant_cs.cpp: + * TAO_IDL/be/be_visitor_constant/constant_ch.cpp: + * TAO_IDL/be/be_structure_fwd.cpp: + * TAO_IDL/be/be_visitor_component/component_ch.cpp: + * TAO_IDL/be/be_visitor_component/component_ci.cpp: + * TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_component/component_ih.cpp: + * TAO_IDL/be/be_visitor_component/component_cs.cpp: + * TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_component/component_sh.cpp: + * TAO_IDL/be/be_visitor_component/component_is.cpp: + * TAO_IDL/be/be_visitor_component/component_si.cpp: + * TAO_IDL/be/be_visitor_component/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_component/component.cpp: + * TAO_IDL/be/be_visitor_component/component_ss.cpp: + * TAO_IDL/be/be_visitor_component/any_op_cs.cpp: + * TAO_IDL/be/be_predefined_type.cpp: + * TAO_IDL/be/be_visitor_array/array.cpp: + * TAO_IDL/be/be_visitor_array/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_array/array_cs.cpp: + * TAO_IDL/be/be_visitor_array/array_ci.cpp: + * TAO_IDL/be/be_visitor_array/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_component_fwd.cpp: + * TAO_IDL/be/be_argument.cpp: + * TAO_IDL/be/be_visitor_module/module_ch.cpp: + * TAO_IDL/be/be_visitor_module/module_sh.cpp: + * TAO_IDL/be/be_visitor_module/any_op.cpp: + * TAO_IDL/be/be_visitor_module/module.cpp: + * TAO_IDL/be/be_visitor_module/module_ih.cpp: + * TAO_IDL/be/be_visitor_module/cdr_op.cpp: + * TAO_IDL/be/be_visitor_module/serializer_op.cpp: + * TAO_IDL/be/be_visitor_decl.cpp: + * TAO_IDL/be/be_visitor_union/discriminant_ch.cpp: + * TAO_IDL/be/be_visitor_union/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp: + * TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_union/union_ch.cpp: + * TAO_IDL/be/be_visitor_union/union_ci.cpp: + * TAO_IDL/be/be_visitor_union/union.cpp: + * TAO_IDL/be/be_visitor_union/discriminant_cs.cpp: + * TAO_IDL/be/be_visitor_union/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_union/union_cs.cpp: + * TAO_IDL/be/be_constant.cpp: + * TAO_IDL/be/be_visitor_valuetype.cpp: + * TAO_IDL/be/be_exception.cpp: + * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_structure/structure.cpp: + * TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_structure/structure_cs.cpp: + * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_structure/structure_ch.cpp: + * TAO_IDL/be/be_visitor_structure/structure_ci.cpp: + * TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp: + * TAO_IDL/be/be_global.cpp: + * TAO_IDL/be/be_null_return_emitter.cpp: + * TAO_IDL/be/be_visitor_enum/enum_ch.cpp: + * TAO_IDL/be/be_visitor_enum/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_enum/enum_cs.cpp: + * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_context.cpp: + * TAO_IDL/be/be_visitor_union_fwd.cpp: + * TAO_IDL/be/be_visitor_structure_fwd.cpp: + * TAO_IDL/be/be_visitor_field/field_ci.cpp: + * TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_field/field_cs.cpp: + * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_field/field_ch.cpp: + * TAO_IDL/be/be_root.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_enum.cpp: + * TAO_IDL/be/be_string.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp: + * TAO_IDL/be/be_array.cpp: + * TAO_IDL/be/be_visitor_traits.cpp: + * TAO_IDL/be/be_visitor_factory.cpp: + * TAO_IDL/be/be_native.cpp: + * TAO_IDL/be/be_generator.cpp: + * TAO_IDL/ast/ast_union_fwd.cpp: + * TAO_IDL/ast/ast_structure_fwd.cpp: + * TAO_IDL/ast/ast_concrete_type.cpp: + * TAO_IDL/ast/ast_predefined_type.cpp: + * TAO_IDL/ast/ast_enum_val.cpp: + * TAO_IDL/ast/ast_recursive.cpp: + * TAO_IDL/ast/ast_valuetype_fwd.cpp: + * TAO_IDL/ast/ast_root.cpp: + * TAO_IDL/ast/ast_eventtype_fwd.cpp: + * TAO_IDL/ast/ast_valuebox.cpp: + * TAO_IDL/ast/ast_redef.cpp: + * TAO_IDL/ast/ast_union_label.cpp: + * TAO_IDL/ast/ast_interface_fwd.cpp: + * TAO_IDL/ast/ast_component_fwd.cpp: + * TAO_IDL/ast/ast_enum.cpp: + * TAO_IDL/ast/ast_string.cpp: + * TAO_IDL/ast/ast_check.cpp: + * TAO_IDL/ast/ast_type.cpp: + * TAO_IDL/ast/ast_native.cpp: + * TAO_IDL/be_include/be_visitor_context.h: + * TAO_IDL/fe/fe_global.cpp: + * TAO_IDL/fe/fe_init.cpp: + * TAO_IDL/fe/fe_extern.cpp: + * TAO_IDL/fe/fe_private.cpp: + * TAO_IDL/driver/drv_mcpp_preproc.cpp: + * TAO_IDL/driver/drv_preproc.cpp: + * TAO_IDL/narrow/narrow.cpp: + * TAO_IDL/util/utl_identifier.cpp: + * TAO_IDL/util/utl_tmpl/utl_exprlist.cpp: + * TAO_IDL/util/utl_tmpl/utl_list.cpp: + * TAO_IDL/util/utl_tmpl/utl_namelist.cpp: + * TAO_IDL/util/utl_tmpl/utl_decllist.cpp: + * TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp: + * TAO_IDL/util/utl_tmpl/utl_strlist.cpp: + * TAO_IDL/util/utl_tmpl/utl_idlist.cpp: + * TAO_IDL/util/utl_decllist.cpp: + * TAO_IDL/util/utl_strlist.cpp: + * TAO_IDL/util/utl_stack.cpp: + * TAO_IDL/util/utl_string.cpp: + + Removed many unused methods from class be_visitor_context, + and bits of unused code from many other files. + + Thu Jan 28 15:56:11 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_home/home_svs.cpp: + * TAO_IDL/be/be_visitor_home/home_svh.cpp: + + Added code generation for method overrides that appear as pure + virtual in the skeleton base class when the home has + a primary key. These methods throw CORBA::NO_IMPLEMENT, + since primary keys are not supported in CIAO. + +Wed Feb 3 15:23:16 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: + * orbsvcs/tests/AVStreams/Pluggable/run_test.pl: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl: + * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl: + + Increase sleep out time to allow these tests to pass on the + iPhone Simulator. + +Wed Feb 3 09:52:47 UTC 2010 Vladimir Zykov + + * tests/IDL_Test/IDL_Test.mpc: + * tests/IDL_Test/Bug_3819_Regression.idl: + Added a test for bug#3819. + +Tue Feb 2 11:07:14 UTC 2010 Vladimir Zykov + + * tests/Bug_1361_Regression/server.cpp: + * tests/Bug_1361_Regression/shutdown.cpp: + * tests/Bug_1361_Regression/client.cpp: + * tests/Bug_1361_Regression/Echo.cpp: + * tests/Bug_1361_Regression/Bug_1361_Regression.mpc: + Simplified the test. It used libTAO_Messaging without any + need for it. + + * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h: + * tao/AnyTypeCode/Any_Array_Impl_T.cpp: + * tao/AnyTypeCode/Objref_TypeCode.cpp: + * tao/PortableServer/Any_SArg_Traits.h: + * tao/PortableServer/get_arg.h: + * tao/PI_Server/Policy_Creator_T.h: + * tao/Load_Protocol_Factory_T.h: + * tao/TransportCurrent/IIOP_Current_Impl.h: + * tao/Valuetype/Valuetype_Traits_Base_T.h: + Added required include. + + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h: + * tao/TransportCurrent/Current_ORBInitializer.h: + Removed unnecessary for templates export directive. + + * tao/ImR_Client/ServerObject.pidl: + * tao/ImR_Client/ImplRepo.pidl: + * tao/AnyTypeCode/BasicTypeTraits.h: + * tao/IORTable/IORTable.pidl: + * tao/Object_Key.pidl: + * tao/TransportCurrent/Transport_Current.h: + * tao/TransportCurrent/IIOP_Transport_Current.h: + Added inclusion guards. + + * tao/AnyTypeCode/Union_TypeCode.h: + Added necessary forward declaration. + + * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h: + * tao/PortableServer/Upcall_Command.h: + * tao/PortableServer/Upcall_Wrapper.h: + * tao/Object_Reference_Traits_T.h: + * tao/String_Traits_T.h: + * tao/Value_Traits_T.h: + * tao/Array_Traits_T.h: + * tao/Utils/Servant_Var.inl: + * tao/Valuetype/Valuetype_Traits_T.h: + Changed 'ifndef ACE_LACKS_PRAGMA_ONCE' to + 'if !defined (ACE_LACKS_PRAGMA_ONCE)'. So that ifndef is only used + for inclusion guards in TAO. + + * tao/Transport.cpp: + Changed 0 to false for boolean type. + + * tao/RTScheduling/ThreadAction.h: + Fixed code that didn't compile. + +Mon Feb 1 19:27:43 UTC 2010 Johnny Willemsen + + * orbsvcs/orbsvcs/Notify/QoSProperties.h + * orbsvcs/orbsvcs/Notify/Topology_Saver.h + * orbsvcs/orbsvcs/Time_Utilities.h + * orbsvcs/orbsvcs/Time_Utilities.inl + Doxygen fixes + +Sun Jan 31 01:04:43 CST 2010 Johnny Willemsen + + * TAO version 1.7.6 released. + +Thu Jan 28 12:56:31 UTC 2010 Abdul Sowayan + + * NEWS: + + ACE/TAO now supports the new iPad ;-). + +Thu Jan 28 07:54:30 UTC 2010 Johnny Willemsen + + Merged revision 88742-88757 from idl3_plus_backend2 to svn head. This + gives us templated modules for the small parts we need for dds4ccm + + Wed Jan 27 22:19:17 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_decl.cpp: + * TAO_IDL/be/be_visitor_component/facet_exs.cpp: + * TAO_IDL/be/be_visitor_component/facet_exh.cpp: + * TAO_IDL/be_include/be_decl.h: + + Added check to ensure that a facet interface gets generated + only once in the executor header and source files. This fix + closes [BUGID:3817]. Thanks to Abdul Sowayan + for reporting the bug. + + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Cosmetic changes. + + Wed Jan 27 20:08:48 UTC 2010 Jeff Parsons + + * TAO_IDL/include/ast_union.h: + * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: + * TAO_IDL/include/utl_labellist.h: + * TAO_IDL/include/ast_union_branch.h: + * TAO_IDL/include/utl_scope.h: + * TAO_IDL/be/be_union_label.cpp: + * TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp: + * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: + * TAO_IDL/ast/ast_visitor_reifying.cpp: + * TAO_IDL/ast/ast_enum.cpp: + * TAO_IDL/ast/ast_union_branch.cpp: + * TAO_IDL/util/utl_labellist.cpp: + * TAO_IDL/util/utl_exceptlist.cpp: + * TAO_IDL/util/utl_idlist.cpp: + * TAO_IDL/util/utl_scope.cpp: + + Added support for unions and enums in the scope of a + template module. + +Wed Jan 27 22:55:24 UTC 2010 Adam Mitz + + * TAO_IDL/util/utl_global.cpp(add_dcps_data_type): + + Now that lookup_by_name_local() has been re-written in + Tue Jan 26 20:21:30 UTC 2010 Jeff Parsons + on the idl3_plus_backend2 branch which was merged in + Wed Jan 27 14:19:30 UTC 2010 Johnny Willemsen + it doesn't add an extra space at the end of the name. Changed + add_dcps_data_type() to account for this. + +Wed Jan 27 14:29:30 UTC 2010 Johnny Willemsen + + * TAO_IDL/Makefile.am: + Regenerated + +Wed Jan 27 14:19:30 UTC 2010 Johnny Willemsen + + Merged revision 88605-88741 from idl3_plus_backend2 to svn head. This + gives us templated modules for the small parts we need for dds4ccm + + Tue Jan 26 20:21:30 UTC 2010 Jeff Parsons + + * TAO_IDL/include/ast_visitor_tmpl_module_ref.h: + * TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp: + + New files, defining a new visitor specialized to + create implied IDL related to template module + references as soon as they're parsed, rather than waiting + until template module instantiation time. The + template module instantiation visitor then copies + this implied IDL into its scope of instantiation. + The extra copy of the implied IDL nodes is justified + by the simplification of lookups involving a reference + to the instantiation of a template module reference. + + This new visitor inherits from the template module + instantiation visitor, and overrides one method, + visit_template_module_ref(). The other are reused + as is. + + * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: + * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: + + Changed the method overridden by the new visitor + above to a no-op, since the new visitor now handles + template module references. + + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Added code to launch the new visitor immediately after + a template module reference is parsed and created. + + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/fe/idl.ll: + + Fixed a bug that apparently just cropped up in the + "version" block of idl_store_pragma. + + * TAO_IDL/util/utl_scope.cpp(lookup_by_name_local): + + Now checks for a match with a template module reference, + and skips it, matching instead with the corresoponding + regular module created immediately after it in the scope. + + Mon Jan 25 22:39:39 UTC 2010 Jeff Parsons + + * TAO_IDL/include/fe_home_header.h: + + Cosmetic changes. + + * TAO_IDL/include/ast_visitor_reifying.h: + * TAO_IDL/include/ast_connector.h: + * TAO_IDL/include/ast_consumes.h: + * TAO_IDL/include/ast_publishes.h: + * TAO_IDL/include/ast_emits.h: + * TAO_IDL/ast/ast_consumes.cpp: + * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: + * TAO_IDL/ast/ast_publishes.cpp: + * TAO_IDL/ast/ast_emits.cpp: + * TAO_IDL/ast/ast_visitor_reifying.cpp: + + Added support for components, homes, connectors, + porttypes, simple/extended ports and mirror + ports and aliases in an instantiated template + module. + + * TAO_IDL/util/utl_global.cpp(string_to_scoped_name): + + Completely rewrote the method using ACE_CString. + + Fri Jan 22 19:42:38 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_template_module.cpp: + + * TAO_IDL/fe/idl.ll: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/fe/y.tab.h: + * TAO_IDL/fe/y.tab.cpp: + + * TAO_IDL/fe/fe_event_header.cpp: + + * TAO_IDL/include/fe_event_header.h: + + Removed these files. + + Fri Jan 22 18:26:17 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: + * TAO_IDL/be/be_visitor_reifying.cpp: + * TAO_IDL/be_include/be_visitor_reifying.h: + * TAO_IDL/be_include/be_visitor_tmpl_module_inst.h: + + Removed these files, the visitors have been moved + to the front end. + + * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: + * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: + + Added some missing no-op visit_* methods. + + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Added spawn of template instantiation visitor. + + * TAO_IDL/fe/fe_interface_header.cpp: + + Removed recently added debugging output. + + Thu Jan 21 20:20:47 UTC 2010 Jeff Parsons + + * TAO_IDL/include/ast_visitor_reifying.h: + * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: + * TAO_IDL/include/ast_visitor_context.h: + * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: + * TAO_IDL/ast/ast_visitor_reifying.cpp: + * TAO_IDL/ast/ast_visitor_context.cpp: + + Moved the visitors that create implied IDL upon + template module instantiation to the front end, + along with a piece of the visitor context class + that becomes a base class for the backend visitor + context class. This move is motivated by the fact + that generation of executor IDL turns this implied + IDL into explicit IDL, so in order to parse the + executor IDL file, this implied IDL must be added + to the AST in the front end. + + The corresponding backend visitor classes will be + removed after further testing. + + * TAO_IDL/include/ast_factory.h: + * TAO_IDL/include/ast_operation.h: + * TAO_IDL/be/be_factory.cpp: + * TAO_IDL/be/be_visitor_scope.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp: + * TAO_IDL/be/be_visitor_module.cpp: + * TAO_IDL/be/be_produce.cpp: + * TAO_IDL/be/be_visitor_context.cpp: + * TAO_IDL/be/be_visitor.cpp: + * TAO_IDL/be/be_operation.cpp: + * TAO_IDL/be/be_scope.cpp: + * TAO_IDL/be/be_generator.cpp: + * TAO_IDL/ast/ast_visitor.cpp: + * TAO_IDL/ast/ast_operation.cpp: + * TAO_IDL/ast/ast_generator.cpp: + * TAO_IDL/ast/ast_factory.cpp: + * TAO_IDL/be_include/be_operation.h: + * TAO_IDL/be_include/be_visitor_context.h: + * TAO_IDL/be_include/be_factory.h: + * TAO_IDL/be_include/be_scope.h: + * TAO_IDL/fe/fe_interface_header.cpp: + * TAO_IDL/util/utl_scope.cpp: + + Other changes related to the above visitor move, plus + some cosmetic changes. Spawning of the new visitors + when a template module instantiation is seen is not + added in this set of changes. + + Mon Jan 18 15:35:54 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp: + * TAO_IDL//be_visitor_valuebox/union_member_ci.cpp: + * TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h: + * TAO_IDL/be_include/be_visitor_valuebox/field_ci.h: + + Removed parameter 'vb_node' from private methods + emit_member_get() and emit_member_set(), since this value + is now stored in a member variable. + +Tue Jan 26 14:23:30 UTC 2010 Johnny Willemsen + + * orbsvcs/tests/ImplRepo/run_test.pl: + Reverted back to the original times, the changes broke the regular + running + +Mon Jan 25 14:53:00 UTC 2010 Jeff Parsons + + * NEWS: + Updated file with my changes since the last release. + +Fri Jan 22 12:34:30 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_component/context_svh.cpp: + * TAO_IDL/be/be_visitor_component/context_svs.cpp: + Pass the ciao instance id through the constructor + +Fri Jan 22 11:58:30 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_component/context_svh.cpp: + * TAO_IDL/be/be_visitor_component/context_svs.cpp: + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + More tweaks for AMI4CCM + +Fri Jan 22 10:14:30 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_interface.cpp: + Generate another ami4ccm interface + +Thu Jan 21 08:00:30 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/include/idl_global.h: + * TAO_IDL/util/utl_global.cpp: + Added support for #pragma ciao lem "X". When a lem is generated + than any X seen will be generated into the new lem file + +Thu Jan 21 01:50:30 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/Bug_3215_Regression/client.cpp: + + Added "include "tao/PI/PI.h" to the file to allow + this test to pass on the iPhone Simulator. The + inclusion of PI.h is rquired for static builds. + +Thu Jan 21 01:45:41 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/Bug_3216_Regression/client.cpp: + + Added "include "tao/PI/PI.h" to the file to allow + this test to pass on the iPhone Simulator. The + inclusion of PI.h is rquired for static builds. + +Wed Jan 20 19:19:19 UTC 2010 Olli Savia + + * orbsvcs/ImplRepo_Service/Activator_Options.cpp: + Fixed compile warning. + +Wed Jan 20 15:15:02 UTC 2010 Abdul Sowayan + + * MPC/config/tao_idl_fe.mpb: + * TAO_IDL/tao_idl_fe.mpc: + * orbsvcs/IFR_Service/IFR_Service.mpc: + + Build the IFR_Service executable on cross-build platforms. + This will allow more tests to pass on the iPhone Simulator. + According to Johnny Willemsen, there is no reason not to build + IFR_Service executable on cross-build platforms. + +Wed Jan 20 09:09:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/util/utl_global.cpp: + Const changes + +Tue Jan 19 14:56:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_interface.cpp + * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp + * TAO_IDL/be/be_visitor_component/context_svh.cpp + * TAO_IDL/be/be_visitor_component/context_svs.cpp + * TAO_IDL/be/be_visitor_component/servant_svh.cpp + * TAO_IDL/be/be_visitor_component/servant_svs.cpp + Generate the correct type for the AMI4CCM implied methods + +Tue Jan 19 14:32:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_produce.cpp: + Don't call the ami4ccm preprocessor + +Tue Jan 19 14:02:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp + * TAO_IDL/be/be_visitor_component/context_svh.cpp + * TAO_IDL/be/be_visitor_component/context_svs.cpp + * TAO_IDL/be/be_visitor_component/servant_svs.cpp + Const improvements and more AMI4CCM generation + +Tue Jan 19 13:39:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: + * TAO_IDL/be/be_visitor_component/context_svh.cpp: + * TAO_IDL/be/be_visitor_component/context_svs.cpp: + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + Generate additional methods for AMI4CCM + +Tue Jan 19 13:00:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: + * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: + Changed the generation for AMI4CCM, add the implied interfaces + to the generated LEM file. + +Tue Jan 19 11:33:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_module.cpp: + strip tailing white space + + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: + Removed some debug lines + + * TAO_IDL/fe/fe_component_header.cpp: + * TAO_IDL/fe/fe_interface_header.cpp: + * TAO_IDL/fe/fe_obv_header.cpp: + Initialise pointers to 0 + + * TAO_IDL/util/utl_scope.cpp: + Simplified some methods + +Tue Jan 19 09:04:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_interface.cpp: + Generate correct base class + +Tue Jan 19 08:44:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_codegen.cpp: + Simplification + + * TAO_IDL/be/be_interface.cpp: + Generate implied AMI4CCM node + + * TAO_IDL/be/be_produce.cpp: + Do CCM preprocessing after AMI4CCM + +Tue Jan 19 07:25:19 UTC 2010 Johnny Willemsen + + * tests/IDL_Test/IDL_Test.mpc: + Only generate the export file as part of one idl file + +Tue Jan 19 07:18:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_scope.cpp + * TAO_IDL/be/be_template_module.cpp + Fixed warnings + +Tue Jan 19 04:00:00 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/Simple_Naming/run_test.pl: + + Added some sleep statements to allow this test to pass on the + iPhone Simulator. + +Tue Jan 19 03:50:44 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/ImplRepo/run_test.pl: + + Increase the sleep() value to allow this test to pass on the + iPhone Simulator. + +Tue Jan 19 03:43:50 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/CosEvent/Timeout/run_test.pl: + + Added some sleep statements to allow this test to pass on the + iPhone Simulator. + +Mon Jan 18 19:34:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp + * TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp + * TAO_IDL/be_include/be_visitor_valuebox/field_ci.h + * TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h + Merged revision 88580-88605 from idl3_plus_backend2 to svn head + +Mon Jan 18 14:23:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_uses.cpp: + Layout change + + * TAO_IDL/be/be_visitor_root/root_ex_idl.cpp: + Const change + +Mon Jan 18 13:55:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be_include/be_operation_strategy.h: + Fixed typo in comment + + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: + Generate local interfaces + +Mon Jan 18 13:16:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + Only one exit point in the method + +Mon Jan 18 12:19:19 UTC 2010 Johnny Willemsen + + * TAO/be/be_attribute.cpp: + * TAO/be_include/be_attribute.h: + Added original_attribute member + + * TAO/be/be_operation.cpp: + * TAO/be_include/be_operation.h: + Added original_operation attribute member + +Mon Jan 18 10:00:19 UTC 2010 Johnny Willemsen + + * tests/IDL_Test/IDL_Test.mpc: + Put all stubs an skeleton in a DLL and added two projects to + compile all TAO test idl files also with the RTI ddsgen tool + when that is enabled. All idl files and generated code that + cause warnings and/or errors are disabled and reported back + to RTI. + +Sun Jan 17 20:05:43 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/ImplRepo/run_test.pl: + + Increase the sleep() value to allow this test to pass on the + iPhone Simulator. + +Sun Jan 17 19:59:45 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/ImplRepo/scale/run_test.pl: + + Increase the sleep() value to allow this test to pass on the + iPhone Simulator. + +Sun Jan 17 19:50:33 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: + + Increase the sleep() value to allow this test to pass on the + iPhone Simulator. + +Sun Jan 17 19:42:25 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/Log/Basic_Log_Test/run_test.pl: + + Increase the sleep() value to allow this test to pass on the + iPhone Simulator. + +Sun Jan 17 19:15:16 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: + + Added some sleep statements to allow this test to pass on the + iPhone Simulator. + +Sun Jan 17 19:00:25 UTC 2010 Abdul Sowayan + + * orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl: + + Added some sleep statements to allow this test to pass on the + iPhone Simulator. + +Sun Jan 17 18:34:36 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: + + Increase the sleep() value to allow this test to pass on the + iPhone Simulator. + +Sun Jan 17 18:31:07 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: + + Increase the sleep() value to allow this test to pass on the + iPhone Simulator. + +Sun Jan 17 17:38:48 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: + + Increase the sleep() value to allow this test to pass on the + iPhone Simulator. + +Sun Jan 17 01:09:57 UTC 2010 Abdul Sowayan + + * TAO_IDL/be/be_visitor_reifying.cpp: + + Fixed fuzz error by ending a new empty line to the end of the file. + +Sat Jan 16 23:58:21 UTC 2010 Abdul Sowayan + + * orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: + + Increase the sleep() value to allow this test to pass on the + iPhone Simulator. + +Sat Jan 16 23:14:41 UTC 2010 Abdul Sowayan + + * examples/ior_corbaloc/run_test.pl: + + Increase the sleep() value to allow this test to pass on the + iPhone Simulator. + +Sat Jan 16 18:48:19 UTC 2010 Johnny Willemsen + + Merged revision 88565-88579 from idl3_plus_backend2 to svn head + + Fri Jan 15 20:31:51 UTC 2010 Jeff Parsons + + * TAO_IDL/include/idl_global.h: + * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: + * TAO_IDL/be/be_visitor_context.cpp: + * TAO_IDL/be/be_visitor_reifying.cpp: + * TAO_IDL/be_include/be_visitor_context.h: + * TAO_IDL/be_include/be_visitor_reifying.h: + * TAO_IDL/util/utl_global.cpp: + * TAO_IDL/util/utl_scope.cpp: + + - Removed the template module instantation + scope storage in the visitor context, using + instead the global scope stack for that + purpose. + + - Modified reifying visitor to find and store + a node already created in a template module + instantiation, if the corresponding node is + referenced in the template module. + + Fri Jan 15 15:31:56 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: + + Reverted a small change made yesterday where the + generation of a double colon was prefixed to a name + that is not global. + +Fri Jan 15 13:25:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/Makefile.am: + Updated for all changes related to IDL3+ + +Fri Jan 15 11:21:19 UTC 2010 Johnny Willemsen + + * tests/IDL_Test/valuetype.idl: + Extended this test to reproduce a problem with valuetypes and modules + +Fri Jan 15 10:17:19 UTC 2010 Johnny Willemsen + + Merged revision 88537-88564 from idl3_plus_backend2 to svn head + + Thu Jan 14 22:50:03 UTC 2010 Jeff Parsons + + * TAO_IDL/include/ast_module.h: + * TAO_IDL/include/ast_factory.h: + * TAO_IDL/include/global_extern.h: + * TAO_IDL/include/fe_obv_header.h: + * TAO_IDL/include/ast_operation.h: + * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: + * TAO_IDL/be/be_factory.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp: + * TAO_IDL/be/be_visitor_reifying.cpp: + * TAO_IDL/be/be_operation.cpp: + * TAO_IDL/be/be_scope.cpp: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/ast/ast_operation.cpp: + * TAO_IDL/ast/ast_module.cpp: + * TAO_IDL/ast/ast_attribute.cpp: + * TAO_IDL/ast/ast_factory.cpp: + * TAO_IDL/be_include/be_operation.h: + * TAO_IDL/be_include/be_visitor_reifying.h: + * TAO_IDL/be_include/be_factory.h: + * TAO_IDL/be_include/be_scope.h: + * TAO_IDL/be_include/be_visitor_tmpl_module_inst.h: + * TAO_IDL/fe/fe_event_header.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/util/utl_namelist.cpp: + Added template instantiation code generation for + valuetypes and eventtypes. + +Fri Jan 15 09:59:19 UTC 2010 Johnny Willemsen + + * orbsvcs/IFR_Service/ifr_visitor.cpp: + * orbsvcs/IFR_Service/ifr_visitor.h: + Fixed compile errors because of tao_idl changes + +Fri Jan 15 09:56:19 UTC 2010 Johnny Willemsen + + * tao/PortableServer/POA.pidl + * tao/PortableServer/Root_POA.cpp + * tao/PortableServer/Root_POA.h + * tao/PortableServer/ServantRetentionStrategy.h + * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp + * tao/PortableServer/ServantRetentionStrategyNonRetain.h + * tao/PortableServer/ServantRetentionStrategyRetain.cpp + * tao/PortableServer/ServantRetentionStrategyRetain.h + Enable activate_object_with_id with CORBA/e micro. Thanks to + Frank Pilhofer for reporting this and creating the patch + +Thu Jan 14 12:27:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_array/array_ch.cpp + * TAO_IDL/be/be_visitor_reifying.cpp + * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp + * TAO_IDL/be_include/be_visitor_reifying.h + Fuzz fixes + +Thu Jan 14 11:00:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: + Fixed crash + +Thu Jan 14 10:39:19 UTC 2010 Johnny Willemsen + + Merged revision 88432-88536 from the idl3_plus_backend2 branch to + svn head. + + Wed Jan 13 23:16:57 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: + * TAO_IDL/be/be_visitor_operation/arglist.cpp: + * TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp: + * TAO_IDL/be/be_visitor_reifying.cpp: + * TAO_IDL/ast/ast_attribute.cpp: + * TAO_IDL/ast/ast_argument.cpp: + * TAO_IDL/be_include/be_visitor_reifying.h: + * TAO_IDL/be_include/be_visitor_tmpl_module_inst.h: + * TAO_IDL/util/utl_err.cpp: + + Added support for template instantiation of contained + interfaces, operations, attributes, and the associated + arguments and exception lists. + + Tue Jan 12 22:45:58 UTC 2010 Jeff Parsons + + * TAO_IDL/include/utl_scope.h: + + Changed the fe_add_* methods from private to + protected, so they can be called (polymorphically) + by the template module instantiation preprocessing + visitor through be_scope. Only fe_add_field() + is used this way so far, but there may be occasion + to expand the coverage. + + * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: + * TAO_IDL/be/be_expression.cpp: + * TAO_IDL/be/be_structure.cpp: + * TAO_IDL/be/be_visitor_field.cpp: + * TAO_IDL/be/be_visitor_context.cpp: + * TAO_IDL/be/be_scope.cpp: + * TAO_IDL/ast/ast_constant.cpp: + * TAO_IDL/ast/ast_expression.cpp: + * TAO_IDL/be_include/be_visitor_context.h: + * TAO_IDL/be_include/be_structure.h: + * TAO_IDL/be_include/be_scope.h: + * TAO_IDL/be_include/be_visitor_tmpl_module_inst.h: + + Implemented visit_constant() and visit_structure() + in the template module instantiation visitor. + + Fri Jan 8 22:37:35 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_visitor_reifying.cpp: + * TAO_IDL/be_include/be_visitor_reifying.h: + + New files containing a new visitor that + handles the (possible) reification of + template parameter references when they + are replaced by template arguments. Also + checks to see if areference lookup is in + the scope of a template module. If so, a + copy needs to be made in the current + instantiation scope (see below). + + * TAO_IDL/include/ast_visitor.h: + * TAO_IDL/be/be_visitor.cpp: + * TAO_IDL/be_include/be_visitor.h: + + Added method visit_param_holder(). + + * TAO_IDL/be/be_param_holder.cpp: + * TAO_IDL/ast/ast_param_holder.cpp: + + Added call to new visit_* method in the + accept() methods. + + * TAO_IDL/be/be_visitor_context.cpp: + * TAO_IDL/be_include/be_visitor_context.h: + + Added new state storage, namely the scope in + which the contents of an instantiated template + module are to be created. It is now stored in + the visitor context since both be_visitor_reifying + and be_visitor_tmpl_module_inst need to know it. + + * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: + * TAO_IDL/be_include/be_visitor_tmpl_module_inst.h: + + Moved some code to the visitor context, and some + to the new reifying visitor (see above). + + * TAO_IDL/be/be_visitor_array.cpp: + * TAO_IDL/be/be_visitor_array/array_ch.cpp: + + Cosmetic changes. + + Thu Jan 7 22:01:06 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_module.cpp: + + Cosmetic changes. + + * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: + * TAO_IDL/be_include/be_visitor_tmpl_module_inst.h: + + New files containing a new visitor dedicated to the + generation of implied IDL in the AST resulting + from a template module instantiation. This 'preprocessing' + visitor will make a traversal before any of the others, + so that CCM, AMI and AMH implied IDL can be generated + from the contents of an instantiated module. + + Wed Jan 6 23:21:23 UTC 2010 Jeff Parsons + + * TAO_IDL/include/ast_template_module.h: + * TAO_IDL/include/ast_template_module_inst.h: + * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp: + * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp: + * TAO_IDL/be/be_visitor_scope.cpp: + * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_svs.cpp: + * TAO_IDL/be/be_visitor_operation/argument_marshal.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_base.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + * TAO_IDL/be/be_visitor_root/root_sth.cpp: + * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp: + * TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp: + * TAO_IDL/be/be_visitor_template_export.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_component/component_cs.cpp: + * TAO_IDL/be/be_visitor_array/array.cpp: + * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_array/array_cs.cpp: + * TAO_IDL/be/be_visitor_array/array_ch.cpp: + * TAO_IDL/be/be_visitor_array/array_ci.cpp: + * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp: + * TAO_IDL/be/be_produce.cpp: + * TAO_IDL/be/be_visitor_context.cpp: + * TAO_IDL/be/be_visitor_field/field_ci.cpp: + * TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_field/field_cs.cpp: + * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_field/field_ch.cpp: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/be/be_template_module.cpp: + * TAO_IDL/ast/ast_template_module.cpp: + * TAO_IDL/ast/ast_template_module_inst.cpp: + * TAO_IDL/be_include/be_visitor_context.h: + * TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h: + * TAO_IDL/be_include/be_visitor_valuebox/field_ci.h: + * TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h: + * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: + + - Changed 'scope' member of class be_visitor_context to + actually be a scope type, rather than a decl type as + previously. + + - Added a new visitor and a separate pass for template module + instantiation. + + - Added a few of the necessary visit_* methods to the + new visitor. + + Tue Jan 5 23:22:24 UTC 2010 Jeff Parsons + + * TAO_IDL/be/be_connector.cpp: + * TAO_IDL/be/be_template_module_inst.cpp: + * TAO_IDL/be/be_template_module_ref.cpp: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/be/be_template_module.cpp: + * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: + + Uncommented code in accept() methods, started + implementation of instantiated template module + traversal in be_visitor_ccm_pre_proc, and + cosmetic changes. + + Tue Jan 5 19:33:27 UTC 2010 Jeff Parsons + + * TAO_IDL/ast/ast_template_module.cpp: + * TAO_IDL/ast/ast_template_module_ref.cpp: + * TAO_IDL/ast_template_module_inst.cpp: + Uncommented code in ast_accept() methods. + +Thu Jan 14 04:03:17 UTC 2010 Abdul Sowayan + + * tests/Bug_3766_Regression/client.cpp: + + Removed: + + "CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA");" + + This is a client, it doesn't link the PortableServer library + and does not use the RootPOA in the program. + + Trying to resolve the RootPOA is believed to cause the test to fail + on the iPhone Simulator build. + +Wed Jan 13 10:47:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: + * TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h: + Bool changes + +Wed Jan 13 10:24:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + Const change + + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: + Create AMI_ sendc interface nodes + +Wed Jan 13 08:51:19 UTC 2010 Johnny Willemsen + + * tao/AnyTypeCode/NVList.cpp: + Const changes, layout changes, only one exit point in a method + + * tao/AnyTypeCode/NVList_Adapter_Impl.cpp: + * tao/AnyTypeCode/NVList_Adapter_Impl.h: + Layout change + + * tao/debug.cpp: + Explicitly initialise TAO_orb_debug to 0 + + * tao/debug.h: + Layout changes + + * tao/Messaging/ExceptionHolder.pidl: + Layout changes + + * tao/Messaging/ExceptionHolder_i.cpp: + Bool and layout changes + + * tao/ORB_Core.cpp: + Layout changes + +Wed Jan 13 08:30:19 UTC 2010 Johnny Willemsen + + * orbsvcs/examples/RtEC/Simple/run_test.pl: + Fixed fuzz error + +Tue Jan 12 20:12:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + * TAO_IDL/be_include/be_visitor_ami_pre_proc.h: + No need to pass the exceptionholder through all methods, there is only + one + + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: + * TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h: + Started generating the AMI_ sendc interface + +Tue Jan 12 19:31:19 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + Bool changes + + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: + * TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h: + More tweaks to ami4ccm code generation + +Tue Jan 12 19:08:39 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + * TAO_IDL/be_include/be_visitor_ami_pre_proc.h: + No seperate method needed for creating the exceptionholder + +Tue Jan 12 14:12:39 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: + Commented out some code not needed for ami4ccm, but needed for + ami + +Tue Jan 12 08:34:39 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: + * TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h: + Extended AMI4CCM code generation + +Fri Jan 8 11:42:39 UTC 2010 Johnny Willemsen + + * TAO_IDL/ast/ast_interface.cpp: + layout change + + * TAO_IDL/be/be_global.cpp: + CCM_AMI::ReplyHandler is a local interface + + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: + * TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h: + Enable most code in this file in order to implement this ami4ccm + implied node generation + + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + Don't crash when create_inheritance_list returns 0, but log an error + +Fri Jan 8 11:18:39 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_global.cpp: + * TAO_IDL/be_include/be_global.h: + Added CCM_AMI::ReplyHandler base interface + +Fri Jan 8 10:56:39 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_global.cpp: + * TAO_IDL/be_include/be_global.h: + Added members for CCM_AMI module and its ExceptionHolder + +Fri Jan 8 10:12:39 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_uses.cpp: + * TAO_IDL/be_include/be_uses.h: + Added original_uses member + + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: + Prevent recursion using the new original_uses member + +Thu Jan 7 18:56:39 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_array.cpp + * TAO_IDL/be/be_interface.cpp + * TAO_IDL/be/be_operation_strategy.cpp + * TAO_IDL/be/be_visitor_interface/amh_ss.cpp + * TAO_IDL/be/be_visitor_interface/interface.cpp + * TAO_IDL/be/be_visitor_interface/interface_is.cpp + Initialise pointers with 0, small layout changes + +Thu Jan 7 18:45:39 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: + Added some more code for implicit sendc_ ports + + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + Fixed typos + + * TAO_IDL/be_include/be_interface_strategy.h: + Layout changes + +Thu Jan 7 11:04:58 UTC 2010 Martin Corino + + * tests/OBV/Supports/Supports_Test.mpc: + Reinstated dummy_label dependency. + + * bin/tao_orb_tests.lst: + Disabled the OBV/Supports test again since there Solaris compilers + as well as CB2010 do not grok the TAO code for valuetype 'supports' + constructs and there is currently no budget to fix this. + This will need to be resolved at some time by either compiler fixes + or a redesign of the TAO valuetype framework. + +Thu Jan 7 10:44:39 UTC 2010 Johnny Willemsen + + * TAO_IDL/ast/ast_component.cpp + * TAO_IDL/be/be_codegen.cpp + * TAO_IDL/be/be_global.cpp + * TAO_IDL/be/be_produce.cpp + * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp + * TAO_IDL/be/be_visitor_arg_traits.cpp + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp + * TAO_IDL/be_include/be_global.h + * TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h + * TAO_IDL/include/ast_component.h + Committing the initial files for the ami4ccm visitors + which should create all implied nodes for ami4ccm. + This can be enabled using the new -GM option. + +Mon Jan 4 14:25:39 UTC 2010 Johnny Willemsen + + * TAO_IDL/be/be_visitor_argument/argument.cpp + * TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp + * TAO_IDL/be/be_visitor_array/array.cpp + * TAO_IDL/be/be_visitor_component/component_cs.cpp + * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp + * TAO_IDL/be/be_visitor_field/field_ch.cpp + * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp + * TAO_IDL/be/be_visitor_interface/interface_cs.cpp + * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp + * TAO_IDL/be/be_visitor_operation/ami_cs.cpp + * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp + * TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp + * TAO_IDL/be/be_visitor_operation/rettype.cpp + * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp + * TAO_IDL/be/be_visitor_sequence/sequence_base.cpp + * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp + * TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp + * TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp + * TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp + * TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp + * TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp + * TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp + * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp + * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp + * TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp + * TAO_IDL/be/be_visitor_union/discriminant_ch.cpp + * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp + * TAO_IDL/be/be_visitor_union/discriminant_cs.cpp + * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp + * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp + * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp + * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp + * TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp + * TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp + * TAO_IDL/be/be_visitor_valuebox/field_ch.cpp + * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp + * TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp + * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp + * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp + * TAO_IDL/be/be_visitor_valuetype/field_ci.cpp + * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp + Initialise pointer with 0 + +Thu Dec 31 13:20:32 UTC 2009 Vladimir Zykov + + * tests/Bug_1330_Regression/run_test.pl: + Added missing assignment for $TARGETHOSTNAME. + +Tue Dec 29 16:37:54 UTC 2009 Vladimir Zykov + + * orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp: + Fixed a small memory leak. + + * tests/RTCORBA/Banded_Connections/run_test.pl: + Fixed a typo in IOR name. + +Tue Dec 29 09:23:00 UTC 2009 Johnny Willemsen + + * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h: + Fix for CB2010 + +Tue Dec 29 09:12:00 UTC 2009 Johnny Willemsen + + * TAO_IDL/Makefile.am: + Updated for all changes related to IDL3+ + +Tue Dec 29 04:07:06 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_union.cpp: + * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp: + * TAO_IDL/be/be_valuetype.cpp: + * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_structure.cpp: + * TAO_IDL/be/be_type.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp: + * TAO_IDL/be/be_typedef.cpp: + * TAO_IDL/be/be_structure.cpp: + * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp: + * TAO_IDL/be/be_field.cpp: + * TAO_IDL/be/be_predefined_type.cpp: + * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp: + * TAO_IDL/be/be_produce.cpp: + * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp: + * TAO_IDL/be/be_sequence.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_enum.cpp: + * TAO_IDL/be/be_string.cpp: + * TAO_IDL/be/be_array.cpp: + * TAO_IDL/be_include/be_field.h: + * TAO_IDL/be_include/be_interface.h: + * TAO_IDL/be_include/be_enum.h: + * TAO_IDL/be_include/be_type.h: + * TAO_IDL/be_include/be_union.h: + * TAO_IDL/be_include/be_predefined_type.h: + * TAO_IDL/be_include/be_string.h: + * TAO_IDL/be_include/be_array.h: + * TAO_IDL/be_include/be_typedef.h: + * TAO_IDL/be_include/be_structure.h: + * TAO_IDL/be_include/be_valuetype.h: + * TAO_IDL/be_include/be_sequence.h: + + Fixed inconsistencies in the generation of ostream operators + for array types, both as top-level declarations and as + members. + +Thu Dec 24 16:58:36 UTC 2009 Phil Mesnier + + * bin/tao_other_tests.lst: + Skip the new LB tests on singlethreaded builds. + +Thu Dec 24 13:15:42 UTC 2009 Jeff Parsons + + * TAO_IDL/be_include/be_template_module_ref.h: + * TAO_IDL/be/be_template_module_ref.cpp: + + Fixed cut-and-paste error in virtual method name. + +Thu Dec 24 10:20:00 UTC 2009 Johnny Willemsen + + * orbsvcs/orbsvcs/Trader/Trader.h: + * tao/Incoming_Message_Stack.h: + Fixes for C++ Builder 2010 Update 4/5 + + * tao/Synch_Invocation.cpp: + Updated some very old comments + +Wed Dec 23 19:14:42 UTC 2009 Johnny Willemsen + + * orbsvcs/tests/Bug_2248_Regression/client.cpp: + Fixed QNX compile problem + +Wed Dec 23 19:07:38 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + + In implied IDL generation for AMI, added a copy of + exception list to AMI-releated operation nodes corresponding + to attributes the same as they already are for other + operation nodes. Thanks to Johnny Willemsen + for reporting the problem and creating a regression test. + +Wed Dec 23 18:48:31 UTC 2009 Yan Dai + + * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + + Made bool changes according to ACE-guidelines.html. + +Wed Dec 23 15:47:02 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + Reverted a change to the 'state_member' production rule that + was causing the public/private qualifier to be lost in + valuetypes and eventtypes. + + * TAO_IDL/include/ast_field.h: + + Removed extra spaces. + +Wed Dec 23 11:56:42 UTC 2009 Vladimir Zykov + + * tests/CodeSets/simple/client.cpp: + * tests/CodeSets/simple/server.cpp: + * tests/CodeSets/simple/run_test.pl: + * tests/Bug_3766_Regression/client.cpp: + * tests/Bug_3766_Regression/server.cpp: + * tests/Bug_3766_Regression/run_test.pl: + Changed the tests so they accept IORs from command line. + + * tests/Bug_3790_Regression/server2.cpp: + Fixed compile error on wchar builds. + + * bin/tao_orb_tests.lst: + Disabled a test for bug#3542 on static builds. + +Wed Dec 23 09:31:42 UTC 2009 Johnny Willemsen + + * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp: + Small code layout improvement + +Wed Dec 23 09:13:42 UTC 2009 Johnny Willemsen + + * tests/Bug_3801_Regression: + New test to reproduce problem with AMI and attributes + + * bin/tao_orb_tests.lst: + Added 3801 + + * bin/tao_other_tests.lst: + Removed WinCE + + * tao/Messaging/ExceptionHolder_i.cpp: + bool changes + +` * tao/Object.cpp: + bool changes, check all return values + + * tao/Valuetype/ValueBase.cpp: + bool changes, fixed a lot of debug messages that had a totally + wrong layout + +Tue Dec 22 17:19:42 UTC 2009 Johnny Willemsen + + * tests/IDL_Test/attribute.idl: + A readonly attribute should just use raises, on a rw attribute + first getraises and after that setraises has to be specified, + not other way around + +Tue Dec 22 15:59:42 UTC 2009 Johnny Willemsen + + * tests/IDL_Test/attribute.idl: + * tests/IDL_Test/IDL_Test.mpc: + Added test file for attributes + +Tue Dec 22 17:06:08 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/fe_utils.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.h: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/include/fe_utils.h: + * TAO_IDL/include/utl_err.h: + + - Fixed bug in grammar that did not allow a template module + to be declared inside a regular module. + + - Removed unused data types from FE_Utils and from the big + parser union. + +Mon Dec 21 20:11:42 UTC 2009 Jeff Parsons + + * TAO_IDL/ast/ast_operation.cpp(fe_add_exception): + + In adding support for template param holders in a raises clause, + inadvertently exluded the use case for Messaging::UserExceptionBase, + which is native. This fix restores the handling of that use case. + +Mon Dec 21 15:13:57 UTC 2009 Denis Budko + + * orbsvcs/tests/EC_Mcast/run_test.pl: + * performance-tests/Throughput/run_test.pl: + * tests/AMI_Buffering/run_timeout.pl: + * tests/AMI_Buffering/run_message_count.pl: + * tests/AMI_Buffering/run_buffer_size.pl: + * tests/AMI_Buffering/run_timeout_reactive.pl: + * tests/AMI_Buffering/run_test.pl: + * tests/CodeSets/simple/run_test.pl: + * tests/Oneway_Buffering/run_timeout.pl: + * tests/Oneway_Buffering/run_message_count.pl: + * tests/Oneway_Buffering/run_buffer_size.pl: + * tests/Oneway_Buffering/run_timeout_reactive.pl: + * tests/Oneway_Buffering/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Mon Dec 21 13:09:35 UTC 2009 Denis Budko + + * DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp: + * tests/Oneway_Send_Timeouts/run_test.pl: + * tests/Optimized_Connection/run_test.pl: + * examples/Simple/time-date/svc.conf: + * examples/Simple/time-date/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Mon Dec 21 12:39:29 UTC 2009 Vladimir Zykov + + * bin/tao_orb_tests.lst: + * tao/ORB_Core.cpp: + Fixed bug#3790 and marked corresponding test as fixed in lst. + Now when object is reinitialized and it's not collocated then + it's explicitly marked as remote one. + +Sun Dec 20 15:57:15 UTC 2009 Abdul Sowayan + + * TAO_IDL/be/be_template_module_ref.cpp: + Removed a stray charachter that was causing a compile time error. + +Sat Dec 19 06:59:00 UTC 2009 Johnny Willemsen + + * TAO_IDL/be/be_interface.cpp + * TAO_IDL/be_include/be_interface.h + Merged changes back in that I reverted by accident + +Fri Dec 18 18:58:00 UTC 2009 Johnny Willemsen + + Merged changes for templated modules in the TAO_IDL front end to svn head + + Thu Dec 17 20:35:28 UTC 2009 Jeff Parsons + + * orbsvcs/IFR_Service/ifr_adding_visitor.h: + * orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp: + * orbsvcs/IFR_Service/ifr_adding_visitor.cpp: + + Changes to TAO IFR loader required by changes to TAO_IDL + front end in + + Wed Dec 16 20:20:13 UTC 2009 Jeff Parsons + + Wed Dec 16 20:20:13 UTC 2009 Jeff Parsons + + * TAO_IDL/include/ast_generator.h: + * TAO_IDL/include/ast_valuetype.h: + * TAO_IDL/include/ast_eventtype.h: + * TAO_IDL/include/ast_home.h: + * TAO_IDL/include/ast_interface.h: + * TAO_IDL/include/ast_component.h: + * TAO_IDL/be/be_visitor_typecode/value_typecode.cpp: + * TAO_IDL/be/be_valuetype.cpp: + * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp: + * TAO_IDL/be/be_visitor_interface/interface_sh.cpp: + * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp: + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + * TAO_IDL/be/be_home.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp: + * TAO_IDL/be/be_component.cpp: + * TAO_IDL/be/be_visitor_amh_pre_proc.cpp: + * TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp: + * TAO_IDL/be/be_visitor_component/component_sh.cpp: + * TAO_IDL/be/be_eventtype.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/be/be_generator.cpp: + * TAO_IDL/ast/ast_home.cpp: + * TAO_IDL/ast/ast_interface.cpp: + * TAO_IDL/ast/ast_component.cpp: + * TAO_IDL/ast/ast_generator.cpp: + * TAO_IDL/ast/ast_valuetype.cpp: + * TAO_IDL/ast/ast_eventtype.cpp: + * TAO_IDL/be_include/be_interface.h: + * TAO_IDL/be_include/be_component.h: + * TAO_IDL/be_include/be_eventtype.h: + * TAO_IDL/be_include/be_home.h: + * TAO_IDL/be_include/be_generator.h: + * TAO_IDL/be_include/be_valuetype.h: + * TAO_IDL/be_include/be_visitor_ami_pre_proc.h: + * TAO_IDL/fe/fe_obv_header.cpp: + * TAO_IDL/fe/fe_home_header.cpp: + * TAO_IDL/fe/fe_interface_header.cpp: + * TAO_IDL/fe/fe_component_header.cpp: + * TAO_IDL/narrow/narrow.cpp: + * TAO_IDL/util/utl_scope.cpp: + + Changes to support template parameters as base + interfaces/valuetypes, supported interfaces, + primary keys, and members of a throw spec list. + Several internal container types were widened to AST_Type + from whatever they were originally, to enable + them to also contain AST_Param_Holder. This + change precipitated many small mods, to the + backend as well as the frontend. + + Tue Dec 15 20:34:51 UTC 2009 Jeff Parsons + + * TAO_IDL/include/utl_exceptlist.h: + * TAO_IDL/include/fe_home_header.h: + * TAO_IDL/include/fe_interface_header.h: + * TAO_IDL/include/fe_obv_header.h: + * TAO_IDL/include/ast_interface.h: + * TAO_IDL/include/fe_component_header.h: + * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp: + * TAO_IDL/be/be_field.cpp: + * TAO_IDL/ast/ast_operation.cpp: + * TAO_IDL/fe/fe_obv_header.cpp: + * TAO_IDL/fe/fe_home_header.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/fe_interface_header.cpp: + * TAO_IDL/fe/fe_component_header.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/util/utl_exceptlist.cpp: + * TAO_IDL/util/utl_scope.cpp: + + - Added support for template parameters in an + operation throw spec. + + - Began support for template parameters as + base interfaces/valuetypes and supported interfaces. + + Mon Dec 14 20:26:51 UTC 2009 Jeff Parsons + + * TAO_IDL/include/ast_template_common.h: + * TAO_IDL/include/fe_template_interface_header.h: + * TAO_IDL/include/fe_template_header_common.h: + * TAO_IDL/include/fe_instantiated_interface_header.h: + * TAO_IDL/include/ast_template_interface.h: + * TAO_IDL/be/be_template_interface.cpp: + * TAO_IDL/be/be_visitor_iface_inst.cpp: + * TAO_IDL/ast/ast_template_common.cpp: + * TAO_IDL/ast/ast_template_interface.cpp: + * TAO_IDL/be_include/be_template_interface.h: + * TAO_IDL/be_include/be_visitor_iface_inst.h: + * TAO_IDL/fe/fe_template_header_common.cpp: + * TAO_IDL/fe/fe_template_interface_header.cpp: + * TAO_IDL/fe/fe_instantiated_interface_header.cpp: + + Removed these files, they were part of the support + for the original version of IDL3+, before the + revisions. + + * TAO_IDL/fe/y.tab.h: + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/include/ast_generator.h: + * TAO_IDL/be/be_visitor_interface.cpp: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: + * TAO_IDL/fe/idl.ll: + + Changes mandated by the removal of the above + files. + + Mon Dec 14 19:21:39 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + Restored semantic action to create a non-template porttype, + removed at the beginning of revised IDL3+ template support + work. + + Mon Dec 14 18:16:17 UTC 2009 Jeff Parsons + + * TAO_IDL/ast/ast_expression.cpp: + * TAO_IDL/ast/ast_array.cpp: + + Completed support for template parameters as array bounds. + + Fri Dec 11 19:17:52 UTC 2009 Jeff Parsons + + * TAO_IDL/ast/ast_sequence.cpp: + * TAO_IDL/ast/ast_array.cpp: + * TAO_IDL/ast/ast_field.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + - More error checking when using template parameter for + sequence element type. + + - Start on support for template parameter as array + bound, not yet complete. + + Fri Dec 4 19:23:17 UTC 2009 Jeff Parsons + + * TAO_IDL/include/ast_generator.h: + * TAO_IDL/include/ast_param_holder.h: + * TAO_IDL/include/ast_expression.h: + * TAO_IDL/be/be_param_holder.cpp: + * TAO_IDL/be/be_generator.cpp: + * TAO_IDL/ast/ast_expression.cpp: + * TAO_IDL/ast/ast_sequence.cpp: + * TAO_IDL/ast/ast_generator.cpp: + * TAO_IDL/ast/ast_param_holder.cpp: + * TAO_IDL/be_include/be_param_holder.h: + * TAO_IDL/be_include/be_generator.h: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/fe_declarator.cpp: + * TAO_IDL/util/utl_err.cpp: + * TAO_IDL/util/utl_scope.cpp: + + Support for template parameter as sequence + bound, and additional error checking for + template parameter as const type, sequence + type and sequence bound. + + Thu Dec 3 20:39:05 UTC 2009 Jeff Parsons + + * TAO_IDL/include/ast_expression.h: + * TAO_IDL/ast/ast_expression.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Added check to see if an expression has been created as the + rhs of a constant declaration that is a reference to a + template module parameter. If so, we can skip the coercion + and some of the evaluation until instantiation time. + + Thu Dec 3 19:15:15 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + * TAO_IDL/include/fe_utils.h: + + Thu Dec 3 18:52:22 UTC 2009 Jeff Parsons + + * TAO_IDL/ast/ast_field.cpp: + + Added check for AST_Param_Holder as field type, and + made this type (along with sequence and array) one + whose lifetime is tied to the field node. + + * TAO_IDL/util/utl_global.cpp: + + Added initialization in the constuctor for the new + member that stores a template param list. + + Wed Dec 2 21:21:24 UTC 2009 Jeff Parsons + + * TAO_IDL/include/ast_generator.h: + * TAO_IDL/include/ast_param_holder.h: + * TAO_IDL/include/fe_utils.h: + * TAO_IDL/include/idl_global.h: + * TAO_IDL/include/fe_interface_header.h: + * TAO_IDL/include/utl_scope.h: + * TAO_IDL/include/ast_consumes.h: + * TAO_IDL/include/ast_publishes.h: + * TAO_IDL/include/ast_operation.h: + * TAO_IDL/include/ast_emits.h: + * TAO_IDL/be/be_param_holder.cpp: + * TAO_IDL/be/be_publishes.cpp: + * TAO_IDL/be/be_decl.cpp: + * TAO_IDL/be/be_consumes.cpp: + * TAO_IDL/be/be_emits.cpp: + * TAO_IDL/be/be_generator.cpp: + * TAO_IDL/ast/ast_consumes.cpp: + * TAO_IDL/ast/ast_publishes.cpp: + * TAO_IDL/ast/ast_expression.cpp: + * TAO_IDL/ast/ast_interface.cpp: + * TAO_IDL/ast/ast_template_module.cpp: + * TAO_IDL/ast/ast_emits.cpp: + * TAO_IDL/ast/ast_template_common.cpp: + * TAO_IDL/ast/ast_module.cpp: + * TAO_IDL/ast/ast_generator.cpp: + * TAO_IDL/ast/ast_union.cpp: + * TAO_IDL/ast/ast_param_holder.cpp: + * TAO_IDL/ast/ast_exception.cpp: + * TAO_IDL/ast/ast_structure.cpp: + * TAO_IDL/ast/ast_attribute.cpp: + * TAO_IDL/ast/ast_valuetype.cpp: + * TAO_IDL/ast/ast_argument.cpp: + * TAO_IDL/be_include/be_publishes.h: + * TAO_IDL/be_include/be_param_holder.h: + * TAO_IDL/be_include/be_emits.h: + * TAO_IDL/be_include/be_generator.h: + * TAO_IDL/be_include/be_consumes.h: + * TAO_IDL/fe/fe_utils.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/fe_template_interface_header.cpp: + * TAO_IDL/fe/fe_interface_header.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/util/utl_global.cpp: + * TAO_IDL/util/utl_scope.cpp: + + - Added code to UTL_Scope::lookup_by_name() that can + match an input to a template parameter, if any, of the + enclosing scope. + + - Changed constructor and IDL compiler factory function + signatures for publishes, emits and consumes nodes to + take AST_Type rather than AST_EventType, allowing a + template parameter placeholder to be accepted if that + particular IDL construct is parameterized. + + - Removed #include of ast_typedef.h from utl_scope.h and + added it to the necessary .cpp files. + + - Added check for duplicate names in a formal template + parameter list. + + Tue Dec 1 18:00:15 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + Fixed typo and regenerated/recompiled. + + Tue Dec 1 17:39:09 UTC 2009 Jeff Parsons + + * TAO_IDL/include/ast_template_module.h: + * TAO_IDL/include/utl_scope.h: + * TAO_IDL/ast/ast_template_module.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/util/utl_scope.cpp: + + - Finished matching/error checking code for template + parameter references + - Finished semantic actions for template module aliases + and the associated template parameter references + - Factored ACE_NEW_RETURN macro out of both paths of an + IF block in several production rules dealing with + comma-separated lists + + Tue Dec 1 14:46:26 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/y.tab.cpp: + + Regenrerated and recompiled. + + Mon Nov 30 23:14:05 UTC 2009 Jeff Parsons + + * TAO_IDL/include/idl_global.h: + * TAO_IDL/include/ast_template_module.h: + * TAO_IDL/ast/ast_template_module.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/util/utl_err.cpp: + + Added parse state flags & associated error messages + for aliased modules. Also added error-checking code + for aliases to AST_Template_Module, and some semantic + action code for aliased modules. + + Mon Nov 30 21:46:22 UTC 2009 Jeff Parsons + + * TAO_IDL/include/ast_module.h: + * TAO_IDL/include/utl_scope.h: + * TAO_IDL/include/utl_err.h: + * TAO_IDL/ast/ast_expression.cpp: + * TAO_IDL/ast/ast_template_module.cpp: + * TAO_IDL/ast/ast_template_common.cpp: + * TAO_IDL/ast/ast_module.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/util/utl_err.cpp: + * TAO_IDL/util/utl_scope.cpp: + + Finished semantic actions and added diagnostics + for template module instantiations. + + Mon Nov 30 20:11:27 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + Fixed typo and regenerated. + + Mon Nov 30 20:04:13 UTC 2009 Jeff Parsons + + * TAO_IDL/includ/idl_global.h: + * TAO_IDL/util/utl_err.cpp: + + Added new parse states for instantiated template modules, + with corresponding error messages. + + * TAO_IDL/include/ast_template_module.h: + * TAO_IDL/ast/ast_template_module.cpp: + + Added methods to check the arglist of an instantiated + template modules against the formal parameters. + + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Added semantic actions for creation of instantiated + template module. + + Mon Nov 30 17:30:44 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + Added overlooked case IDL_ENUM to + and regenerated. + + Mon Nov 30 16:56:21 UTC 2009 Jeff Parsons + + * TAO_IDL/include/idl_global.h: + * TAO_IDL/util/utl_global.cpp: + + Removed check for illegal const type added in + + Fri Nov 27 23:13:05 UTC 2009 Jeff Parsons + + since it turned out to be unnecessary, the check is made elswhere. + + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Added semantic action for single template arg. + + Fri Nov 27 23:13:05 UTC 2009 Jeff Parsons + + * TAO_IDL/include/idl_global.h: + * TAO_IDL/include/utl_list.h: + * TAO_IDL/include/utl_idlist.h: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/util/utl_exprlist.cpp: + * TAO_IDL/util/utl_list.cpp: + * TAO_IDL/util/utl_exceptlist.cpp: + * TAO_IDL/util/utl_idlist.cpp: + * TAO_IDL/util/utl_global.cpp: + + - Cosmetic changes to list classes + - Check for illegal const type in expression with scoped name + - Minor modifications of production rule code + + Fri Nov 27 19:03:58 UTC 2009 Jeff Parsons + + * TAO_IDL/ast/ast_constant.cpp: + * TAO_IDL/ast/ast_expression.cpp: + + Cosmetic changes. + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.h: + * TAO_IDL/fe/y.tab.cpp: + + Added semantic actions for template argument list. + + Fri Nov 27 16:53:09 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/fe_template_interface_header.cpp: + + Minor change to avoid compilation error. This file will + eventually be removed once some of its code has been + relocated. + + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Cleaned up semantic action for and tested + lookup and narrowing of template module referenced in a + template module instantiation. + + Wed Nov 25 20:19:10 UTC 2009 Jeff Parsons + + * TAO_IDL/include/utl_err.h: + * TAO_IDL/util/utl_err.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Start of semantic actions for instantiated template modules, + and related error messages. + + Wed Nov 25 18:52:19 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + Fixed typos and some discrepancies between idl.yy and a + hand-crafted y.tab.cpp, and regenerated. + + Wed Nov 25 17:58:50 UTC 2009 Jeff Parsons + + * TAO_IDL/include/fe_utils.h: + * TAO_IDL/fe/fe_utils.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Added support for the 'const' formal template parameter type. + + Wed Nov 25 01:35:38 UTC 2009 Jeff Parsons + + * TAO_IDL/include/idl_global.h: + * TAO_IDL/util/utl_global.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Fixed bugs in 'sequence' template param checking. + + Tue Nov 24 21:20:55 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + Regenerated parsing code and recompiled. + + Tue Nov 24 20:54:20 UTC 2009 Jeff Parsons + + * TAO_IDL/include/idl_global.h: + * TAO_IDL/include/utl_err.h: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/util/utl_err.cpp: + * TAO_IDL/util/utl_global.cpp: + + - Added check for mismatched 'sequence' template param + - Updated parse state values + - Updated semantic action that creates a fixed module + - Added semantic action to create a template module + + Tue Nov 24 18:32:54 UTC 2009 Jeff Parsons + + * TAO_IDL/ast/ast_param_holder.cpp: + * TAO_IDL/ast/ast_template_module.cpp: + * TAO_IDL/ast/ast_template_module_inst.cpp: + * TAO_IDL/ast/ast_template_module_ref.cpp: + * TAO_IDL/be/be_visitor.cpp: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/include/ast_param_holder.h: + * TAO_IDL/include/ast_template_module.h: + * TAO_IDL/include/ast_template_module_inst.h: + * TAO_IDL/include/ast_template_module_ref.h: + * TAO_IDL/include/idl_global.h: + * TAO_IDL/util/utl_global.cpp: + + Fixed compile warnings and added semantic actions for + formal template parameters. + + Mon Nov 23 20:37:29 UTC 2009 Jeff Parsons + + * TAO_IDL/include/ast_template_module_ref.h: + * TAO_IDL/ast/ast_template_module_ref.cpp: + * TAO_IDL/be_include/be_template_module_ref.h: + * TAO_IDL/be/be_template_module_ref.cpp: + + New files, containing the AST node type + representing a reference to an IDL template + module denoted by the IDL keyword 'alias'. + + * TAO_IDL/include/ast_visitor.h: + * TAO_IDL/be/be_template_interface.cpp: + * TAO_IDL/be/be_typedef.cpp: + * TAO_IDL/be/be_visitor.cpp: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/ast/ast_template_interface.cpp: + * TAO_IDL/be_include/be_visitor.h: + * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: + + - Removed methods and code blocks referencing + AST node types that have been removed. + + - Updated visit_* methods to frontend and backend + visitor classes. + + - Updated create_* methods in generator classes. + + * orbsvcs/IFR_Service/ifr_visitor.h: + * orbsvcs/IFR_Service/ifr_visitor.cpp: + + Update visit_* methods in base class visitor so + backend IFR loader library will comple. New visit_* + methods are not yet implemented. + + Fri Nov 20 20:22:23 UTC 2009 Jeff Parsons + + * TAO_IDL/include/ast_module.h: + * TAO_IDL/include/ast_connector.h: + * TAO_IDL/ast/ast_connector.cpp: + * TAO_IDL/ast/ast_module.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Removed more operations and includes that were caught + by a build from scratch. + + Fri Nov 20 20:09:59 UTC 2009 Jeff Parsons + + * TAO_IDL/include/ast_instantiated_connector.h: + * TAO_IDL/include/ast_tmpl_port.h: + * TAO_IDL/include/ast_tmpl_mirror_port.h: + * TAO_IDL/ast/ast_instantiated_connector.cpp: + * TAO_IDL/ast/ast_tmpl_mirror_port.cpp: + * TAO_IDL/ast/ast_tmpl_port.cpp: + * TAO_IDL/be_include/be_tmpl_port.h: + * TAO_IDL/be_include/be_instantiated_connector.h: + * TAO_IDL/be_include/be_tmpl_mirror_port.h: + * TAO_IDL/be/be_tmpl_mirror_port.cpp: + * TAO_IDL/be/be_tmpl_port.cpp: + * TAO_IDL/be/be_instantiated_connector.cpp: + + Removed these files, the AST node types they contain + are not relevant to the updated IDL3+ spec. + + * TAO_IDL/include/ast_template_module_inst.h: + * TAO_IDL/ast/ast_template_module_inst.cpp: + * TAO_IDL/be/be_template_module_inst.cpp: + * TAO_IDL/be_include/be_template_module_inst.h: + + New files, containing the AST node type corresponding + to an IDL template module declaration. + + * TAO_IDL/include/ast_generator.h: + * TAO_IDL/include/fe_utils.h: + * TAO_IDL/include/ast_mirror_port.h: + * TAO_IDL/include/ast_provides.h: + * TAO_IDL/include/ast_template_module.h: + * TAO_IDL/include/ast_extended_port.h: + * TAO_IDL/include/ast_uses.h: + * TAO_IDL/include/ast_porttype.h: + * TAO_IDL/include/ast_consumes.h: + * TAO_IDL/include/ast_publishes.h: + * TAO_IDL/include/ast_emits.h: + * TAO_IDL/be/be_mirror_port.cpp: + * TAO_IDL/be/be_extended_port.cpp: + * TAO_IDL/be/be_generator.cpp: + * TAO_IDL/be/be_porttype.cpp: + * TAO_IDL/ast/ast_template_module.cpp: + * TAO_IDL/ast/ast_generator.cpp: + * TAO_IDL/ast/ast_extended_port.cpp: + * TAO_IDL/ast/ast_mirror_port.cpp: + * TAO_IDL/ast/ast_porttype.cpp: + * TAO_IDL/be_include/be_generator.h: + * TAO_IDL/be_include/be_porttype.h: + * TAO_IDL/be_include/be_extended_port.h: + * TAO_IDL/be_include/be_mirror_port.h: + * TAO_IDL/fe/fe_utils.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Removed operations, args and blocks of code that are + not relelvant to the updated IDL3+ spec. + + Thu Nov 19 20:47:43 UTC 2009 Jeff Parsons + + * TAO_IDL/include/ast_param_holder.h: + * TAO_IDL/include/ast_template_module.h: + * TAO_IDL/be/be_param_holder.cpp: + * TAO_IDL/be/be_template_module.cpp: + * TAO_IDL/ast/ast_template_module.cpp: + * TAO_IDL/ast/ast_param_holder.cpp: + * TAO_IDL/be_include/be_template_module.h: + * TAO_IDL/be_include/be_param_holder.h: + + New files, containing new AST node types + corresponding to updates in the IDL3+ grammar. + + * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: + * TAO_IDL/include/ast_generator.h: + * TAO_IDL/include/ast_decl.h: + * TAO_IDL/include/ast_connector.h: + * TAO_IDL/be/be_enum_val.cpp: + * TAO_IDL/be/be_template_interface.cpp: + * TAO_IDL/be/be_connector.cpp: + * TAO_IDL/be/be_generator.cpp: + * TAO_IDL/ast/ast_connector.cpp: + * TAO_IDL/ast/ast_template_common.cpp: + * TAO_IDL/ast/ast_generator.cpp: + * TAO_IDL/ast/ast_decl.cpp: + * TAO_IDL/be_include/be_connector.h: + * TAO_IDL/be_include/be_generator.h: + + Cosmetic changes. + + * TAO_IDL/be_include/be_typedef.h: + * TAO_IDL/include/ast_typedef.h: + * TAO_IDL/ast/ast_typedef.cpp: + * TAO_IDL/be/be_typedef.cpp: + * TAO_IDL/ast/ast_field.cpp: + * TAO_IDL/include/ast_field.h: + + Made typedef nodes subclasses of field + nodes, similar to argument, attribute, + port, etc. so the case when these nodes + refer to IDL template parameters can be + handled in a consistent manner. + + Thu Nov 19 14:43:01 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + Fixed typos in generated file. + + Thu Nov 19 14:23:09 UTC 2009 Jeff Parsons + + * TAO_IDL/ast/ast_expression.cpp: + + Cosmetic changes. + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + Finished first cut of production rules for revised IDL3+ grammar. + + Mon Nov 16 20:22:50 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/y.tab.cpp: + + Started adding new production rules for template modules. + + Mon Nov 16 15:28:01 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/idl.ll: + * TAO_IDL/fe/idl.yy: + * TAO_IDL/fe/lex.yy.cpp: + * TAO_IDL/fe/lex.yy.cpp.diff: + * TAO_IDL/fe/y.tab.h: + * TAO_IDL/fe/y.tab.cpp: + + Removed '$' as keyword and added keyword 'alias'. Regenerated flex and + bison files. + +Fri Dec 18 14:02:52 UTC 2009 Denis Budko + + * tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl: + + Added started argument for server. + +Fri Dec 18 13:44:00 UTC 2009 Martin Corino + + * NEWS: + Updated with fixed bugzilla entries. + +Fri Dec 18 09:23:37 UTC 2009 Vladimir Zykov + + * tests/Bug_3790_Regression/server2.cpp: + Simplified the test. + +Thu Dec 17 13:12:00 UTC 2009 Martin Corino + + * tao/Leader_Follower.h: + * tao/Leader_Follower.inl: + Added method set_new_leader_generator(). + This resolves Bugzilla #3772. + +Thu Dec 17 13:03:32 UTC 2009 Denis Budko + + * interop-tests/wchar/run_test.pl: + + Test is converted to use new test framework + and added to fuzz build. + +Thu Dec 17 12:42:58 UTC 2009 Johnny Willemsen + + * tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl: + Fix fuzz + +Thu Dec 17 11:45:30 UTC 2009 Denis Budko + + * orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl: + * tests/Bug_3479_Regression/run_test.pl: + * tests/TransportCurrent/IIOP/run_test.pl: + * tests/TransportCurrent/Framework/run_test.pl: + * tests/Client_Leaks/run_test.pl: + * tests/ZIOP/run_test.pl: + * tests/RTCORBA/Bug_3382_Regression/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Thu Dec 17 10:22:00 UTC 2009 Martin Corino + + * tao/GIOP_Message_Base.cpp: + Fixed missing request id in logging of LocateRequest/LocateReply & + CancelRequest. + This fixed Bugzilla #2898. + +Thu Dec 17 09:52:52 UTC 2009 Vladimir Zykov + + * tests/Bug_3790_Regression/simple_test.idl: + * tests/Bug_3790_Regression/simple_test_i.cpp: + * tests/Bug_3790_Regression/simple_test_i.h: + * tests/Bug_3790_Regression/server.cpp: + * tests/Bug_3790_Regression/server2.cpp: + * tests/Bug_3790_Regression/run_test.pl: + * tests/Bug_3790_Regression/README: + * tests/Bug_3790_Regression/Bug_3790_Regression.mpc: + * bin/tao_orb_tests.lst: + Added a test for bug#3790 and scheduled it for run as not fixed. + +Wed Dec 16 19:22:58 UTC 2009 Johnny Willemsen + + * tests/CDR/run_test.pl: + Fuzz fix. + +Wed Dec 16 15:19:22 UTC 2009 Denis Budko + + * tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: + + Fuzz fix. + +Wed Dec 16 14:18:03 UTC 2009 Denis Budko + + * orbsvcs/tests/Notify/Timeout/run_test.pl: + * orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl: + * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: + * orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl: + * orbsvcs/tests/Notify/Persistent_POA/run_test.pl: + * orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl: + * orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl: + * orbsvcs/tests/Notify/Reconnecting/run_test.pl: + * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl: + * orbsvcs/tests/Notify/Basic/run_test.pl: + * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: + * orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl: + * orbsvcs/tests/Notify/Blocking/run_test.pl: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: + * orbsvcs/tests/Notify/Lanes/run_test.pl: + * orbsvcs/tests/Notify/Structured_Filter/run_test.pl: + + Removed AddLibPath where it isn't needed. + +Wed Dec 16 13:03:30 UTC 2009 Vladimir Zykov + + * orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp: + * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp: + * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: + Changed the test so that event channel is destroyed before + orb is shutdown. Removed unnecessary lib pathes from perl script. + +Wed Dec 16 11:26:30 UTC 2009 Denis Budko + + * orbsvcs/tests/Notify/Ordering/run_test.pl: + + Fuzz fix. + +Tue Dec 15 12:20:00 UTC 2009 Martin Corino + + * tests/OBV/Supports/server.cpp: + Fuzz fix. + +Mon Dec 14 15:13:30 UTC 2009 Denis Budko + + * orbsvcs/tests/Simple_Naming/run_test_ipv6.pl: + * orbsvcs/tests/Simple_Naming/run_test.pl: + * orbsvcs/tests/Redundant_Naming/run_test.pl: + * orbsvcs/tests/Bug_1437_Regression/run_test.pl: + * orbsvcs/examples/ImR/Combined_Service/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Mon Dec 14 14:52:39 UTC 2009 Abdul Sowayan + + * NEWS: + + Updated to note iPhone/iPod Touch support. + +Mon Dec 14 14:50:00 UTC 2009 Martin Corino + + * tests/OBV/Supports/server.cpp: + * tests/OBV/Supports/Supports_Test_impl.cpp: + Fixed faulty shutdown code causing server crashes. + +Mon Dec 14 13:58:58 UTC 2009 Johnny Willemsen + + * TAO_IDL/be/be_visitor_component/context_svh.cpp: + * TAO_IDL/be/be_visitor_component/context_svs.cpp: + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + Simplified generated code + +Mon Dec 14 07:26:58 UTC 2009 Johnny Willemsen + + * tests/Exposed_Policies/RT_Properties.{h,cpp}: + Fixed unicode runtime problems + +Fri Dec 11 18:27:58 UTC 2009 Johnny Willemsen + + * tao/Makefile.am: + Removed all duplicated files + +Fri Dec 11 16:36:58 UTC 2009 Yan Dai + + * tao/Valuetype/ValueBase.h: + + Removed explicit type specification for indirection flag to + fix implicit constant conversion overflow warning. + +Fri Dec 11 12:27:25 UTC 2009 Denis Budko + + * orbsvcs/tests/Bug_2285_Regression/run_test2.pl: + * orbsvcs/tests/Bug_2285_Regression/server2.cpp: + * orbsvcs/tests/Notify/Ordering/run_test.pl: + * orbsvcs/tests/Notify/MC/run_test.pl: + * orbsvcs/tests/Notify/Discarding/run_test.pl: + * orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl: + * orbsvcs/tests/ImplRepo/NameService/run_test.pl: + * orbsvcs/tests/ImplRepo/run_test.pl: + * orbsvcs/tests/Bug_2248_Regression/server.cpp: + * orbsvcs/tests/Bug_2248_Regression/run_test.pl: + * tests/AlternateIIOP/run_test.pl: + * examples/Load_Balancing/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Fri Dec 11 09:58:33 UTC 2009 Denis Budko + + * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Fri Dec 11 09:26:32 UTC 2009 Denis Budko + + * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl: + * orbsvcs/tests/AVStreams/Pluggable/run_test.pl: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_all.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_all.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/run_all.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/run_all.pl: + * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl: + * orbsvcs/examples/Notify/Lanes/run_test.pl: + * tests/IOR_Endpoint_Hostnames/run_test.pl: + * tests/Optimized_Connection/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Fri Dec 11 09:01:58 UTC 2009 Johnny Willemsen + + * tao/Makefile.am: + BooleanSeq.pidl was listed twice + +Thu Dec 10 18:42:58 UTC 2009 Johnny Willemsen + + * bin/tao_other_tests.lst: + * bin/tao_orb_tests.lst: + Removed FUZZ completely, fuzz now checks all run*.pl scripts + +Thu Dec 10 16:45:24 UTC 2009 Denis Budko + + * bin/tao_other_tests.lst: + * bin/tao_orb_tests.lst: + + Tests are added to fuzz build. + +Thu Dec 10 15:06:28 UTC 2009 Denis Budko + + * orbsvcs/examples/ImR/Combined_Service/run_test.pl: + + Test is converted to use new test framework + and added to fuzz build. + +Thu Dec 10 14:54:27 UTC 2009 Denis Budko + + * orbsvcs/tests/Simple_Naming/run_test_ipv6.pl: + * orbsvcs/tests/Simple_Naming/run_test_ffp.pl: + * orbsvcs/tests/Simple_Naming/run_test.pl: + * orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl: + * orbsvcs/tests/Redundant_Naming/run_test.pl: + * orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl: + * orbsvcs/tests/ImplRepo/NameService/run_test.pl: + * orbsvcs/tests/Bug_3444_Regression/run_test_ipv6.pl: + * orbsvcs/tests/Bug_3444_Regression/run_test.pl: + * orbsvcs/examples/ImR/Advanced/TestServer.cpp: + * orbsvcs/examples/ImR/Advanced/server_main.cpp: + * orbsvcs/examples/ImR/Advanced/TestServer.h: + * orbsvcs/examples/ImR/Advanced/TestClient.cpp: + * orbsvcs/examples/ImR/Advanced/manager_main.cpp: + * orbsvcs/examples/ImR/Advanced/TestClient.h: + * orbsvcs/examples/ImR/Advanced/run_test.pl: + * tests/Bug_1635_Regression/run_test.pl: + * tests/Bug_1628_Regression/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Thu Dec 10 13:45:00 UTC 2009 Martin Corino + + * tests/Oneways_Invoking_Twoways/Client_Task.cpp: + * tests/Oneways_Invoking_Twoways/Receiver_i.cpp: + * tests/Oneways_Invoking_Twoways/client.cpp: + * tests/Oneways_Invoking_Twoways/Sender_i.cpp: + * tests/Oneways_Invoking_Twoways/run_test.pl: + Changed to fix problems with incorrect shutdown sequence + (see Bugzilla 2068). + +Thu Dec 10 13:03:58 UTC 2009 Johnny Willemsen + + Reverted change below, causes correct code to break + + Thu Dec 10 11:57:58 UTC 2009 Johnny Willemsen + + * tao/String_Manager_T.h + * tao/String_Sequence_Element_T.h: + Added private operator != and ==, the string elements + just behave like char*, so != and == on them is illegal + and doesn't check the strings itself. If any user has + done this without realizing this, this change will now + give the user a compile error + +Thu Dec 10 12:42:00 UTC 2009 Martin Corino + + * tests/BiDirectional_DelayedUpcall/client.cpp: + * tests/BiDirectional_DelayedUpcall/test_i.cpp: + * tests/BiDirectional_DelayedUpcall/test_i.inl: + * tests/BiDirectional_DelayedUpcall/test_i.h: + Fixed problem with illegal send of request after ORB shutdown. + See Bugzilla 2068. + +Thu Dec 10 11:57:58 UTC 2009 Johnny Willemsen + + * tao/String_Manager_T.h + * tao/String_Sequence_Element_T.h: + Added private operator != and ==, the string elements + just behave like char*, so != and == on them is illegal + and doesn't check the strings itself. If any user has + done this without realizing this, this change will now + give the user a compile error + + * tao/TransportCurrent/Transport_Current.h: + Layout change + +Thu Dec 10 11:42:00 UTC 2009 Martin Corino + + * tests/Bug_3672_Regression/ami_test_i.cpp: + * tests/Bug_3672_Regression/client.cpp: + Test did not work correctly on Windows because of timing issues. + Changed to work correctly on Windows also. + +Thu Dec 10 10:32:56 UTC 2009 Denis Budko + + * orbsvcs/tests/Bug_1436_Regression/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_high_path.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_other_paths.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl: + * orbsvcs/tests/FT_App/run_test_demo.pl: + * orbsvcs/tests/FT_App/run_test_fault_consumer.pl: + * orbsvcs/tests/FT_App/run_test_detector.pl: + * orbsvcs/tests/Event/Mcast/Complex/run_test.pl: + * orbsvcs/tests/Bug_2248_Regression/client.cpp: + * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp: + * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl: + * orbsvcs/tests/Bug_1437_Regression/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Wed Dec 9 21:16:38 UTC 2009 Yan Dai + + * tests/OBV/Indirection/MessengerClient.cpp: + + Fixed a warning. + +Wed Dec 9 14:24:58 UTC 2009 Johnny Willemsen + + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + Don't generate code to call get_receptacle_policy, that doesn't + do anything + +Wed Dec 9 12:45:58 UTC 2009 Martin Corino + + * tests/OBV/Supports/Supports_Test.mpc: + Removed dummy_label dependency. + + * tests/OBV/Supports/client.cpp: + Fixed small coding error. + + * bin/tao_orb_tests.lst: + Reenabled the OBV/Supports test again since the reason for + excluding this one seems to have been invalidated (long ago?). + +Wed Dec 9 12:31:58 UTC 2009 Vladimir Zykov + + * tests/Bug_1361_Regression/Server_Thread_Pool.h: + Fixed fuzz error. + +Wed Dec 9 10:38:26 UTC 2009 Denis Budko + + * orbsvcs/tests/CosEvent/Basic/run_test.pl: + * orbsvcs/tests/Bug_1334_Regression/run_test.pl: + * orbsvcs/tests/Notify/Timeout/run_test.pl: + * orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl: + * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: + * orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl: + * orbsvcs/tests/Notify/Persistent_POA/run_test.pl: + * orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: + * orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl: + * orbsvcs/tests/Notify/Ordering/run_test.pl: + * orbsvcs/tests/Notify/Reconnecting/run_test.pl: + * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl: + * orbsvcs/tests/Notify/Basic/run_test.pl: + * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: + * orbsvcs/tests/Notify/Blocking/run_test.pl: + * orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: + * orbsvcs/tests/Notify/MC/run_test.pl: + * orbsvcs/tests/Notify/Lanes/run_test.pl: + * orbsvcs/tests/Notify/Discarding/run_test.pl: + * orbsvcs/tests/Notify/Structured_Filter/run_test.pl: + * orbsvcs/tests/Event/Basic/run_test.pl: + * orbsvcs/tests/Event/Performance/run_test.pl: + * orbsvcs/tests/Bug_1393_Regression/run_test.pl: + * orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl: + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl: + * tests/Bug_1476_Regression/run_test.pl: + * tests/Bug_2494_Regression/run_test.pl: + * tests/POA/Adapter_Activator/run_test.pl: + * tests/POA/Explicit_Activation/run_test.pl: + * tests/POA/On_Demand_Activation/run_test.pl: + * tests/POA/Loader/run_test.pl: + * tests/POA/On_Demand_Loading/run_test.pl: + * tests/POA/Reference_Counted_Servant/run_test.pl: + * tests/Collocation/run_test.pl: + * tests/CodeSets/simple/run_test.pl: + * tests/CSD_Strategy_Tests/Broken/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl: + * tests/Oneway_Timeouts/run_test.pl: + * tests/Smart_Proxies/On_Demand/server.cpp: + * tests/Smart_Proxies/On_Demand/run_test.pl: + * tests/Smart_Proxies/Benchmark/server.cpp: + * tests/Smart_Proxies/Benchmark/run_test.pl: + * tests/Bug_3676_Regression/run_test.pl: + * tests/Oneways_Invoking_Twoways/run_test_svc.pl: + * bin/tao_other_tests.lst: + + Tests are converted to use new test framework + and added to fuzz build. + +Wed Dec 9 10:11:14 UTC 2009 Johnny Willemsen + + * TAO_IDL/be/be_provides.cpp: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp: + Merged changes from local facets branch + + Mon Dec 7 17:51:59 UTC 2009 William R. Otte + + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + + filled in connection logic. + + Sat Dec 5 05:35:27 UTC 2009 William R. Otte + + * TAO_IDL/be/be_provides.cpp: + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + + Codegen modifications for local facets. + + Wed Dec 2 00:45:54 UTC 2009 William R. Otte + + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp: + + preliminary changes. + +Wed Dec 9 09:40:10 UTC 2009 Vladimir Zykov + + * tests/Bug_1361_Regression/Echo_Caller.cpp: + * tests/Bug_1361_Regression/Echo_Caller.h: + * tests/Bug_1361_Regression/server.cpp: + * tests/Bug_1361_Regression/Server_Thread_Pool.cpp: + * tests/Bug_1361_Regression/Server_Thread_Pool.h: + * tests/Bug_1361_Regression/run_test.pl: + Changed the test so that it doesn't shutdown the orb until + all threads are done with the remote calls. Substantially + extended the time for server shutdown since threads in server's + pool don't handle shutdown message until they send all (50) + remote messages. + + * tao/ORB_Core.cpp: + * tao/Messaging/Messaging_Policy_i.cpp: + * tao/ORB_Core.h: + This fixes Bug#3682. SYNC_WITH_TRANSPORT is now really + default synch scope policy in TAO. + + * tao/Leader_Follower_Flushing_Strategy.cpp: + Changed the code to poll the reactor instead of running + it indefinitely. This fixes bug#3697. + +Wed Dec 9 08:15:14 UTC 2009 Johnny Willemsen + + * TAO_IDL/be/be_codegen.cpp: + Use Error in error messages so that the scoreboard flags them red + +Wed Dec 9 05:55:14 UTC 2009 Yan Dai + + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl: + * tests/OBV/Indirection/Factory.h: + * tests/OBV/Indirection/Factory.cpp: + * tests/OBV/Indirection/Messenger.idl: + * tests/OBV/Indirection/Messenger_i.h: + * tests/OBV/Indirection/Messenger_i.cpp: + + Fixed fuzz errors. + +Wed Dec 9 01:27:54 UTC 2009 Yan Dai + + * tao/CDR.cpp: + + Fixed bugs in offset() method that incorrectly calculate + the offset when multiple message blocks are chained. + + * tao/Valuetype/ValueBase.cpp: + + Fixed bugs that should use the offset() to find out a + position to current wr_ptr. + + * tests/OBV/Indirection/Factory.h: + * tests/OBV/Indirection/Factory.cpp: + * tests/OBV/Indirection/Messenger.idl: + * tests/OBV/Indirection/MessengerClient.cpp: + * tests/OBV/Indirection/MessengerServer.cpp: + * tests/OBV/Indirection/Messenger_i.h: + * tests/OBV/Indirection/Messenger_i.cpp: + + Added test case to verify the fixes. The new test case + send longer message that would involve multiple message + blocks with indirection in output CDR stream. + +Tue Dec 8 10:25:47 UTC 2009 Denis Budko + + * orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl: + * orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp: + * orbsvcs/tests/Notify/Persistent_POA/run_test.pl: + * orbsvcs/tests/Notify/Blocking/run_test.pl: + * orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp: + * orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp: + * orbsvcs/tests/Notify/Structured_Filter/run_test.pl: + * orbsvcs/tests/FT_App/run_test_rmregistry.pl: + * orbsvcs/tests/FT_App/run_test_registry.pl: + * orbsvcs/tests/EC_Throughput/run_test_overflow.pl: + * orbsvcs/tests/EC_Throughput/run_test.pl: + * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl: + * orbsvcs/tests/Event/Mcast/Simple/run_test.pl: + * orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl: + * orbsvcs/tests/Bug_2248_Regression/client.cpp: + * orbsvcs/tests/Bug_2248_Regression/run_test.pl: + * orbsvcs/tests/RTCosScheduling/run_test.pl: + * orbsvcs/tests/Bug_3387_Regression/run_test.pl: + * performance-tests/CSD_Strategy/TestApps/run_test.pl: + * performance-tests/RTCorba/Thread_Pool/run_test.pl: + * tests/CSD_Strategy_Tests/Broken/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Tue Dec 8 09:20:00 UTC 2009 Johnny Willemsen + + * bin/tao_orb_tests.lst: + Added OBV/Indirection + +Mon Dec 7 18:22:00 UTC 2009 Martin Corino + + * bin/tao_orb_tests.lst: + Removed !FIXED_BUGS_ONLY for Bug_3672_Regression test. + +Mon Dec 7 10:40:49 UTC 2009 Denis Budko + + * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl: + * bin/tao_other_tests.lst: + + Test is converted to use new test framework + and added to fuzz build. + +Mon Dec 7 10:19:29 UTC 2009 Denis Budko + + * tests/IOR_Endpoint_Hostnames/run_test.pl: + * examples/Quoter/run_test.pl: + * examples/Callback_Quoter/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Mon Dec 7 09:59:08 UTC 2009 Denis Budko + + * orbsvcs/tests/EC_Custom_Marshal/run_test.pl: + * orbsvcs/tests/COIOP_Naming_Test/run_test.pl: + * orbsvcs/tests/Notify/Timeout/run_test.pl: + * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: + * orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl: + * orbsvcs/tests/Notify/Reconnecting/run_test.pl: + * orbsvcs/tests/Notify/Basic/run_test.pl: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp: + * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp: + * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: + * orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: + * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: + * orbsvcs/tests/Notify/MC/Structured_Consumer.cpp: + * orbsvcs/tests/Notify/MC/test_monitor.cpp: + * orbsvcs/tests/Notify/MC/Structured_Supplier.cpp: + * orbsvcs/tests/Notify/MC/run_test.pl: + * orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl: + * orbsvcs/tests/ImplRepo/scale/run_test.pl: + * orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp: + * orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp: + * orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl: + * orbsvcs/tests/ImplRepo/NameService/run_test.pl: + * orbsvcs/tests/ImplRepo/locked/run_test.pl: + * orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: + * orbsvcs/tests/ImplRepo/run_test.pl: + * orbsvcs/tests/Bug_3598b_Regression/run_test.pl: + * tests/Muxing/run_test.pl: + * tests/ORB_init/Portspan/run_test.pl: + * tests/Bug_2183_Regression/run_test.pl: + * tests/Bug_3108_Regression/run_test.pl: + * bin/tao_other_tests.lst: + * bin/tao_orb_tests.lst: + * utils/nslist/run_test.pl: + * examples/Quoter/run_test.pl: + * examples/Callback_Quoter/run_test.pl: + * examples/Persistent_Grid/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Mon Dec 7 09:43:00 UTC 2009 Martin Corino + + * ACE_wrappers/TAO/tao/Thread_Lane_Resources.h: + * ACE_wrappers/TAO/tao/Thread_Lane_Resources.cpp: + * ACE_wrappers/TAO/tao/Thread_Lane_Resources_Manager.h: + * ACE_wrappers/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp: + * ACE_wrappers/TAO/tao/Default_Thread_Lane_Resources_Manager.h: + * ACE_wrappers/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h: + * ACE_wrappers/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp: + * ACE_wrappers/TAO/tao/ORB_Core.cpp: + + Replaced #clear_rw_transports() method by #close_all_transports() method. + This fixes Bugzilla #3672. + Like before this behaviour is controlled by ORB option + ORBDropRepliesDuringShutdown, which by default is on. + + +Mon Dec 7 07:13:34 UTC 2009 Yan Dai + + * tao/PortableServer/Upcall_Wrapper.cpp: + * tao/operation_details.cpp: + + Fixed the issue that the indirection maps are not cleaned up + when marshal/demarshal raises exception. + +Sun Dec 6 03:07:00 UTC 2009 Yan Dai + + * tao/Makefile.am: + + Updated automake files. + + * tests/OBV/Indirection/Makefile.am: + + Added automake file. + + * tao/CDR.inl: + + Made copy constructor initialize indirection maps instead of + using assign operator. + +Sun Dec 6 02:01:17 UTC 2009 Yan Dai + + * tao/Intrusive_Ref_Count_Object_T.h: + * tao/Intrusive_Ref_Count_Object_T.inl: + * tao/Intrusive_Ref_Count_Object_T.cpp: + + Added missing files in last commit. + +Fri Dec 4 23:18:26 UTC 2009 Yan Dai + + Merged in valuetype repository id and value indirection support + on both input and output streams from OCI (RT #13502). + + * MPC/config/valuetype_out_indirection.mpb: + + Added mpc feature to optionally turn on the indirection + support on valuetype outgoing message. It defaults to + be enabled. To be compatible with previous version TAO, + run mwc.pl with + "-features valuetype_out_indirection=0" to disable it. + + * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + + Modified the valuetype unmarshall method to support + value indirection. + + * tao/Intrusive_Ref_Count_Object_T.h: + * tao/Intrusive_Ref_Count_Object_T.inl: + * tao/Intrusive_Ref_Count_Object_T.cpp: + + Added wrapper for non reference counted data type to provide reference + counting feature so it can use the TAO_Intrusive_Ref_Count_Handle + smart-pointer. + + * tao/CDR.h: + * tao/CDR.inl: + * tao/CDR.cpp: + + - Used smart point hash map for indirection maps (repository id, value + and codebase_url). The maps map the already read/written values. + - Added methods to access/update indirection maps. + - The maps are only created when valuetype data is marshalled or + demarshalled. + - Added offset(pos) method to calculate the offset between provided + position and current wr_ptr. + + * tao/Valuetype/ValueBase.h: + * tao/Valuetype/ValueBase.inl: + * tao/Valuetype/ValueBase.cpp: + + - Added repository id and value indirection support on both input + and output stream. + - The codebase_url indirection on input stream was also added but + not tested. TAO does not support codebase currently and the codebase + url indirection is added for future support. TAO can read codebase_url + from other ORB implementation but the codebase_url is not used. + - Used TAO_HAS_VALUETYPE_OUT_INDIRECTION define to optionally turn on + and off the outgoing message indirection. This is to support backward + compatibility. + + * tao/operation_details.cpp: + * tao/PortableServer/Upcall_Wrapper.cpp: + + Cleaned the indirection maps after marshalling/unmarshalling complete. + + * tao/AnyTypeCode/Any_Impl_T.cpp: + * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp: + + Made Any_Unknown_IDL_Type cdr share the maps from input cdr of the + request so previous indirection can be used during unmarshalling any. + + * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp: + + Updated unmarshal method based on tao_idl changes. + + * tao/Valuetype.mpc: + * tao/PortableServer.mpc: + * tao/tao.mpc: + + Added dependency on valuetype_out_indirection feature. + + * tests/OBV/indirection/Factory.h: + * tests/OBV/indirection/Factory.cpp: + * tests/OBV/indirection/Messenger.idl: + * tests/OBV/indirection/MessengerClient.cpp: + * tests/OBV/indirection/MessengerServer.cpp: + * tests/OBV/indirection/Messenger_i.h: + * tests/OBV/indirection/Messenger_i.cpp: + * tests/OBV/indirection/README: + * tests/OBV/indirection/indirection.mpc: + * tests/OBV/indirection/run_test.pl: + + - Added automation test for indirection support in TAO. The test + based on the JacORB demo/value test. This can also be used for + interoperability test between TAO and JacORB. + - The indirection test with truncatable value was added. The test + passed between the TAO server and client, but the interoperablity + test with JacORB failed. It also failed on previous TAO version. + + * NEWS: + + Added entry for indirection support. + +Fri Dec 4 21:00:38 UTC 2009 Yan Dai + + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp: + * orbsvcs/LoadBalancer/LoadManager.cpp: + + Renamed init() to initialize() to avoid Warning W8022 on borland build. + +Fri Dec 4 17:25:32 UTC 2009 Yan Dai + + * NEWS: + + Added entry for member validation feature in LoadBalancer. + + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h: + + Disable Warning 8022 for borland build. + + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DeadMemberDetection_Inf_Ctrl.mpc: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl: + + Fixed fuzz warning and errors. + +Fri Dec 4 12:39:26 UTC 2009 Denis Budko + + * tests/Bug_1869_Regression/client.cpp: + + Tests is converted to use new test framework + and added to fuzz build. + +Fri Dec 4 09:13:17 UTC 2009 Denis Budko + + * orbsvcs/tests/Notify/Persistent_Filter/run_test.pl: + * orbsvcs/tests/Notify/Discarding/run_test.pl: + * orbsvcs/tests/FT_App/run_test_notifier.pl: + * orbsvcs/tests/Event/Basic/run_test.pl: + * orbsvcs/tests/Event/Performance/run_test.pl: + * orbsvcs/tests/Event/UDP/run_test.pl: + * orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp: + * orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp: + * orbsvcs/tests/Bug_3387_Regression/run_test.pl: + * orbsvcs/tests/Bug_2247_Regression/run_test.pl: + * orbsvcs/tests/EC_MT_Mcast/run_test.pl: + * performance-tests/Protocols/run_senders.pl: + * tests/Server_Leaks/run_test.pl: + * tests/Bug_1551_Regression/server.cpp: + * tests/Bug_1551_Regression/run_test.pl: + * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp: + * tests/Connection_Purging/run_test.pl: + * tests/Bug_1482_Regression/server.cpp: + * tests/Bug_1482_Regression/run_test.pl: + * tests/ForwardOnceUponException/run_test.pl: + * tests/Reliable_Oneways/run_test.pl: + * examples/Buffered_Oneways/run_test.pl: + * examples/ior_corbaloc/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Thu Dec 3 12:15:35 UTC 2009 Johnny Willemsen + + * tao/Incoming_Message_Stack.h: + C++ Builder 2010 fix + + * tao/Object.cpp: + Extended some debug info + + * tao/Synch_Invocation.cpp: + Removed intermediate variable + + * tao/TAO_Internal.cpp: + Improved debug message + + * tao/ZIOP/ZIOP.cpp: + Layout change + +Thu Dec 3 09:24:17 UTC 2009 Denis Budko + + * orbsvcs/tests/Bug_1395_Regression/run_test.pl: + * orbsvcs/tests/CosEvent/Basic/run_test.pl: + * orbsvcs/tests/Bug_2285_Regression/run_test2.pl: + * orbsvcs/tests/Bug_2285_Regression/run_test.pl: + * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: + * orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl: + * orbsvcs/tests/Notify/Ordering/run_test.pl: + * orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl: + * orbsvcs/tests/Notify/ThreadPool/run_test.pl: + * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp: + * orbsvcs/tests/FT_App/FT_TestReplica_i.h: + * orbsvcs/tests/FT_App/run_test_rmnotifier.pl: + * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h: + * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp: + * orbsvcs/tests/FT_App/run_test_basic.pl: + * tests/Nested_Upcall_Crash/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Thu Dec 3 08:09:35 UTC 2009 Johnny Willemsen + + * orbsvcs/IFR_Service/IFR_Service.mpc: + Enable mcpp support + +Thu Dec 3 08:03:35 UTC 2009 Johnny Willemsen + + * orbsvcs/Naming_Service/NT_Naming_Server.cpp: Unicode fixes - * orbsvcs/tests/Bug_3215_Regression/Hello.h: - Removed msvc checks + * orbsvcs/orbsvcs/Notify/Delivery_Request.h: + Doxygen fix + + * orbsvcs/orbsvcs/Trader/Trader.h: + Fix for CB2010 + +Wed Dec 2 20:56:35 UTC 2009 Yan Dai + + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl: + + Tests are converted to use new test framework. + + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DeadMemberDetection_App_Ctrl.mpc: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DeadMemberDetection_Inf_Ctrl.mpc: + + Removed duplicated sections introduced from merging. + +Wed Dec 2 18:17:04 UTC 2009 Yan Dai + + Merged in changes from OCI (RT #13323) that added member validation + feature to LoadBalancer. + + * orbsvcs/LoadBalancer/LoadManager.cpp: + + - Added parameters for passing ping_timeout in milliseconds('-t') and + ping_interval in seconds('-i'). The default ping_interval is 0 which means + no validation thread launched. Otherwise each member will be validated + periodically. The period is in a range of minimum ping_interval and maximum + num of members validated * ping_timeout. + - The LB service needs be run with RW strategy configuration to ensure the + next_member, add_member and remove_member performed sequentially. + + static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy + exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1" + static Resource_Factory "-ORBFlushingStrategy blocking" + + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp: + + Added the validate thread to periodically ping all active members. The + liveliness status update is done in PortableGroup lib. The next_member() + query strategy to get next member in maximum number of existing members + times until an active member is found. + + * orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h: + * orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp: + + Fixed issue that the location index from previous next_member() call may + not be valid if the member list is changed since then. Now it verify if + the list is changed and then find the next member based on RR strategy. + + * orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp: + + Added try/catch around factory delete_object() call, + because it's possible the factory is down. This could + be called in the path of remove_member after member + liveliness check failure. Without try/catch, the member + will not be removed cleanly. + + * orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h: + + Added liveliness status and group reference. + + * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h: + * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp: + + Added more functions to support member validation and inactive + member removing. + + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DeadMemberDetection_App_Ctrl.mpc: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Makefile.am: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/README: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Test.idl: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/svc.conf: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DeadMemberDetection_Inf_Ctrl.mpc: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Makefile.am: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/README: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Test.idl: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf: + * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml: + + Added validation tests. + + * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp: + + Fixed a bug that deleted object after orb shutdown and got + COMM_FAILURE. + + * bin/tao_other_tests.lst: + + Added validation tests. + +Wed Dec 2 14:01:43 UTC 2009 Vladimir Zykov + + * tao/RTCORBA/RT_ORB_Loader.cpp: + Improved a little the fix for bug#3755. There is no need + to obtain a global gestalt. + +Wed Dec 2 12:32:36 UTC 2009 Denis Budko + + * examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: + * examples/RTScheduling/MIF_Scheduler/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Wed Dec 2 10:07:02 UTC 2009 Denis Budko + + * orbsvcs/tests/Bug_1630_Regression/run_test.pl: + * orbsvcs/tests/BiDir_CORBALOC/run_test.pl: + * orbsvcs/tests/HTIOP/Hello/run_test.pl: + * orbsvcs/tests/HTIOP/AMI/run_test.pl: + * orbsvcs/tests/HTIOP/BiDirectional/run_test.pl: + * orbsvcs/tests/Notify/Lanes/README: + * orbsvcs/tests/Notify/Lanes/run_test.pl: + * orbsvcs/tests/FaultTolerance/IOGR/run_test.pl: + * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl: + * orbsvcs/tests/Bug_2248_Regression/run_test.pl: + * orbsvcs/tests/Time/run_test.pl: + * DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl: + * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp: + * tests/IOR_Endpoint_Hostnames/generate_ior.cpp: + * tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc: + * tests/IOR_Endpoint_Hostnames/Makefile.am: + * tests/IOR_Endpoint_Hostnames/run_test.pl: + * tests/Bug_1482_Regression/run_test.pl: + * tests/Nested_Upcall_Crash/run_test.pl: + * examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: + * examples/RTScheduling/MIF_Scheduler/run_test.pl: + * examples/AMH/Sink_Server/run_test.pl: + * examples/Load_Balancing/run_test.pl: + + Tests are converted to use new test framework + and added to fuzz build. + +Tue Dec 1 10:44:09 UTC 2009 Denis Budko + + * orbsvcs/examples/Notify/Subscribe/run_test.pl: + * orbsvcs/examples/Notify/Filter/run_test.pl: + + Test are converted to use new test framework + and added to fuzz build. + +Tue Dec 1 09:48:38 UTC 2009 Denis Budko + + * orbsvcs/tests/Log/Basic_Log_Test/run_test.pl: + * orbsvcs/tests/Bug_2800_Regression/client.cpp: + * orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl: + * orbsvcs/tests/Bug_2800_Regression/nsmain.cpp: + * orbsvcs/tests/Bug_2800_Regression/run_test.pl: + * orbsvcs/tests/Bug_2777_Regression/run_test.pl: + * orbsvcs/tests/Bug_3673_Regression/client.cpp: + * orbsvcs/tests/Bug_3673_Regression/nsmain.cpp: + * orbsvcs/tests/Bug_3673_Regression/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl: + * orbsvcs/tests/EC_Multiple/run_test.pl: + * orbsvcs/tests/Interoperable_Naming/run_test.pl: + * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl: + * orbsvcs/examples/ORT/run_test.pl: + * orbsvcs/examples/Notify/Subscribe/run_test.pl: + * orbsvcs/examples/Notify/ThreadPool/run_test.pl: + * orbsvcs/examples/Notify/Lanes/run_test.pl: + * orbsvcs/examples/Notify/Filter/run_test.pl: + * orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl: + * orbsvcs/examples/RtEC/IIOPGateway/run_test.pl: + * orbsvcs/examples/RtEC/Simple/run_test.pl: + * performance-tests/POA/Create_Reference/run_test.pl: + * tests/Faults/run_test_pp.pl: + * tests/Faults/run_test.pl: + * tests/Muxing/run_test.pl: + * tests/Bug_1020_Regression/run_test.pl: + * tests/Bug_1551_Regression/run_test.pl: + * tests/Bug_2678_Regression/run_test.pl: + * tests/MT_Server/run_test.pl: + * tests/LongUpcalls/run_test.pl: + * tests/Bug_2084_Regression/run_test.pl: + * tests/Bug_1482_Regression/run_test.pl: + * tests/Bug_3547_Regression/run_test.pl: + * tests/Bug_2174_Regression/run_test.pl: + * tests/POA/TIE/server.cpp: + * tests/POA/TIE/run_test.pl: + * tests/MT_BiDir/run_test.pl: + * tests/Monitor/Marshal_Buffer/run_test.pl: + * tests/Bug_1869_Regression/client.cpp: + * tests/Bug_1869_Regression/run_test.pl: + * tests/Nested_Upcall_Crash/run_test.pl: + * tests/ORB_Local_Config/run_tests_all.pl: + * tests/Bug_1269_Regression/run_test.pl: + * tests/Forwarding/run_test.pl: + * bin/tao_orb_tests.lst: + + Test are converted to use new test framework + and added to fuzz build. + +Thu Nov 26 02:02:24 UTC 2009 Douglas C. Schmidt + + * docs/documentation.html: Updated the documentation to reference + the "CORBA Explained Simply" and "Advanced CORBA Programming + with C++" books. Thanks to Joost Kraaijeveld for motivating this. + +Mon Nov 30 12:26:32 UTC 2009 Denis Budko + + * orbsvcs/tests/Simple_Naming/run_test.pl: + * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: + * tests/Oneway_Timeouts/run_test.pl: + * tests/Parallel_Connect_Strategy/run_test.pl: + * tests/Muxed_GIOP_Versions/run_test.pl: + * tests/InterOp-Naming/run_test.pl: + * bin/tao_other_tests.lst: + + Test are converted to use new test framework + and added to fuzz build. + +Mon Nov 30 10:01:49 UTC 2009 Denis Budko + + * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default_configuration.pl: + * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/run_test.pl: + * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/default_configuration.pl: + * orbsvcs/tests/Simple_Naming/run_test.pl: + * orbsvcs/tests/Security/InsecureReferences/run_test.pl: + * orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl: + * orbsvcs/tests/Security/Bug_1107_Regression/run_test.pl: + * orbsvcs/tests/Security/Crash_Test/run_test.pl: + * orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl: + * orbsvcs/tests/Security/MT_SSLIOP/run_test_heavy.pl: + * orbsvcs/tests/Security/MT_SSLIOP/run_test.pl: + * orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: + * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: + * orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl: + * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl: + * orbsvcs/tests/AVStreams/Latency/run_test.pl: + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: + * orbsvcs/tests/AVStreams/Pluggable/run_test.pl: + * orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl: + * orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl: + * orbsvcs/tests/AVStreams/Multicast/run_test.pl: + * orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl: + * orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl: + * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl: + * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_all.pl: + * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: + * orbsvcs/tests/Notify/XML_Persistence/run_test.pl: + * orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl: + * orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl: + * orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl: + * orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl: + * orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl: + * performance-tests/POA/Implicit_Activation/run_test.pl: + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl: + * performance-tests/Callback/run_test.pl: + * performance-tests/Latency/AMH_Single_Threaded/run_test.pl: + * performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: + * performance-tests/Cubit/TAO/DII_Cubit/run_test.pl: + * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: + * tests/Big_Twoways/run_test.pl: + * tests/Bug_2918_Regression/run_test.pl: + * tests/Strategies/run_test.pl: + * tests/Bug_1482_Regression/run_test.pl: + * tests/Portable_Interceptors/Benchmark/run_test.pl: + * tests/Xt_Stopwatch/run_test.pl: + * tests/Multiple/run_test.pl: + * tests/CSD_Strategy_Tests/Broken/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl: + * tests/Oneway_Timeouts/client.cpp: + * tests/Oneway_Timeouts/server.cpp: + * tests/Oneway_Timeouts/run_test.pl: + * tests/Smart_Proxies/Policy/server.cpp: + * tests/Smart_Proxies/Policy/run_test.pl: + * tests/Bug_1270_Regression/run_test.pl: + * tests/Parallel_Connect_Strategy/run_test.pl: + * tests/Muxed_GIOP_Versions/run_test.pl: + * tests/Connect_Strategy_Test/run_test.pl: + * tests/Big_Oneways/run_test.pl: + * tests/Bug_1627_Regression/server.cpp: + * tests/Bug_1627_Regression/run_test.pl: + * tests/InterOp-Naming/run_test.pl: + * tests/Nested_Upcall_Crash/run_test.pl: + * tests/Bug_1269_Regression/client.cpp: + * tests/Bug_1269_Regression/run_test.pl: + + Test are converted to use new test framework + and added to fuzz build. + +Sun Nov 29 13:06:02 CST 2009 Johnny Willemsen + + * TAO version 1.7.5 released. + +Fri Nov 27 10:12:19 UTC 2009 Denis Budko + + * tests/OctetSeq/run_test1.pl: + * tests/OctetSeq/run_test2.pl: + * tests/Bug_3000_Regression/run_test.pl: + * tests/Bug_3068_Regression/run_test.pl: + * tests/Bug_2186_Regression/run_test.pl: + + Test are converted to use new test framework + and added to fuzz build. + +Thu Nov 26 12:45:41 UTC 2009 Denis Budko + + * tests/Bug_1361_Regression/run_test.pl: + + Test is converted to use new test framework and added to fuzz build. + +Thu Nov 26 10:42:27 UTC 2009 Denis Budko + + * orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp: + * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp: + + Tests are converted to use new test framework and added to fuzz build. + +Wed Nov 25 15:37:11 UTC 2009 Vladimir Zykov + + * tao/RTCORBA/RT_ORB_Loader.cpp: + Additional fix for bug#3755. Previous fix broke Bug_3755_Regression. + +Wed Nov 25 12:07:28 UTC 2009 Denis Budko + + * orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: + * tests/AMI_Buffering/run_timeout.pl: + * tests/AMI_Buffering/run_message_count.pl: + * tests/AMI_Buffering/run_buffer_size.pl: + * tests/AMI_Buffering/run_timeout_reactive.pl: + * tests/AMI_Buffering/run_test.pl: + * tests/Bug_1495_Regression/run_test.pl: + * tests/Oneway_Buffering/run_timeout.pl: + * tests/Oneway_Buffering/run_message_count.pl: + * tests/Oneway_Buffering/run_buffer_size.pl: + * tests/Oneway_Buffering/run_timeout_reactive.pl: + * tests/Oneway_Buffering/run_test.pl: + + Tests are converted to use new test framework and added to fuzz build. + +Wed Nov 25 09:01:20 UTC 2009 Denis Budko + + * orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp: + * orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp: + * orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl: + * orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerServer.cpp: + * orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp: + * orbsvcs/DevGuideExamples/Security/PolicyControllingApp/run_test.pl: + * orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerServer.cpp: + * orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerClient.cpp: + * orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/run_test.pl: + * orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp: + * orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerClient.cpp: + * orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl: + * orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl: + * orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp: + * orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerClient.cpp: + * orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl: + * orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp: + * orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl: + * orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp: + * orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/run_test.pl: + * orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp: + * orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerClient.cpp: + * orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl: + * orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp: + * orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp: + * orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerClient.cpp: + * orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl: + * orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp: + * orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl: + * orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl: + * orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl: + * orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl: + * orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp: + * orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerClient.cpp: + * orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl: + * orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl: + * orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp: + * orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl: + * orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl: + * orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl: + * orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl: + * orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp: + * orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp: + * orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h: + * orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl: + * orbsvcs/examples/Log/Basic/run_test.pl: + * orbsvcs/examples/Log/Event/run_test.pl: + * orbsvcs/examples/Log/RTEvent/run_test.pl: + * orbsvcs/examples/Log/Notify/run_test.pl: + * orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp: + * orbsvcs/examples/CosEC/TypedSimple/run_test.pl: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl: + * orbsvcs/examples/LoadBalancing/run_test.pl: + * performance-tests/Sequence_Latency/DSI/run_test.pl: + * performance-tests/Sequence_Latency/Deferred/run_test.pl: + * performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: + * performance-tests/Sequence_Latency/Single_Threaded/default_configuration.pl: + * performance-tests/Sequence_Latency/Single_Threaded/run_test.pl: + * performance-tests/Sequence_Latency/DII/run_test.pl: + * performance-tests/Sequence_Latency/AMH_Single_Threaded/run_test.pl: + * performance-tests/Sequence_Latency/AMI/run_test.pl: + * performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: + * performance-tests/RTCorba/Oneways/Reliable/client_test.pl: + * performance-tests/RTCorba/Oneways/Reliable/server.cpp: + * performance-tests/RTCorba/Oneways/Reliable/run_test.pl: + * performance-tests/Latency/Thread_Pool/run_test.pl: + * performance-tests/Latency/Single_Threaded/default_configuration.pl: + * performance-tests/Latency/Single_Threaded/run_test.pl: + * performance-tests/Latency/Thread_Per_Connection/run_test.pl: + * tests/GIOP_Fragments/Java_Big_Request/run_test.pl: + * tests/GIOP_Fragments/Java_Big_Reply/run_test.pl: + * examples/CSD_Strategy/ThreadPool2/run_test.pl: + * examples/CSD_Strategy/ThreadPool4/run_test.pl: + * examples/CSD_Strategy/ThreadPool5/run_test.pl: + * examples/CSD_Strategy/ThreadPool6/run_test.pl: + + Tests are converted to use new test framework and added to fuzz build. + +Tue Nov 24 13:12:18 UTC 2009 Vladimir Zykov + + * tao/RTCORBA/RT_ORB_Loader.cpp: + Fixed a problem with double initialization of RTCORBA library. + This is required for bug#3755. Now RTCORBA initialization code + checks whether it's initialized in current gestalt. + +Tue Nov 24 10:29:27 UTC 2009 Denis Budko + + * orbsvcs/tests/EC_Mcast/run_test.pl: + * orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl: + * orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl: + * orbsvcs/tests/Notify/Validate_Client/run_test.pl: + * orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl: + * orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl: + * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp: + * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl: + * orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl: + * DevGuideExamples/AMH_AMI/inner_server.cpp: + * DevGuideExamples/AMH_AMI/client.cpp: + * DevGuideExamples/AMH_AMI/middle_server.cpp: + + Tests are converted to use new test framework and added to fuzz build. + +Mon Nov 23 12:08:00 UTC 2009 Simon Massey + + * NEWS: + * TAO_IDL/util/utl_global.cpp: + + Another Space in roots fix. + +Mon Nov 23 11:23:28 UTC 2009 Denis Budko + + * examples/RTCORBA/Activity/run_test.pl: + + Test is converted to use new test framework and added to fuzz build. + +Mon Nov 23 11:07:56 UTC 2009 Denis Budko + + * tests/MT_Client/run_test.pl: + * examples/RTCORBA/Activity/run_test.pl: + + Tests are converted to use new test framework and added to fuzz build. + +Mon Nov 23 10:50:58 UTC 2009 Marcel Smit + + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + In the generated servant code (_svnt.cpp) we have an + access violation in the method populate_port_tables. + The access violation is indirectly caused by a wrong + call of the method ports_servant_activator of the + Servant_Activator. + An instance of Port_Activator is created as a copy + of tmp. Instead of the new copy pa the tmp variable + is used in the call of ports_servant_activator. + Thanks to Wolfgang Pickartz. + +Mon Nov 23 09:38:57 UTC 2009 Denis Budko + + * orbsvcs/DevGuideExamples/InterfaceRepo/run_test.pl: + * orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp: + * orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerClient.cpp: + * orbsvcs/DevGuideExamples/ImplRepo/Basic/run_test.pl: + * orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp: + * orbsvcs/DevGuideExamples/ImplRepo/IORTable/run_test.pl: + * orbsvcs/DevGuideExamples/ImplRepo/MessengerClient.cpp: + * orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl: + * orbsvcs/DevGuideExamples/ImplRepo/run_test.pl: + * orbsvcs/tests/Miop/McastHello/run_test.pl: + * orbsvcs/tests/Security/Callback/client.cpp: + * orbsvcs/tests/CosEvent/Timeout/run_test.pl: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: + * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl: + * performance-tests/Protocols/run_test.pl: + * tests/CollocationLockup/run_test.pl: + * tests/Bug_1495_Regression/Threaded_Client.cpp: + * tests/Bug_1495_Regression/run_test_complex.pl: + * tests/Bug_1495_Regression/run_test.pl: + * tests/Bug_1361_Regression/run_test.pl: + * tests/COIOP/run_test.pl: + * tests/Bug_3000_Regression/run_test.pl: + * tests/Bug_2186_Regression/run_test.pl: + * tests/AlternateIIOP/run_test.pl: + * tests/NestedUpcall/Simple/run_test.pl: + * tests/MT_BiDir/run_test.pl: + * tests/MT_Client/run_test.pl: + * tests/ForwardUponObjectNotExist/run_test.pl: + * tests/No_Server_MT_Connect_Test/run_test.pl: + * tests/Cache_Growth_Test/run_test.pl: + * tests/Bug_1476_Test/run_test.pl: + * bin/tao_other_tests.lst: + * bin/tao_orb_tests.lst: + * examples/Simple/time-date/run_test.pl: + * examples/CSD_Strategy/ThreadPool/run_test.pl: + * examples/CSD_Strategy/ThreadPool3/run_test.pl: + * examples/RTCORBA/Activity/run_test.pl: + * examples/AMH/Sink_Server/run_test.pl: + + Tests are converted to use new test framework and added to fuzz build. + +Sat Nov 21 14:20:19 UTC 2009 Abdullah Sowayan + + * tests/Bug_3766_Regression/Test.idl: + * tests/Bug_3766_Regression/TestI.h: + * tests/Bug_3766_Regression/TestI.cpp: + * tests/Bug_3766_Regression/client.cpp: + * tests/Bug_3766_Regression/server.cpp: + + Minor improvement to this test. Add a way for the client to + shut down the server so this test can pass on the scoreboard. + +Sat Nov 21 04:44:20 UTC 2009 Abdullah Sowayan + + * tao/VarOut_T.h: + * tao/VarOut_T.inl: + + Fixed Bug 3766. + +Fri Nov 20 19:52:15 UTC 2009 Abdullah Sowayan + + * tao/VarOut_T.h: + * tao/VarOut_T.inl: + + Revert the changes and reopen Bug 3766. The prior commit causes build issues. + +Fri Nov 20 18:46:27 UTC 2009 Abdullah Sowayan + + * tao/VarOut_T.h: + * tao/VarOut_T.inl: + + Fixed Bug 3766. + +Fri Nov 20 16:55:01 UTC 2009 Yan Dai + + * NEWS: + + Update for next release. + +Fri Nov 20 13:53:51 UTC 2009 Jeff Parsons + + * NEWS: + + Update for next release. + +Fri Nov 20 13:02:24 UTC 2009 Denis Budko + + * orbsvcs/tests/Security/Callback/server.cpp: + + Test is converted to use new test framework and added to fuzz build. + +Fri Nov 20 10:03:43 UTC 2009 Marcel Smit + + * tests/Bug_3766_Regression/server.cpp: + Resolved compiler error related to invisible + characters on Linux. + +Fri Nov 20 09:28:50 UTC 2009 Denis Budko + + * orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl: + * orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl: + * orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl: + * orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl: + * orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl: + * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl: + * orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl: + * orbsvcs/tests/Security/EndpointPolicy/run_test.pl: + * DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp: + * DevGuideExamples/Multithreading/ThreadPool/MessengerClient.cpp: + * DevGuideExamples/Multithreading/ThreadPool/run_test.pl: + * DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp: + * DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp: + * DevGuideExamples/Multithreading/GracefulShutdown/run_test.pl: + * DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp: + * DevGuideExamples/Multithreading/ThreadPerConnection/MessengerClient.cpp: + * DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl: + * DevGuideExamples/AMH_AMI/inner_server.cpp: + * DevGuideExamples/AMH_AMI/client.cpp: + * DevGuideExamples/AMH_AMI/middle_server.cpp: + * DevGuideExamples/AMH_AMI/run_test.pl: + * tests/OctetSeq/run_test1.pl: + * tests/OctetSeq/run_test2.pl: + * tests/OctetSeq/run_test.pl: + * tests/Bug_1330_Regression/server.cpp: + * tests/Bug_1330_Regression/run_test.pl: + * tests/Leader_Followers/run_test.pl: + * tests/NestedUpcall/MT_Client_Test/run_test.pl: + * tests/Bug_2702_Regression/run_test.pl: + * tests/IPV6/run_test.pl: + * tests/MProfile_Connection_Timeout/run_test.pl: + + Tests are converted to use new test framework and added to fuzz build. + +Fri Nov 20 08:56:26 UTC 2009 Vladimir Zykov + + * tests/Bug_3755_Regression/server.cpp: + * tests/Bug_3755_Regression/run_test.pl: + * bin/tao_orb_tests.lst: + Fixed this test on Win32 and disabled it from compact, + minimum and single threaded builds. + +Fri Nov 20 08:34:48 UTC 2009 Marcel Smit + + * examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h: + * examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp: + * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h: + * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp: + Resolved compiler errors related to the IDL compiler + change (see see Tue Nov 17 20:47:27 UTC 2009 Jeff Parsons + for more details). + +Thu Nov 19 20:18:53 UTC 2009 Abdullah Sowayan + + * tests/Bug_3766_Regression/Test.idl: + * tests/Bug_3766_Regression/TestI.h: + * tests/Bug_3766_Regression/TestI.cpp: + * tests/Bug_3766_Regression/client.cpp: + + Extend this test to test Variable sized types in addition + to Fixed size types. + +Thu Nov 19 19:50:30 UTC 2009 Abdullah Sowayan + + * bin/tao_orb_tests.lst: + + Add BUG_3766_Regression to the list of tests to run. + +Thu Nov 19 15:40:53 UTC 2009 Abdullah Sowayan + + * tests/Bug_3766_Regression: + * tests/Bug_3766_Regression/Bug_3766_Regression.mpc: + * tests/Bug_3766_Regression/Test.idl: + * tests/Bug_3766_Regression/TestI.h: + * tests/Bug_3766_Regression/TestI.cpp: + * tests/Bug_3766_Regression/run_test.pl: + * tests/Bug_3766_Regression/server.cpp: + + Added a regression test for Bugzilla 3766. + +Thu Nov 19 12:38:10 UTC 2009 Denis Budko + + * tests/Bug_2234_Regression/server.cpp: + + Test is converted to use new test framework and added to fuzz build. + +Thu Nov 19 08:25:13 UTC 2009 Denis Budko + + * orbsvcs/tests/Trading/export_test.cpp: + * orbsvcs/tests/Trading/run_test.pl: + * orbsvcs/tests/Security/Callback/server.cpp: + * orbsvcs/tests/Security/Callback/client.cpp: + * orbsvcs/tests/Security/Callback/run_test.pl: + * orbsvcs/tests/Security/mixed_security_test/run_test.pl: + * orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp: + * orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp: + * orbsvcs/tests/Security/ssliop_CSD/run_test.pl: + * orbsvcs/examples/CosEC/Simple/Service.cpp: + * orbsvcs/examples/CosEC/Simple/Supplier.cpp: + * orbsvcs/examples/CosEC/Simple/Consumer.cpp: + * orbsvcs/examples/CosEC/Simple/run_test.pl: + * tests/AMI_Buffering/run_timeout.pl: + * tests/AMI_Buffering/run_buffer_size.pl: + * tests/AMI_Buffering/run_timeout_reactive.pl: + * tests/AMI_Buffering/run_test.pl: + * tests/Big_Request_Muxing/run_test.pl: + * tests/Bug_3743_Regression/run_test.pl: + * tests/Bug_3531_Regression/client.cpp: + * tests/Bug_3531_Regression/server.cpp: + * tests/Bug_3531_Regression/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp: + * tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl: + * tests/Server_Connection_Purging/server.cpp: + * tests/Server_Connection_Purging/run_test.pl: + * tests/Oneway_Buffering/run_timeout.pl: + * tests/Oneway_Buffering/run_message_count.pl: + * tests/Oneway_Buffering/run_buffer_size.pl: + * tests/Oneway_Buffering/run_timeout_reactive.pl: + * tests/Oneway_Buffering/run_test.pl: + * bin/tao_other_tests.lst: + * bin/tao_orb_tests.lst: + + Tests are converted to use new test framework and added to fuzz build. + +Wed Nov 18 12:58:16 UTC 2009 Denis Budko + + * orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl: + * orbsvcs/tests/Bug_2925_Regression/run_test.pl: + * orbsvcs/tests/Security/Secure_Invocation/run_test.pl: + * orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp: + * orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp: + * orbsvcs/tests/Security/Bug_2908_Regression/run_test.pl: + * orbsvcs/tests/Security/BiDirectional/run_test.pl: + * orbsvcs/tests/Security/Big_Request/run_test.pl: + * orbsvcs/tests/HTIOP/BiDirectional/run_test.pl: + * orbsvcs/tests/Property/run_test.pl: + * orbsvcs/tests/Bug_2316_Regression/client.cpp: + * orbsvcs/tests/Bug_2316_Regression/server.cpp: + * orbsvcs/tests/Bug_2316_Regression/run_test.pl: + * orbsvcs/tests/Bug_2615_Regression/client.cpp: + * orbsvcs/tests/Bug_2615_Regression/server.cpp: + * orbsvcs/tests/Bug_2615_Regression/run_test.pl: + * orbsvcs/tests/Bug_3216_Regression/run_test.pl: + * orbsvcs/tests/Bug_2709_Regression/client.cpp: + * orbsvcs/tests/Bug_2709_Regression/server.cpp: + * orbsvcs/tests/Bug_2709_Regression/run_test.pl: + * orbsvcs/tests/IOR_MCast/run_test_ipv6.pl: + * orbsvcs/tests/Bug_3215_Regression/run_test.pl: + * orbsvcs/tests/Bug_2287_Regression/run_test.pl: + * DevGuideExamples/SmartProxies/MessengerServer.cpp: + * DevGuideExamples/SmartProxies/LoggerServer.cpp: + * DevGuideExamples/SmartProxies/MessengerClient.cpp: + * DevGuideExamples/SmartProxies/run_test.pl: + * performance-tests/Latency/DSI/run_test.pl: + * performance-tests/Latency/Deferred/run_test.pl: + * performance-tests/Latency/DII/run_test.pl: + * performance-tests/Latency/AMI/run_test.pl: + * performance-tests/Throughput/run_test.pl: + * tests/AMI_Buffering/run_message_count.pl: + * tests/Bug_1495_Regression/run_test_complex.pl: + * tests/Bug_1495_Regression/run_test.pl: + * tests/Crashed_Callback/run_test.pl: + * tests/BiDirectional/run_test_bug3282.pl: + * tests/Bug_1020_Basic_Regression/run_test.pl: + * tests/CallbackTest/run_test_ipv6.pl: + * tests/CallbackTest/run_test_mixed_ip.pl: + * tests/Bug_2289_Regression/run_test.pl: + * tests/DIOP/run_test_ipv6.pl: + * tests/DIOP/run_test.pl: + * tests/NestedUpcall/Triangle_Test/run_test.pl: + * tests/MT_Timeout/run_test.pl: + * tests/Single_Read/server.cpp: + * tests/Single_Read/test_i.cpp: + * tests/Single_Read/run_test.pl: + * tests/Single_Read/test_i.h: + * examples/Logging/run_test.pl: + * examples/Simple/time-date/run_test.pl: + * examples/PluggableUDP/tests/Performance/run_test_ipv6.pl: + * examples/PluggableUDP/tests/Performance/run_test.pl: + + Tests are converted to use new test framework and added to fuzz build. + +Wed Nov 18 11:09:55 UTC 2009 Marcel Smit + + * examples/Kokyu_dsrt_schedulers/FP_Scheduler.h: + * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp: + * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h: + * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp: + * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h: + * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp: + Added policy_type implementation. As a result of + change in the IDL compiler (see Tue Nov 17 + 20:47:27 UTC 2009 Jeff Parsons for more details). + +Tue Nov 17 20:47:27 UTC 2009 Jeff Parsons + + * TAO_IDL/ast/ast_decl.cpp: + * TAO_IDL/be/be_visitor_interface.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ch.cpp: + * TAO_IDL/be/be_visitor_operation.cpp: + + Cosmetic changes. + + * TAO_IDL/be/be_interface.cpp: + + Fixed bug in stub header code generation for local interfaces. + Operations inherited from non-local interfaces are re-generated + as pure virtual, but the operations associated with attributes + were getting skipped. Thanks to Marcel Smit + and Johnny Willemsen + for reporting the problem. + +Tue Nov 17 17:18:51 UTC 2009 Vladimir Zykov + + * tests/Bug_3755_Regression/server.cpp: + Extended test's output. + +Tue Nov 17 14:43:36 UTC 2009 Denis Budko + + * bin/tao_other_tests.lst: + + Test, which is not converted now, is disabled in FUZZ build. + +Tue Nov 17 13:49:10 UTC 2009 Denis Budko + + * bin/tao_other_tests.lst: + * bin/tao_orb_tests.lst: + + Tests, which are not converted now, are disabled in FUZZ build. + +Tue Nov 17 11:45:03 UTC 2009 Denis Budko + + * orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp: + * orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp: + * orbsvcs/DevGuideExamples/Security/ParticipatingApp/run_test.pl: + * DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp: + * DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp: + * DevGuideExamples/Multithreading/Reactive/run_test.pl: + * DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp: + * DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp: + * DevGuideExamples/ValueTypes/Messenger/run_test.pl: + * DevGuideExamples/ValueTypes/Bank/server.cpp: + * DevGuideExamples/ValueTypes/Bank/run_test.pl: + * DevGuideExamples/ValueTypes/Bank/client.cpp: + * DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp: + * DevGuideExamples/LocalObjects/ServantLocator/run_test.pl: + * DevGuideExamples/GettingStarted/MessengerServer.cpp: + * DevGuideExamples/GettingStarted/MessengerClient.cpp: + * DevGuideExamples/GettingStarted/run_test.pl: + * DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp: + * DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp: + * DevGuideExamples/PortableInterceptors/Auth/run_test.pl: + * DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp: + * DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp: + * DevGuideExamples/PortableInterceptors/SimpleCodec/run_test.pl: + * DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp: + * DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp: + * DevGuideExamples/PortableInterceptors/IOR/run_test.pl: + * DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp: + * DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp: + * DevGuideExamples/PortableInterceptors/PICurrent/run_test.pl: + * DevGuideExamples/RTCORBA/MessengerServer.cpp: + * DevGuideExamples/RTCORBA/run_test.pl: + * DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp: + * DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp: + * DevGuideExamples/Messaging/AMIcallback/run_test.pl: + * DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp: + * DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp: + * DevGuideExamples/Messaging/RelativeRoundtripTimeout/run_test.pl: + * tests/OBV/Supports/client.cpp: + * tests/OBV/Supports/server.cpp: + * tests/OBV/Supports/run_test.pl: + * tests/Bug_2683_Regression/run_test.pl: + * tests/Exposed_Policies/run_test.pl: + * bin/tao_other_tests.lst: + * bin/tao_orb_tests.lst: + * examples/PluggableUDP/tests/SimplePerformance/client.cpp: + * examples/PluggableUDP/tests/SimplePerformance/run_test_ipv6.pl: + * examples/PluggableUDP/tests/SimplePerformance/server.cpp: + * examples/PluggableUDP/tests/SimplePerformance/run_test.pl: + + Tests are converted to use new test framework and added to fuzz build. + +Mon Nov 16 15:52:21 UTC 2009 Vladimir Zykov + + * bin/tao_orb_tests.lst: + Bug 3755 marked as fixed. + + * tao/PI_Server/PI_Server_Loader.cpp: + * tao/PI_Server/PI_Server_Loader.h: + * tao/Messaging/Messaging_Loader.h: + * tao/Messaging/Messaging_Loader.cpp: + * tao/BiDir_GIOP/BiDirGIOP.cpp: + * tao/BiDir_GIOP/BiDirGIOP.h: + * tao/RTScheduling/RTScheduler_Loader.cpp: + * tao/RTScheduling/RTScheduler_Loader.h: + * tao/ZIOP/ZIOP.cpp: + * tao/ZIOP/ZIOP.h: + * tao/CSD_Framework/CSD_Framework_Loader.cpp: + * tao/CSD_Framework/CSD_Framework_Loader.h: + * tao/RTCORBA/RT_ORB_Loader.h: + * tao/RTCORBA/RT_ORB_Loader.cpp: + Fixed bug 3755. Now library initialization guard is moved + to a loader which does the initialization. Since the loader is + unique per gestalt then the initialization is executed once per + gestalt and not once per process. + +Mon Nov 16 15:44:30 UTC 2009 Vladimir Zykov + + * tests/Bug_3748_Regression/run_test.pl: + Extended the time for starting client even more. + +Fri Nov 13 19:49:54 UTC 2009 Jeff Parsons + + * TAO_IDL/be_include/be_interface.h: + * TAO_IDL/be/be_interface.cpp: + + Added 2 private methods, called from traverse_inheritance_graph(), + to enqueue base components or base homes. Making these steps + into method calls allows them to be done tail-recursively + rather than iteratively, so the chain of parents can be + enqueued in the correct order for generating copy constructors + and the like. + +Fri Nov 13 10:17:33 UTC 2009 Denis Budko + + * orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl: + + Warring in fuzz build was fixed. + +Fri Nov 13 09:18:57 UTC 2009 Denis Budko -Thu Mar 4 11:58:54 UTC 2010 Johnny Willemsen + * orbsvcs/tests/Bug_3486_Regression/run_test.pl: + * orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl: + * orbsvcs/tests/Notify/Bug_3663_Regression/run_test.pl: + * orbsvcs/tests/Notify/Bug_3646d_Regression/run_test.pl: + * orbsvcs/tests/Bug_2137_Regression/run_test.pl: + * DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp: + * DevGuideExamples/LocalObjects/ServantLocator/MessengerClient.cpp: + * DevGuideExamples/LocalObjects/ServantLocator/run_test.pl: + * DevGuideExamples/RTCORBA/MessengerServer.cpp: + * DevGuideExamples/RTCORBA/MessengerClient.cpp: + * DevGuideExamples/RTCORBA/run_test.pl: + * tests/Stack_Recursion/run_test.pl: + * tests/Timed_Buffered_Oneways/run_test.pl: + * tests/Bug_2234_Regression/client.cpp: + * tests/Bug_2234_Regression/server.cpp: + * tests/Bug_2234_Regression/run_test.pl: + * tests/Bug_2768_Regression/server.cpp: + * tests/Bug_2768_Regression/run_test.pl: + * tests/Blocking_Sync_None/run_test.pl: + * tests/Crash_On_Write/run_test.pl: + * tests/Bug_3068_Regression/run_test.pl: + * tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl: + * tests/Bug_2683_Regression/server.cpp: + * tests/Bug_2683_Regression/run_test.pl: + * tests/RTScheduling/Scheduling_Interceptor/run_test.pl: + * tests/File_IO/run_test.pl: + * tests/Bug_1568_Regression/run_test.pl: + * tests/Reliable_Oneways/run_sync_with_transport.pl: + * tests/Reliable_Oneways/run_sync_none.pl: + * tests/Reliable_Oneways/run_sync_with_server.pl: + * tests/Reliable_Oneways/run_sync_with_target.pl: + * bin/tao_other_tests.lst: + * bin/tao_orb_tests.lst: - * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp: - * tao/PI/PI.h: - * tao/VarOut_T.h: - Layout and doxygen changes + Tests are converted to use new test framework and added to fuzz build. + +Fri Nov 13 00:33:49 UTC 2009 Yan Dai + + * orbsvcs/Notify_Service/Notify_Service.cpp: + + Added ACE_STATIC_SVC_REQUIRE for ACE_Logging_Stragey service + to fix loading issue in static builds. + +Thu Nov 12 20:39:18 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_interface.cpp: + + Fixed bug in the logic of operation table generation for + components and homes. + +Thu Nov 12 12:12:51 UTC 2009 Johnny Willemsen + + * tests/AMH_Exceptions/run_test.pl: + * tests/AMI_Timeouts/run_test.pl: + * tests/Portable_Interceptors/AdvSlot/run_test.pl: + * tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl: + * tests/Portable_Interceptors/Bug_2133/run_test.pl: + * tests/Portable_Interceptors/Bug_3080/run_test.pl: + * tests/Portable_Interceptors/Bug_3582/run_test.pl: + Fixed fuzz + +Thu Nov 12 08:24:00 UTC 2009 Denis Budko + + * tests/IORManipulation/filter/run_test.pl + * tests/Connection_Failure/run_test.pl + * orbsvcs/DevGuideExamples/NamingService/Naming_Server/run_test.pl + * orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl + * orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl + * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl + * orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl + * orbsvcs/tests/unit/Notify/MC/Control/run_test.pl + * orbsvcs/tests/unit/Trading/Interpreter/run_test.pl + * orbsvcs/tests/Bug_2074_Regression/run_test.pl + * tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl + * performance-tests/Latency/Collocation/run_test.pl + * performance-tests/POA/Object_Creation_And_Registration/run_test.pl + * orbsvcs/tests/Bug_2377_Regression/run_test.pl + * orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl + * orbsvcs/tests/unit/Notify/MC/MonitorManager/run_test.pl + Fixed fuzz errors and some time interval functions usage. + +Thu Nov 12 07:13:51 UTC 2009 Johnny Willemsen + + * tests/PortableInterceptors/AdvSlot/run_test.pl + * tests/PortableInterceptors/AdvSlotDblCpy/run_test.pl + * tests/PortableInterceptors/Bug_2133/run_test.pl + * tests/PortableInterceptors/Bug_2510_Regression/run_test.pl + * tests/PortableInterceptors/Bug_3080/run_test.pl + * tests/PortableInterceptors/Bug_3582/run_test.pl + * tests/PortableInterceptors/Dynamic/run_test.pl + * tests/PortableInterceptors/IORInterceptor/run_test.pl + * tests/PortableInterceptors/ORB_Shutdown/run_test.pl + * tests/PortableInterceptors/PICurrent/run_test.pl + Fixed fuzz errors + +Wed Nov 11 15:33:51 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: + + Removed ancestors from scope visitation for the LEM IDL + context classes. This closes [BUGID:3761]. + + * TAO_IDL/ast/ast_template_interface.cpp: + + Cosmetic changes. + +Tue Nov 10 20:14:12 UTC 2009 Yan Dai + + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h: + + Added TAO_HAS_MONITOR_FRAMEWORK==1 guard so it won't be compiled when + monitor framework is disabled. + +Tue Nov 10 19:07:43 UTC 2009 Jeff Parsons + + * TAO_IDL/include/idl_global.h: + * TAO_IDL/util/utl_global.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + When adding uses multiple related constructs to the + AST, we now use the instantiating port name (if any) + as a prefix to the constructed type names. + + * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: + * TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp: + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be/be_visitor_component/executor_exh.cpp: + * TAO_IDL/be/be_visitor_component/context_svh.cpp: + * TAO_IDL/be/be_visitor_component/executor_exs.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + * TAO_IDL/be/be_visitor_component/context_svs.cpp: + * TAO_IDL/be/be_visitor_component_scope.cpp: + * TAO_IDL/be_include/be_visitor_component_scope.h: + * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + + Fixed bugs in the handling of the port name when + it is used in the construction of facet and + receptacle operation names. This fix closes [BUGID:3760]. + +Tue Nov 10 18:15:44 UTC 2009 Yan Dai + + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp: + + Added TAO_HAS_MONITOR_FRAMEWORK==1 guard so it won't be compiled when + monitor framework is disabled. + +Tue Nov 10 13:37:57 UTC 2009 Johnny Willemsen + + * tests/Param_Test/run_test.pl: + * tests/Abstract_Interface/run_test.pl: + Don't use hardcoded timeouts + +Tue Nov 10 12:36:57 UTC 2009 Denis Budko -Thu Mar 4 08:03:51 UTC 2010 Marcel Smit + * tests/IORManipulation/filter/run_test.pl + * tests/Connection_Failure/run_test.pl + * orbsvcs/DevGuideExamples/NamingService/Naming_Server/run_test.pl + * orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl + * orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl + * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl + * orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl + * orbsvcs/tests/unit/Notify/MC/Control/run_test.pl + * orbsvcs/tests/unit/Trading/Interpreter/run_test.pl + * orbsvcs/tests/Bug_2074_Regression/run_test.pl + * tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl + * tests/Optimized_Connection/run_test.pl + * performance-tests/Latency/Collocation/run_test.pl + * performance-tests/POA/Object_Creation_And_Registration/run_test.pl + * orbsvcs/tests/Bug_2137_Regression/run_test.pl + * orbsvcs/tests/Bug_2377_Regression/run_test.pl + * orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl + + Simple porting to new test framework. + +Mon Nov 9 19:21:53 UTC 2009 Jeff Parsons + + * TAO_IDL/be_include/be_field.h: + * TAO_IDL/be/be_field.cpp: + + Added flag to check whether a provides or uses port's + name has already been prefixed with an extended port + or mirrorport name. + + * TAO_IDL/be/be_visitor_component\context_ex_idl.cpp: + + When visiting a component, changed the call to visit_scope() + to visit_component_scope() to take advantage of special + properties in the visitor base class. + + * TAO_IDL/be/be_visitor_component_scope.cpp: + + Fixed a bug in the prefixing of uses or provides port's + name with the extended port or mirror port's name. + + * TAO_IDL/be/be_interface.cpp: + + Disable code generation of release() and is_nil() overrides + for children of abstract interfaces if the child itself is + included from another IDL file, avoiding possible multiple + defintions of these methods. This item closes [BUGID:3759]. + +Mon Nov 9 14:58:34 UTC 2009 Jeff Parsons + + * TAO_IDL/driver/drv_preproc.cpp: + * TAO_IDL/driver/drv_args.cpp: + + Cosmetic changes. + + * TAO_IDL/tao_idl.cpp: + + Added the (optional) behavior of creating a new IDL file + containing #includes of the individual IDL files on the + command line, or in the directory tree specified by -r + on some backends. Processing this 'container' IDL file + results in significant performance improvement when + processing multiple IDL files, especially if they include + Components.idl, since all the middleware IDL is then + processed only once. + + * TAO_IDL/util/utl_global.cpp: + * TAO_IDL/include/idl_global.h: + + Added a flag to toggle the above behavior, set by a + backend (currently only idl_to_picml) that processes + multiple IDL files into one output. + +Mon Nov 9 12:41:31 UTC 2009 Johnny Willemsen + + * TAO_IDL/be/be_helper.cpp: + Removed empty line + + * TAO_IDL/be/be_visitor_component/executor_exh.cpp: + Generate doxygen grouping comments + +Mon Nov 9 03:29:31 UTC 2009 William R. Otte + + * TAO_IDL/be/be_interface.cpp: + + Added the process ID to the temporary file used for gperf, due + to a perhaps weak random number generator not being random + enough for parallel builds on OS X. + +Fri Nov 6 10:13:00 UTC 2009 Simon Massey + + * TAO_IDL/driver/drv_preproc.cpp: + * TAO_IDL/driver/drv_mcpp_preproc.cpp: + + Updated DRV_add_include_path() space within roots and + directory slash handling. (TAO782) It wasn't detecting + or handling spaced roots or trailing directory slashes + correctly. + + * TAO_IDL/util/utl_global.cpp: + + Allow for the gperf absolute directory path to contain spaces. + +Thu Nov 5 12:48:31 UTC 2009 Johnny Willemsen * TAO_IDL/be/be_codegen.cpp: - Changed path /impl/ndds to /impl/dds or - /impl/dds/ndds. + Don't generate an include for CIAO_common.h anymore -Thu Mar 4 07:50:54 UTC 2010 Johnny Willemsen +Thu Nov 5 12:24:52 UTC 2009 Vladimir Zykov - * NEWS: - Updated for next micro + * tests/Bug_3748_Regression/run_test.pl: + Extended the time for running client. + +Thu Nov 5 10:48:07 UTC 2009 Vladimir Zykov + + * tests/Bug_3748_Regression/server.cpp: + Fixed warnings. + +Wed Nov 4 20:57:08 UTC 2009 Yan Dai + + * MPC/config/notify_monitor_control.mpb: + + Disable this feature on wince=1 build. + +Tue Nov 3 17:32:03 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/fe_init.cpp: + + Added IDL3+ keywords to the list used to check for clashes + and leading underscore retention. + + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Added creation of uses multiple-specific struct and sequence + nodes in the AST when the uses multiple port + appears in an extended port declaration, identically to what + is now added for a standalone uses multiple port. + +Mon Nov 2 22:59:48 UTC 2009 Yan Dai + + * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h: + * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp: + + Made MonitorManager not start ORBTask if MC is not required. + This should resolve Notify tests failure on static builds. + + * orbsvcs/tests/Notify/MC/notify.conf: + + Removed this file as it'll be generated when running the test + and cause setup warning on scoreboard. + +Mon Nov 2 16:54:24 UTC 2009 Steven Stallion + + * tests/RTCORBA/Bug_3643_Regression/test_i.cpp: + + Dropped spurious use of NDEBUG; tests should not predicate debug + logging based on the (lack of) presence of NDEBUG. + +Fri Oct 30 16:25:53 UTC 2009 Vladimir Zykov + + * tests/Bug_3755_Regression/orb1_svc.conf: + * tests/Bug_3755_Regression/orb2_svc.conf: + * tests/Bug_3755_Regression/server.cpp: + * tests/Bug_3755_Regression/run_test.pl: + * tests/Bug_3755_Regression/Bug_3755_Regression.mpc: + * bin/tao_orb_tests.lst: + Added a test for bug#3755 and scheduled it for run. + +Fri Oct 30 14:50:00 UTC 2009 Simon Massey + + * TAO_IDL/driver/drv_preproc.cpp: + Improve the DRV_add_include_path() space within roots and + directory slash handling. (TAO782) + +Fri Oct 30 13:08:30 UTC 2009 Vladimir Zykov + + * tests/Bug_3748_Regression/client.cpp: + * tests/Bug_3748_Regression/Bug_3748_Regression.mpc: + * tests/Bug_3748_Regression/Server_ORBInitializer.h: + * tests/Bug_3748_Regression/Hello.cpp: + * tests/Bug_3748_Regression/Test.idl: + * tests/Bug_3748_Regression/server.cpp: + * tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp: + * tests/Bug_3748_Regression/Makefile.am: + * tests/Bug_3748_Regression/Hello.h: + * tests/Bug_3748_Regression/Test_Protocols_Hooks.h: + * tests/Bug_3748_Regression/README: + * tests/Bug_3748_Regression/run_test.pl: + * tests/Bug_3748_Regression/Server_ORBInitializer.cpp: + * bin/tao_orb_tests.lst: + Complitely rewrote the test for bug#3748 and changed configs + in which this test can run. + +Fri Oct 30 06:15:53 UTC 2009 Johnny Willemsen + + Merged changes from Jeff for port/porttype/mirrorport to head + + Thu Oct 29 12:50:35 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_visitor_connector.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: + * TAO_IDL/be_include/be_visitor_connector.h: + * TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h: + * TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h: + + New visitors, implementing (so far) part of the code + generation of connector executors. + + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_visitor_component/component_exh.cpp: + * TAO_IDL/be/be_visitor_component/component_exs.cpp: + * TAO_IDL/be/be_global.cpp: + * TAO_IDL/be/be_visitor_component_scope.cpp: + * TAO_IDL/be_include/be_codegen.h: + * TAO_IDL/be_include/be_visitor_component_scope.h: + * TAO_IDL/be_include/be_global.h: + + - Factored out code for generating entrypoint declarations + and definitions. + + - Added mechanism to generate includes of DDS type + support files for the connector executor. + + Sun Oct 25 17:10:27 UTC 2009 Jeff Parsons + + * TAO_IDL/be_include/be_visitor_component_scope.h: + * TAO_IDL/be/be_visitor_component_scope.cpp: + + Moved these files from the be_visitor_component + subdirectory, so the visitor would be accessible + as a base class to be_visitor_ccm_pre_proc. Also + add override of base class (be_visitor_scope) + method pre_proces(), to extend the generated + names of provides and uses methods with a + prefix of the port or mirrorport name, if any. + + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: + + Made class be_visitor_component_scope the base class + of this visitor, thereby adding support for simple + ports, mirrorports and porttypes. + + * TAO_IDL/be_include/be_visitor_component.h: + * TAO_IDL/be/be_visitor_component.cpp: + + Removed relocated files from these file lists. + + Thu Oct 22 20:39:02 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_visitor_component/component_scope.cpp: + * TAO_IDL/be_include/be_visitor_component/component_scope.h: + + Added code generation for mirror ports. + + * TAO_IDL/be_include/be_visitor_component/facet_svh.h: + * TAO_IDL/be_include/be_visitor_component/facet_svs.h: + * TAO_IDL/be/be_visitor_component/facet_svh.cpp: + * TAO_IDL/be/be_visitor_component/facet_svs.cpp: + + Changed base class to be_visitor_component_scope to + pull in the mirror port support. + + Thu Oct 22 19:21:26 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_visitor_component/facet_exs.cpp: + * TAO_IDL/be/be_visitor_component/executor_exh.cpp: + * TAO_IDL/be/be_visitor_component/executor_exs.cpp: + * TAO_IDL/be/be_visitor_component/facet_exh.cpp: + * TAO_IDL/be_include/be_visitor_component/executor_exh.h: + * TAO_IDL/be_include/be_visitor_component/executor_exs.h: + * TAO_IDL/be_include/be_visitor_component/facet_exh.h: + * TAO_IDL/be_include/be_visitor_component/facet_exs.h: + + New files, containing new visitors that handle code + generation class-by-class in the executor implementation. + + * TAO_IDL/be/be_provides.cpp: + * TAO_IDL/be/be_attribute.cpp: + * TAO_IDL/be/be_consumes.cpp: + * TAO_IDL/be/be_field.cpp: + * TAO_IDL/be/be_publishes.cpp: + * TAO_IDL/be/be_uses.cpp: + * TAO_IDL/be/be_emits.cpp: + * TAO_IDL/be/be_sequence.cpp: + * TAO_IDL/be_include/be_field.h: + * TAO_IDL/be_include/be_publishes.h: + * TAO_IDL/be_include/be_component.h: + * TAO_IDL/be_include/be_uses.h: + * TAO_IDL/be_include/be_provides.h: + * TAO_IDL/be_include/be_attribute.h: + * TAO_IDL/be_include/be_emits.h: + * TAO_IDL/be_include/be_consumes.h: + * TAO_IDL/be_include/be_sequence.h: + + Add non-virtual override of frontend methods that + fetch the referenced provides, uses, publishes, emits, + consumes, field, or base type. This addition concentrates + the narrowing to the backend type so it need not be + done over and over in the visitors. + + * TAO_IDL/be/be_visitor_component.cpp: + * TAO_IDL/be_include/be_visitor_component.h: + + Added new visitor files. + + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be_include/be_interface.h: + + Renamed static method facet_op_attr_decl_helper to + op_attr_decl_helper, since its use is now more general. + + * TAO_IDL/be_include/be_visitor_component/component_exh.h: + * TAO_IDL/be_include/be_visitor_component/component_exs.h: + * TAO_IDL/be/be_visitor_component/component_exh.cpp: + * TAO_IDL/be/be_visitor_component/component_exs.cpp: + + Split code out of these visitors and distributed it + among the new visitors. + + * TAO_IDL/be/be_visitor_operation/operation_exs.cpp: + * TAO_IDL/be/be_visitor_operation/operation_svs.cpp: + * TAO_IDL/be/be_visitor_interface/interface_svs.cpp: + * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: + * TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp: + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + * TAO_IDL/be/be_visitor_attribute.cpp: + * TAO_IDL/be/be_visitor_attribute/attribute.cpp: + * TAO_IDL/be_include/be_visitor_operation/operation_svs.h: + * TAO_IDL/be_include/be_visitor_component/component.h: + + Minor or cosmetic changes. + + Wed Oct 21 20:40:45 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_visitor_extended_port.cpp: + * TAO_IDL/be_include/be_visitor_extended_port.h: + + Removed these files, should have been removed in + + Wed Oct 21 14:10:35 UTC 2009 Jeff Parsons + + + * TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp: + * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: + * TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp: + * TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h: + * TAO_IDL/be_include/be_visitor_component/context_ex_idl.h: + * TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h: + + New files, split executor IDL code generation into separate + visitors for the facet, context and executor classes. Also + added support for simple extended ports and porttypes. + + * TAO_IDL/be/be_visitor_component.cpp: + * TAO_IDL/be_include/be_visitor_component.h: + + Added new files to the include lists. + + * TAO_IDL/be/be_util.cpp: + * TAO_IDL/be_include/be_util.h: + + Moved utility methods to generate nested namespaces + to this class, so they can be visible to all visitors. + + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be/be_visitor_component/context_svh.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + * TAO_IDL/be/be_visitor_component/context_svs.cpp: + * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp: + * TAO_IDL/be/be_visitor_component/component_scope.cpp: + * TAO_IDL/be_include/be_visitor_component/component_scope.h: + * TAO_IDL/be_include/be_visitor_component/servant_svh.h: + * TAO_IDL/be_include/be_visitor_component/context_svh.h: + * TAO_IDL/be_include/be_visitor_component/servant_svs.h: + * TAO_IDL/be_include/be_visitor_component/context_svs.h: + * TAO_IDL/be_include/be_visitor_component/component_ex_idl.h: + + Moved visit method overrides for extended port, mirror port + and porttype to the base class be_visitor_component_scope. + In every case so far, the extended port (and eventually the + mirror port) traversal just fetches the porttype reference + and visits its scope, calling back the port kind traversal + methods that happen to be overridden in the original + visitor, so there's no need to reimplement these methods + over and over. + + Wed Oct 21 14:10:35 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_visitor_extended_port/extended_port_svs.cpp: + * TAO_IDL/be/be_visitor_extended_port/extended_port.cpp: + * TAO_IDL/be/be_visitor_extended_port/extended_port_svh.cpp: + * TAO_IDL/be_include/be_visitor_extended_port/extended_port_svs.h: + * TAO_IDL/be_include/be_visitor_extended_port/extended_port.h: + * TAO_IDL/be_include/be_visitor_extended_port/extended_port_svh.h: + + Removed these visitors, better use of polymorphism can be made + by just implementing their methods in the appropriate + component visitor. + + * TAO_IDL/be/be_visitor_component/facet_svh.cpp: + * TAO_IDL/be/be_visitor_component/facet_svs.cpp: + * TAO_IDL/be_include/be_visitor_component/facet_svh.h: + * TAO_IDL/be_include/be_visitor_component/facet_svs.h: + + Copied code from removed visitor methods above, and + removed visit_component() method. + + * TAO_IDL/be/be_visitor_component/component_svh.cpp: + * TAO_IDL/be/be_visitor_component/component_svs.cpp: + + Spawned facet visitors above with visit_component_scope() + call, eliminating the extra step of calling visit_component(). + + + * TAO_IDL/be_include/be_extended_port.h: + * TAO_IDL/be/be_extended_port.cpp: + + Overloaded port_type() method to return backend-specific + type, to eliminate many narrowing calls. + + Tue Oct 20 22:55:25 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_visitor_component/component_scope.cpp: + * TAO_IDL/be_include/be_visitor_component/component_scope.h: + + New files containing a new base class visitor, encapsulating + a scope visitation method that recurses over the scopes of + a component's ancestors, if any. + + * TAO_IDL/be/be_visitor_component.cpp: + * TAO_IDL/be/be_component.cpp: + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be/be_visitor_component/facet_svh.cpp: + * TAO_IDL/be/be_visitor_component/context_svh.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + * TAO_IDL/be/be_visitor_component/facet_svs.cpp: + * TAO_IDL/be/be_visitor_component/context_svs.cpp: + * TAO_IDL/be_include/be_component.h: + * TAO_IDL/be_include/be_visitor_component/servant_svh.h: + * TAO_IDL/be_include/be_visitor_component/facet_svh.h: + * TAO_IDL/be_include/be_visitor_component/context_svh.h: + * TAO_IDL/be_include/be_visitor_component/facet_svs.h: + * TAO_IDL/be_include/be_visitor_component/servant_svs.h: + * TAO_IDL/be_include/be_visitor_component/context_svs.h: + * TAO_IDL/be_include/be_visitor_component.h: + + Replaced all occurrences of recursive scope iteration + with new visitor classes derived from the abstract + visitor above. + + Mon Oct 19 23:26:07 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + * TAO_IDL/be/be_visitor_component/facet_svs.cpp: + * TAO_IDL/be/be_visitor_component/context_svs.cpp: + * TAO_IDL/be_include/be_visitor_component/facet_svs.h: + * TAO_IDL/be_include/be_visitor_component/servant_svs.h: + * TAO_IDL/be_include/be_visitor_component/context_svs.h: + + New files containing new visitors with code factored out + of class be_visitor_component_svs + + * TAO_IDL/be/be_visitor_component.cpp: + * TAO_IDL/be/be_visitor_component/facet_svh.cpp: + * TAO_IDL/be/be_visitor_component/context_svh.cpp: + * TAO_IDL/be/be_visitor_component/component_svs.cpp: + * TAO_IDL/be/be_visitor_attribute/component_init.cpp: + * TAO_IDL/be_include/be_visitor_component/component_svs.h: + * TAO_IDL/be_include/be_visitor_component.h: + + Changes stemming from the new visitors above. + + Fri Oct 16 19:54:38 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be/be_visitor_component/facet_svh.cpp: + * TAO_IDL/be/be_visitor_component/context_svh.cpp: + * TAO_IDL/be_include/be_visitor_component/servant_svh.h: + * TAO_IDL/be_include/be_visitor_component/facet_svh.h: + * TAO_IDL/be_include/be_visitor_component/context_svh.h: + + New files, new visitors that contain code moved from + private methods in class be_visitor_component_svh. + + * TAO_IDL/be/be_provides.cpp: + + Fixed bug in code generation. + + * TAO_IDL/be/be_visitor_component.cpp: + * TAO_IDL/be_include/be_visitor_component.h: + + Added new visitor files. + + * TAO_IDL/be/be_visitor_component/component_exh.cpp: + + Removed debugging output. + + * TAO_IDL/be/be_visitor_component/component_svh.cpp: + * TAO_IDL/be_include/be_visitor_component/component_svh.h: + + Moved code out to new visitor above. + +Thu Oct 29 16:36:53 UTC 2009 Yan Dai + + * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp: + + Fixed a compilation error on wchar build. + +Thu Oct 29 15:34:15 UTC 2009 Vladimir Zykov + + * bin/tao_orb_tests.lst: + Disabled running tests 3531, 3647, and 3683 in NO_MESSAGING and + CORBA_E_MICRO builds since those tests are not built in such + setups. + +Thu Oct 29 14:56:17 UTC 2009 Vladimir Zykov + + * tests/Bug_3748_Regression/client.cpp: + * tests/Bug_3748_Regression/server.cpp: + * tests/Bug_3748_Regression/run_test.pl: + Temporarily made the output a bit more verbose. + +Thu Oct 29 02:12:40 UTC 2009 Yan Dai + + * orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp: + * tao/Monitor/Monitor_Impl.cpp: + + Fixed bugs that did not initialize and set last in Numric data. + + * orbsvcs/tests/Notify/MC/test_monitor.cpp: + + Corrected some expected values. + +Wed Oct 28 23:27:02 UTC 2009 Yan Dai + + * MPC/config/negotiate_codesets.mpb: + * MPC/config/notify_monitor_control.mpb: + * MPC/config/tao_notify_service.mpb: + * docs/notification/monitor.html: + * interop-tests/wchar/Client.java: + * interop-tests/wchar/interop_wchar.mpc: + * interop-tests/wchar/server.cpp: + * orbsvcs/Notify_Service/Notify_Service.cpp: + * orbsvcs/Notify_Service/Notify_Service.mpc: + * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Buffering_Strategy.h: + * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp: + * orbsvcs/orbsvcs/Notify/Builder.cpp: + * orbsvcs/orbsvcs/Notify/Consumer.h: + * orbsvcs/orbsvcs/Notify/Consumer.inl: + * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h: + * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/MonitorControlExt/NotifyMonitoringExt.idl: + * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp: + * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp: + * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h: + * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp: + * orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.h: + * orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.cpp: + * orbsvcs/tests/Notify/MC/Structured_Consumer.cpp: + * orbsvcs/tests/Notify/MC/Structured_Supplier.cpp: + * orbsvcs/tests/Notify/MC/notify.conf: + * orbsvcs/tests/Notify/MC/run_test.pl: + * orbsvcs/tests/Notify/MC/test_monitor.cpp: + * orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h: + * orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp: + * orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp: + * tao/Monitor/Monitor_Types.pidl: + + Merged following changes from OCI made between 1.5a p15 and p16 releases. + + - Added consumer-level queueing statistics to the Notification Service MC. + - Added queue-overflow statistics to the Notification Service MC. + - Modified Notification Service MC to work in static builds. + - Corrected an error that caused Notification Service MC statistics to fail + when -AllocateTaskPerProxy is used. + - QueueDepth have been changed to measure the number of entries rather than + attempting unsuccessfully to estimate the amount of memory used by the queue. + - Added TAO_EXPLICIT_NEGOTIATE_CODESETS macro to improve the ease of including + optional codeset support to Notify_Service in static builds. + +Wed Oct 28 06:09:33 UTC 2009 Johnny Willemsen + + * bin/tao_other_tests.lst: + Enabled a few tests for ce/fuzz + + * orbsvcs/tests/Notify/Bug_2926_Regression/run_test.pl: + * orbsvcs/tests/Notify/Bug_3688b_Regression/run_test.pl: + * orbsvcs/tests/Notify/Bug_3252_Regression/run_test.pl: + * orbsvcs/tests/Notify/Bug_3646b_Regression/run_test.pl + Converted to the new test framework + +Tue Oct 27 16:58:33 UTC 2009 Vladimir Zykov + + * bin/tao_orb_tests.lst: + Enabled Bug_3748_Regression in all builds except for single + threaded. + +Mon Oct 26 10:52:01 UTC 2009 Vladimir Zykov + + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h: + Fixed several memory leaks. Changed HTIOP Acceptor to use + strategies implemented in HTIOP_Acceptor_Impl.*. This was + required for proper fix for bug#3748. + + * tao/Acceptor_Impl.cpp: + Uncommented code for a fix for bug#3748. + +Thu Oct 22 10:47:21 UTC 2009 Johnny Willemsen + + * TAO_IDL/TAO_IDL_ACE.mwc: + Only list mpc files here + + * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp: + Updated a few of the comments we generate + +Tue Oct 20 22:58:21 UTC 2009 Jeff Parsons + + * TAO_IDL/TAO_IDL_ACE.mwc: + + Updated in accordance with the changes of + + Thu Oct 15 07:20:38 UTC 2009 Johnny Willemsen + +Tue Oct 20 12:09:06 UTC 2009 Johnny Willemsen + + * orbsvcs/Concurrency_Service/Concurrency_Service.cpp: + * orbsvcs/Concurrency_Service/Concurrency_Service.mpc: + * orbsvcs/CosEvent_Service/CosEvent_Service.cpp: + * orbsvcs/Event_Service/Event_Service.cpp: + * orbsvcs/Event_Service/Event_Service.mpc: + * orbsvcs/Notify_Service/Notify_Service.cpp: + * orbsvcs/Notify_Service/Notify_Service.mpc: + * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp: + * MPC/config/tao_notify_service.mpb: + Handle -ORBDeamon in these services directly, this is a work around + until bugzilla 3335 gets resolved. This fixes bugzilla 3656 + +Mon Oct 19 12:18:06 UTC 2009 Johnny Willemsen + + * orbsvcs/orbsvcs/Makefile.am: + Add Daemon_Utilities + + * orbsvcs/Naming_Service/Naming_Service.cpp: + * orbsvcs/Naming_Service/Naming_Service.mpc: + Use Deamon_Utilities to handle -ORBDeamon in the naming service. This + is because -ORBDeamon doesn't work for these services due to bugzilla + 3335. This is related to bugzilla 3656 + +Mon Oct 19 12:13:06 UTC 2009 Johnny Willemsen + + * orbsvcs/IFR_Service/IFR_Service.mpc: + Use tao_idl_fe base project + + * orbsvcs/orbsvcs/Daemon_Utilities.cpp: + * orbsvcs/orbsvcs/Daemon_Utilities.h: + * orbsvcs/orbsvcs/Svc_Utils.mpc: + New helper class which checks for -ORBDeamon and when this is specified + it calls ACE::deamonize() + +Mon Oct 19 00:26:06 UTC 2009 Douglas C. Schmidt + + * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp: Another shot + at trying to fix the memory leaks in the servants. Thanks to + Johnny for reporting this. + +Fri Oct 16 02:09:47 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/mcpp_tao_yyinput.h: + + Fixed potential signed/unsigned mismatch in macro definition + for TAO_YY_INPUT. + +Thu Oct 15 21:44:22 UTC 2009 Jeff Parsons + + * TAO_IDL/fe/mcpp_tao_yyinput.h: + * TAO_IDL/fe/fe_extern.cpp: + + Made tao_preproc_buffer_pos an extern int, similar to + its neighbor tao_preproc_buffer_length, so it can be + reset to 0 for each new file processed in the same + location that tao_preproc_buffer_length is reset. The + failure to reset tao_preproc_buffer_pos was causing + an error in the CoSMIC-specific backend, which is the + only one currently processing multiple IDL files in + a single execution. When reading the first token from + the 2nd file, the lexer would not be at the top of + the buffer and would therefore read garbage. + +Thu Oct 15 17:02:54 UTC 2009 Douglas C. Schmidt + + * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp + (universal_time): Replaced TAO_UTO_var with CosTime::UTO_var to + fix a compile error. Thanks to Johnny for reporting this. + +Thu Oct 15 16:05:25 UTC 2009 Vladimir Zykov + + * bin/tao_other_tests.lst: + Disabled HTIOP tests on static builds since they need + dynamic loading for HTIOP library. + + * tao/Acceptor_Impl.cpp: + Temporarily commented out problematic code until + HTIOP is fixed. + +Thu Oct 15 14:01:38 UTC 2009 Johnny Willemsen + + * TAO_IDL/be/be_visitor_component/component_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: + Fixed typo in comment + +Thu Oct 15 11:33:38 UTC 2009 Johnny Willemsen + + * docs/documentation.html: + Updated link to the TPG + +Thu Oct 15 07:20:38 UTC 2009 Johnny Willemsen + + * TAO_IDL/tao_idl.mpc + * TAO_IDL/tao_idl_be.mpc + * TAO_IDL/tao_idl_fe.mpc + Added seperate mpc files for the back end and the front end library + +Wed Oct 14 23:05:35 UTC 2009 William R. Otte + + * TAO_IDL/contrib/mcpp/support.cpp: + Now releases ownership of in-memory buffers when retrieved for + preprocessing. Fixes a crash when in-memory preprocessor + was used multiple times per process invocation. + +Wed Oct 14 18:31:38 UTC 2009 Johnny Willemsen + + * TAO_IDL/tao_idl.mpc: + Use the new tao_idl_fe base project + +Wed Oct 14 18:26:38 UTC 2009 Johnny Willemsen + + * MPC/config/tao_idl_fe.mpb: + New base project for tao_idl_fe + +Wed Oct 14 18:16:38 UTC 2009 Johnny Willemsen + + * TAO_IDL/contrib/mcpp/system.cpp: + Fixed argument not used warning + +Wed Oct 14 17:42:38 UTC 2009 Vladimir Zykov + + * tao/Acceptor_Impl.cpp: + Fixed bug#3748. It fixes a connection handler leak when + server accepts a connection but then fails to open a connection + handler. + +Wed Oct 14 16:53:09 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_provides.cpp: + + Fixed bug in facet servant class generation. + + * TAO_IDL/be/be_interface.cpp(traverse_inheritance_graph): + + Added "!= 0" to an IF state checking the return value + of a call to ACE_Unbounded_Queue, which returns an int. + +Wed Oct 14 13:51:03 UTC 2009 Douglas C. Schmidt + + * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp (universal_time): + Changed + + TAO_UTO *uto = 0; + + to + + TAO_UTO_Var uto; + + to avoid a memory leak. Thanks to Chris Shaw for reporting this. + +Tue Oct 13 15:54:44 UTC 2009 Vladimir Zykov + + * tests/Bug_3748_Regression/client.cpp: + * tests/Bug_3748_Regression/Bug_3748_Regression.mpc: + * tests/Bug_3748_Regression/Hello.cpp: + * tests/Bug_3748_Regression/Test.idl: + * tests/Bug_3748_Regression/server.cpp: + * tests/Bug_3748_Regression/Makefile.am: + * tests/Bug_3748_Regression/Hello.h: + * tests/Bug_3748_Regression/README: + * tests/Bug_3748_Regression/run_test.pl: + * bin/tao_orb_tests.lst: + Added a test for bug#3748. + +Tue Oct 13 15:36:48 UTC 2009 Jeff Parsons + + * TAO_IDL/be/be_visitor_extended_port/extended_port_svs.cpp: + * TAO_IDL/be_include/be_visitor_extended_port/extended_port_svs.h: + + New files, containing new visitor that generates the implementation + of the facet servant class. + + * TAO_IDL/be/be_provides.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be_include/be_interface.h: + * TAO_IDL/be_include/be_provides.h: + + Factored common code generation into the appropriate nodes. + + * TAO_IDL/narrow/narrow.cpp: + + Added port types to the group of types that can be + transformed from scope to decl and vice versa. + + * TAO_IDL/be/be_visitor_extended_port/extended_port.cpp: + * TAO_IDL/be/be_visitor_extended_port/extended_port_svh.cpp: + * TAO_IDL/be/be_visitor_component/component_svh.cpp: + * TAO_IDL/be/be_visitor_component/component_svs.cpp: + * TAO_IDL/be/be_visitor_extended_port.cpp: + * TAO_IDL/be_include/be_visitor_extended_port.h: + * TAO_IDL/be_include/be_visitor_extended_port/extended_port.h: + * TAO_IDL/be_include/be_visitor_extended_port/extended_port_svh.h: + + Added new files as includes, factored common visitor code into + base class, other minor changes. + +Mon Oct 12 14:03:48 CDT 2009 Johnny Willemsen + + * TAO version 1.7.4 released. Local Variables: mode: change-log diff --git a/TAO/ChangeLogs/ChangeLog-2010a b/TAO/ChangeLogs/ChangeLog-2010a deleted file mode 100644 index 5c5bf59e101..00000000000 --- a/TAO/ChangeLogs/ChangeLog-2010a +++ /dev/null @@ -1,6556 +0,0 @@ -Wed Mar 03 01:18:08 CST 2010 Johnny Willemsen - - * TAO version 1.7.7 released. - -Tue Mar 2 09:58:04 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_interface.cpp: - * TAO_IDL/be/be_visitor_interface.cpp: - * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp: - * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp: - * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp: - * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp: - * TAO_IDL/be_include/be_component.h: - * TAO_IDL/be_include/be_connector.h: - * TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h: - * TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h: - * TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h: - * TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h: - Generate direct and through poa proxy brokers for connectors - -Thu Feb 25 17:04:04 UTC 2010 Jeff Parsons - - * NEWS: - - Updated TAO_IDL cleanup item. - -Thu Feb 25 16:50:09 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp: - * TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp: - * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp: - * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp: - * TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp: - * TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp: - * TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp: - * TAO_IDL/be_include/be_visitor_interface/base_proxy_broker_ch.h: - * TAO_IDL/be_include/be_visitor_interface/proxy_brokers_ch.h: - * TAO_IDL/be_include/be_visitor_interface/remote_proxy_impl_ch.h: - * TAO_IDL/be_include/be_visitor_interface/proxy_impls_ch.h: - * TAO_IDL/be_include/be_visitor_interface/base_proxy_impl_ch.h: - * TAO_IDL/be_include/be_visitor_interface/remote_proxy_broker_ch.h: - * TAO_IDL/be_include/be_visitor_interface/remote_proxy_broker_cs.h: - - Removed these files, the visitors are never used. This fix closes - [BUGID:2200]. - -Thu Feb 25 13:19:16 UTC 2010 Vladimir Zykov - - * bin/tao_orb_tests.lst: - Disabled running the test for bug#3827 on single threaded builds - and on CORBA_e_micro builds. - -Thu Feb 25 08:58:47 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL_Test.mpc: - Added no_strict_aliasing for ndds - -Thu Feb 25 08:46:47 UTC 2010 Johnny Willemsen - - * ChangeLogs/*: - Use full year - -Thu Feb 25 08:01:47 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_codegen.cpp: - Fixed argument not used warning - -Wed Feb 24 21:00:11 UTC 2010 Jeff Parsons - - * TAO_IDL/include/idl_global.h: - * TAO_IDL/util/utl_global.cpp: - - Added additional lists to store the filenames gathered - from pragmas specifying DDS typesupport files from - various DDS vendors to include in generated code. - - * TAO_IDL/be/be_codegen.cpp: - - Added more checks for the generation of export header - files. Now a given export header file won't be - generated unless all the command line options are - present for - - - generating the export header file - - specifying the export macro - - specifying the export header file name - - * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: - - Minor change to the format of generated code. - - * TAO_IDL/fe/lex.yy.cpp: - * TAO_IDL/fe/idl.ll: - - Added pragmas for including typesupport files from - other DDS vendors, to ultimately make the generated - connector code portable to any of the C++ DDS vendors. - -Wed Feb 24 16:53:55 UTC 2010 Jeff Parsons - - * TAO_IDL/util/utl_scope.cpp: - - Fixed bug introduced by consolidation of fe_add_* - methods for exceptions. - - * TAO_IDL/be/be_codegen.cpp: - - Fixed compile error on MacOSX due to inappropriate - C++-style cast. - -Wed Feb 24 16:29:51 UTC 2010 Vladimir Zykov - - * tests/Bug_3826_Regression/svc.conf: - * tests/Bug_3826_Regression/run_test.pl: - * tao/TAO_Internal.cpp: - Extended the fix for bug#3826 and adjusted the test. Initial fix - was not complete. If there is a svc.conf which is processed by - ACE unconditionally then it's processed in a global gestalt even - if -ORBGestalt LOCAL is provided. Current change must fix this - behaviour. - -Tue Feb 23 18:55:21 UTC 2010 Yan Dai - - * bin/tao_orb_tests.lst: - - Added Bug_3812_Regression as not fixed test. - - * tests/Bug_3812_Regression/Bug_3812_Regression.cpp: - * tests/Bug_3812_Regression/mock_transport.h: - - Fixed fuzz errors. - -Tue Feb 23 10:35:39 UTC 2010 Vladimir Zykov - - * tao/TAO_Internal.cpp: - Changed a code layout for return values in forward declarations - according to TAO code conventions. Thanks to Johnny Willemsen - for pointing this out. - -Tue Feb 23 09:46:57 UTC 2010 Vladimir Zykov - - * tests/Bug_3827_Regression/test.cpp: - * tests/Bug_3827_Regression/Message.idl: - * tests/Bug_3827_Regression/run_test.pl: - * tests/Bug_3827_Regression/README: - * tests/Bug_3827_Regression/Bug_3827_Regression.mpc: - * tao/ORB_Core.cpp: - * tao/ORB.cpp: - * tao/ORB_Core.h: - Added a test for bug#3827 and fixed it. Now access or changes to - valuetype_adapter_ in ORB_Core is protected by a lock. - - * tests/Bug_3826_Regression/orb_svc.conf: - * tests/Bug_3826_Regression/server.cpp: - * tests/Bug_3826_Regression/README: - * tests/Bug_3826_Regression/Bug_3826_Regression.mpc: - * tests/Bug_3826_Regression/run_test.pl: - * tao/TAO_Internal.cpp: - Added a test for bug#3826 and fixed it. If the first ORB in created - with -ORBGestalt LOCAL it will have a local configuration and this - configuration will not leak into any ORBs created afterwards. - - * bin/tao_orb_tests.lst: - Scheduled tests for bug#3826 and bug#3827 to run in the nightly - builds. - -Mon Feb 22 23:04:23 UTC 2010 Yan Dai - - - * tests/Bug_3812_Regression/Bug_3812_Regression.cpp: - * tests/Bug_3812_Regression/Makefile.am: - * tests/Bug_3812_Regression/mock_ps.h: - * tests/Bug_3812_Regression/mock_tdi.h: - * tests/Bug_3812_Regression/mock_transport.h: - * tests/Bug_3812_Regression/run_test.pl: - - Added a regression test for bugzilla #3812. - -Mon Feb 22 21:20:15 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_codegen.cpp: - * TAO_IDL/be_include/be_codegen.h: - - Added random 6-character string to #ifdef guard generation, - to prevent hiding when IDL files have the same name (but - are in different directories, the #ifdef guard uses only - the local filename). - - * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: - * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: - - Added logic to check for inheritance from DDS_State or - DDS_Event connectors, to generate inheritance in the - connector impl from the correct Base connector template. - -Mon Feb 22 13:47:47 UTC 2010 Johnny Willemsen - - * TAO_IDL/fe/idl.ll: - * TAO_IDL/fe/lex.yy.cpp: - Updated rti typesupport to ndds typesupport, everywhere we talk - about ndds - -Fri Feb 19 15:16:49 UTC 2010 jeff Parsons - - * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: - * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: - - Removed unused variable 'dt_name'. - - * TAO_IDL/fe/fe_component_header.cpp: - * TAO_IDL/fe/fe_extern.cpp: - * TAO_IDL/fe/fe_home_header.cpp: - * TAO_IDL/fe/fe_init.cpp: - * TAO_IDL/fe/fe_interface_header.cpp: - * TAO_IDL/fe/fe_obv_header.cpp: - * TAO_IDL/fe/idl.ll: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/lex.yy.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/include/idl_global.h: - * TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp: - * TAO_IDL/util/utl_global.cpp: - * TAO_IDL/util/utl_scope.cpp: - * TAO_IDL/ast/ast_attribute.cpp: - * TAO_IDL/ast/ast_check.cpp: - - Reordered #includes to eliminate a circular dependency - introduced by the addition of the template source file - UTL_Scope_T.cpp. - -Fri Feb 19 12:54:47 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: - * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: - - Generate an additional boolean that is used to indicate - whether we have a fixed or non fixed type - -Fri Feb 19 08:53:47 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_codegen.cpp: - - Always generate the state connector header, this needs more tweaks - in the near future - -Thu Feb 18 22:53:29 UTC 2010 Jeff Parsons - - * TAO_IDL/include/ast_root.h: - * TAO_IDL/include/ast_valuebox.h: - * TAO_IDL/include/ast_module.h: - * TAO_IDL/include/ast_union_label.h: - * TAO_IDL/include/ast_union.h: - * TAO_IDL/include/ast_interface_fwd.h: - * TAO_IDL/include/ast_structure.h: - * TAO_IDL/include/ast_component_fwd.h: - * TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp: - * TAO_IDL/include/ast_string.h: - * TAO_IDL/include/ast_decl.h: - * TAO_IDL/include/ast_factory.h: - * TAO_IDL/include/ast_valuetype.h: - * TAO_IDL/include/ast_argument.h: - * TAO_IDL/include/ast_eventtype.h: - * TAO_IDL/include/ast_native.h: - * TAO_IDL/include/ast_union_fwd.h: - * TAO_IDL/include/ast_home.h: - * TAO_IDL/include/ast_structure_fwd.h: - * TAO_IDL/include/ast_enum_val.h: - * TAO_IDL/include/ast_sequence.h: - * TAO_IDL/include/ast_valuetype_fwd.h: - * TAO_IDL/include/ast_eventtype_fwd.h: - * TAO_IDL/include/ast_exception.h: - * TAO_IDL/include/ast_attribute.h: - * TAO_IDL/include/ast_enum.h: - * TAO_IDL/include/ast_union_branch.h: - * TAO_IDL/include/ast_type.h: - * TAO_IDL/include/ast_field.h: - * TAO_IDL/include/ast_constant.h: - * TAO_IDL/include/ast_interface.h: - * TAO_IDL/include/ast_operation.h: - * TAO_IDL/include/ast_component.h: - * TAO_IDL/include/ast_concrete_type.h: - * TAO_IDL/include/ast_predefined_type.h: - * TAO_IDL/include/ast_array.h: - * TAO_IDL/be/be_union.cpp: - * TAO_IDL/be/be_interface_fwd.cpp: - * TAO_IDL/be/be_attribute.cpp: - * TAO_IDL/be/be_factory.cpp: - * TAO_IDL/be/be_valuetype.cpp: - * TAO_IDL/be/be_union_fwd.cpp: - * TAO_IDL/be/be_union_branch.cpp: - * TAO_IDL/be/be_valuetype_fwd.cpp: - * TAO_IDL/be/be_type.cpp: - * TAO_IDL/be/be_home.cpp: - * TAO_IDL/be/be_enum_val.cpp: - * TAO_IDL/be/be_mirror_port.cpp: - * TAO_IDL/be/be_valuebox.cpp: - * TAO_IDL/be/be_component.cpp: - * TAO_IDL/be/be_decl.cpp: - * TAO_IDL/be/be_util.cpp: - * TAO_IDL/be/be_eventtype_fwd.cpp: - * TAO_IDL/be/be_expression.cpp: - * TAO_IDL/be/be_typedef.cpp: - * TAO_IDL/be/be_structure.cpp: - * TAO_IDL/be/be_component_fwd.cpp: - * TAO_IDL/be/be_operation_strategy.cpp: - * TAO_IDL/be/be_interface_strategy.cpp: - * TAO_IDL/be/be_field.cpp: - * TAO_IDL/be/be_module.cpp: - * TAO_IDL/be/be_structure_fwd.cpp: - * TAO_IDL/be/be_predefined_type.cpp: - * TAO_IDL/be/be_argument.cpp: - * TAO_IDL/be/be_constant.cpp: - * TAO_IDL/be/be_exception.cpp: - * TAO_IDL/be/be_extended_port.cpp: - * TAO_IDL/be/be_sequence.cpp: - * TAO_IDL/be/be_eventtype.cpp: - * TAO_IDL/be/be_root.cpp: - * TAO_IDL/be/be_interface.cpp: - * TAO_IDL/be/be_operation.cpp: - * TAO_IDL/be/be_enum.cpp: - * TAO_IDL/be/be_string.cpp: - * TAO_IDL/be/be_array.cpp: - * TAO_IDL/be/be_template_module.cpp: - * TAO_IDL/be/be_native.cpp: - * TAO_IDL/be/be_porttype.cpp: - * TAO_IDL/be/be_union_label.cpp: - * TAO_IDL/ast/ast_home.cpp: - * TAO_IDL/ast/ast_union_fwd.cpp: - * TAO_IDL/ast/ast_constant.cpp: - * TAO_IDL/ast/ast_structure_fwd.cpp: - * TAO_IDL/ast/ast_operation.cpp: - * TAO_IDL/ast/ast_interface.cpp: - * TAO_IDL/ast/ast_component.cpp: - * TAO_IDL/ast/ast_concrete_type.cpp: - * TAO_IDL/ast/ast_predefined_type.cpp: - * TAO_IDL/ast/ast_enum_val.cpp: - * TAO_IDL/ast/ast_sequence.cpp: - * TAO_IDL/ast/ast_valuetype_fwd.cpp: - * TAO_IDL/ast/ast_array.cpp: - * TAO_IDL/ast/ast_eventtype_fwd.cpp: - * TAO_IDL/ast/ast_root.cpp: - * TAO_IDL/ast/ast_valuebox.cpp: - * TAO_IDL/ast/ast_module.cpp: - * TAO_IDL/ast/ast_union_label.cpp: - * TAO_IDL/ast/ast_union.cpp: - * TAO_IDL/ast/ast_exception.cpp: - * TAO_IDL/ast/ast_interface_fwd.cpp: - * TAO_IDL/ast/ast_structure.cpp: - * TAO_IDL/ast/ast_component_fwd.cpp: - * TAO_IDL/ast/ast_attribute.cpp: - * TAO_IDL/ast/ast_enum.cpp: - * TAO_IDL/ast/ast_union_branch.cpp: - * TAO_IDL/ast/ast_string.cpp: - * TAO_IDL/ast/ast_decl.cpp: - * TAO_IDL/ast/ast_factory.cpp: - * TAO_IDL/ast/ast_valuetype.cpp: - * TAO_IDL/ast/ast_type.cpp: - * TAO_IDL/ast/ast_argument.cpp: - * TAO_IDL/ast/ast_field.cpp: - * TAO_IDL/ast/ast_eventtype.cpp: - * TAO_IDL/ast/ast_native.cpp: - * TAO_IDL/be_include/be_field.h: - * TAO_IDL/be_include/be_interface.h: - * TAO_IDL/be_include/be_operation.h: - * TAO_IDL/be_include/be_component.h: - * TAO_IDL/be_include/be_enum.h: - * TAO_IDL/be_include/be_union_branch.h: - * TAO_IDL/be_include/be_type.h: - * TAO_IDL/be_include/be_union.h: - * TAO_IDL/be_include/be_interface_fwd.h: - * TAO_IDL/be_include/be_component_fwd.h: - * TAO_IDL/be_include/be_root.h: - * TAO_IDL/be_include/be_eventtype.h: - * TAO_IDL/be_include/be_valuebox.h: - * TAO_IDL/be_include/be_union_fwd.h: - * TAO_IDL/be_include/be_predefined_type.h: - * TAO_IDL/be_include/be_argument.h: - * TAO_IDL/be_include/be_union_label.h: - * TAO_IDL/be_include/be_home.h: - * TAO_IDL/be_include/be_exception.h: - * TAO_IDL/be_include/be_attribute.h: - * TAO_IDL/be_include/be_factory.h: - * TAO_IDL/be_include/be_module.h: - * TAO_IDL/be_include/be_string.h: - * TAO_IDL/be_include/be_array.h: - * TAO_IDL/be_include/be_native.h: - * TAO_IDL/be_include/be_constant.h: - * TAO_IDL/be_include/be_structure.h: - * TAO_IDL/be_include/be_typedef.h: - * TAO_IDL/be_include/be_valuetype.h: - * TAO_IDL/be_include/be_structure_fwd.h: - * TAO_IDL/be_include/be_decl.h: - * TAO_IDL/be_include/be_valuetype_fwd.h: - * TAO_IDL/be_include/be_eventtype_fwd.h: - * TAO_IDL/be_include/be_enum_val.h: - * TAO_IDL/be_include/be_sequence.h: - - Removed unused constructors. - - * TAO_IDL/util/utl_scope.cpp: - * TAO_IDL/include/utl_scope.h: - - - Moved static methods inside class UTL_Scope - and removed related static variables. - - - Re-implemented is_global_name() to - eliminate memory leaks and heap allocations. - -Thu Feb 18 20:36:04 UTC 2010 Jeff Parsons - - * TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp: - - New file, containing bodies of some newly - added template methods to class UTL_Scope. - - * TAO_IDL/fe/lex.yy.cpp: - * TAO_IDL/fe/idl.ll: - - Cosmetic changes. - - * TAO_IDL/include/ast_root.h: - * TAO_IDL/include/ast_module.h: - * TAO_IDL/include/ast_valuebox.h: - * TAO_IDL/include/ast_union.h: - * TAO_IDL/include/ast_param_holder.h: - * TAO_IDL/include/ast_structure.h: - * TAO_IDL/include/ast_interface_fwd.h: - * TAO_IDL/include/ast_component_fwd.h: - * TAO_IDL/include/ast_string.h: - * TAO_IDL/include/ast_decl.h: - * TAO_IDL/include/ast_factory.h: - * TAO_IDL/include/ast_template_module_ref.h: - * TAO_IDL/include/ast_valuetype.h: - * TAO_IDL/include/ast_mirror_port.h: - * TAO_IDL/include/ast_argument.h: - * TAO_IDL/include/ast_eventtype.h: - * TAO_IDL/include/ast_native.h: - * TAO_IDL/include/ast_home.h: - * TAO_IDL/include/ast_union_fwd.h: - * TAO_IDL/include/ast_connector.h: - * TAO_IDL/include/ast_provides.h: - * TAO_IDL/include/ast_structure_fwd.h: - * TAO_IDL/include/ast_enum_val.h: - * TAO_IDL/include/ast_finder.h: - * TAO_IDL/include/ast_sequence.h: - * TAO_IDL/include/ast_valuetype_fwd.h: - * TAO_IDL/include/ast_template_module.h: - * TAO_IDL/include/ast_eventtype_fwd.h: - * TAO_IDL/include/ast_exception.h: - * TAO_IDL/include/ast_typedef.h: - * TAO_IDL/include/ast_attribute.h: - * TAO_IDL/include/ast_extended_port.h: - * TAO_IDL/include/ast_enum.h: - * TAO_IDL/include/ast_union_branch.h: - * TAO_IDL/include/ast_template_module_inst. - * TAO_IDL/include/ast_uses.h: - * TAO_IDL/include/ast_field.h: - * TAO_IDL/include/utl_scope.h: - * TAO_IDL/include/ast_porttype.h: - * TAO_IDL/include/ast_constant.h: - * TAO_IDL/include/ast_consumes.h: - * TAO_IDL/include/ast_publishes.h: - * TAO_IDL/include/ast_interface.h: - * TAO_IDL/include/ast_operation.h: - * TAO_IDL/include/ast_component.h: - * TAO_IDL/include/ast_predefined_type.h: - * TAO_IDL/include/ast_array.h: - * TAO_IDL/include/ast_emits.h: - * TAO_IDL/be/be_visitor_union/union.cpp: - * TAO_IDL/be/be_root.cpp: - * TAO_IDL/ast/ast_home.cpp: - * TAO_IDL/ast/ast_union_fwd.cpp: - * TAO_IDL/ast/ast_constant.cpp: - * TAO_IDL/ast/ast_connector.cpp: - * TAO_IDL/ast/ast_provides.cpp: - * TAO_IDL/ast/ast_consumes.cpp: - * TAO_IDL/ast/ast_publishes.cpp: - * TAO_IDL/ast/ast_structure_fwd.cpp: - * TAO_IDL/ast/ast_operation.cpp: - * TAO_IDL/ast/ast_interface.cpp: - * TAO_IDL/ast/ast_component.cpp: - * TAO_IDL/ast/ast_enum_val.cpp: - * TAO_IDL/ast/ast_predefined_type.cpp: - * TAO_IDL/ast/ast_finder.cpp: - * TAO_IDL/ast/ast_sequence.cpp: - * TAO_IDL/ast/ast_array.cpp: - * TAO_IDL/ast/ast_valuetype_fwd.cpp: - * TAO_IDL/ast/ast_template_module.cpp: - * TAO_IDL/ast/ast_emits.cpp: - * TAO_IDL/ast/ast_root.cpp: - * TAO_IDL/ast/ast_eventtype_fwd.cpp: - * TAO_IDL/ast/ast_redef.cpp: - * TAO_IDL/ast/ast_module.cpp: - * TAO_IDL/ast/ast_valuebox.cpp: - * TAO_IDL/ast/ast_union.cpp: - * TAO_IDL/ast/ast_param_holder.cpp: - * TAO_IDL/ast/ast_exception.cpp: - * TAO_IDL/ast/ast_typedef.cpp: - * TAO_IDL/ast/ast_interface_fwd.cpp: - * TAO_IDL/ast/ast_structure.cpp: - * TAO_IDL/ast/ast_component_fwd.cpp: - * TAO_IDL/ast/ast_attribute.cpp: - * TAO_IDL/ast/ast_enum.cpp: - * TAO_IDL/ast/ast_extended_port.cpp: - * TAO_IDL/ast/ast_union_branch.cpp: - * TAO_IDL/ast/ast_string.cpp: - * TAO_IDL/ast/ast_factory.cpp: - * TAO_IDL/ast/ast_template_module_ref.cpp: - * TAO_IDL/ast/ast_template_module_inst.cpp: - * TAO_IDL/ast/ast_valuetype.cpp: - * TAO_IDL/ast/ast_mirror_port.cpp: - * TAO_IDL/ast/ast_uses.cpp: - * TAO_IDL/ast/ast_argument.cpp: - * TAO_IDL/ast/ast_field.cpp: - * TAO_IDL/ast/ast_eventtype.cpp: - * TAO_IDL/ast/ast_native.cpp: - * TAO_IDL/ast/ast_porttype.cpp: - * TAO_IDL/be_include/be_root.h: - * TAO_IDL/util/utl_scope.cpp: - - - Consolidated common code from all fe_add_* - methods into class UTL_Scope. All these - methods had large bodies, and most were - duplicated over several AST_* classes. - To encapsulate the forward declaration and - redefinition properties of AST_Interface - and it forward-declarable subtypes - AST_ValueType, AST_EventType, and - AST_Component), some template methods were - added to UTL_Scope. - - - Static constants were added to each AST_* - class to associated it with its corresponding - NodeType enum value, as an aid to template - programming. - - - Typedefs were added to forward_declarable - types to associate eachtype with its - AST_*Fwd counterpart, as an aid to template - programming. - -Thu Feb 18 14:46:16 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp(gen_connector_traits): - - Fixed bug in code generation of the context class name - when it appears as one of the template arguments in the - connector traits typedef. - -Wed Feb 17 15:13:40 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp(gen_dds_traits): - - Removed unused parameter. - -Tue Feb 16 21:10:35 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: - * TAO_IDL/be/be_visitor_typecode.cpp: - * TAO_IDL/be/be_visitor_component/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_component/any_op_cs.cpp: - * TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp: - * TAO_IDL/be_include/be_visitor_typecode/objref_typecode.h: - * TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h: - * TAO_IDL/be_include/be_visitor_component/cdr_op_cs.h: - * TAO_IDL/be_include/be_visitor_component/any_op_ch.h: - * TAO_IDL/be_include/be_visitor_component/any_op_cs.h: - * TAO_IDL/be_include/be_visitor_component/cdr_op_ch.h: - - More missing pieces of connector support. - -Tue Feb 16 20:22:15 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_provides.cpp: - * TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp: - * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp: - * TAO_IDL/be/be_codegen.cpp: - * TAO_IDL/be/be_visitor_component/facet_exs.cpp: - * TAO_IDL/be/be_visitor_component/servant_svh.cpp: - * TAO_IDL/be/be_visitor_component/context_svh.cpp: - * TAO_IDL/be/be_visitor_component/component_ch.cpp: - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - * TAO_IDL/be/be_visitor_component/executor_exs.cpp: - * TAO_IDL/be/be_visitor_component/context_svs.cpp: - * TAO_IDL/be/be_visitor_component/component_exs.cpp: - * TAO_IDL/be/be_visitor_component/component_svh.cpp: - * TAO_IDL/be/be_visitor_component/component_svs.cpp: - * TAO_IDL/be/be_produce.cpp: - * TAO_IDL/be/be_sequence.cpp: - * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: - * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: - * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp: - * TAO_IDL/be/be_interface.cpp: - * TAO_IDL/be/be_scope.cpp: - * TAO_IDL/ast/ast_visitor_reifying.cpp: - - - Filled in several small missing pieces of connector - support - - - Removed the check for the presence of components or - connectors that was restricting the AST passes that - generated servant, executor, or connector impl files. - As with skeleton files and the presence of interfaces, - we will just generate empty files even if the relevant - IDL construct is not seen - - - Reversed the order of generation of include files in - the connector implementation header file, so that the - list of lem stub header files (generated from the list - of #pragam ciao lem that is seen in the compilation - unit) comes before the include of DDS_Event_Connector_T.h, - since the latter contains C++ template declarations, - and thus also the associated source file - -Tue Feb 16 14:22:12 UTC 2010 Jeff Parsons - - * TAO_IDL/narrow/narrow.cpp: - - Added missing case to cast a connector to a scope. - -Tue Feb 16 09:16:47 UTC 2010 Johnny Willemsen - - * MPC/modules/IDLHelper.pm: - Handle connector export file - -Mon Feb 15 22:35:26 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_component/component_ih.cpp: - * TAO_IDL/be/be_visitor_component/component_is.cpp: - * TAO_IDL/be_include/be_visitor_component/component_is.h: - * TAO_IDL/be_include/be_visitor_component/component_ih.h: - - Removed these visitors, they are not applicable to - components since their servants aren't hand-written. - - * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp: - * TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h: - - Added base class visitor for class be_visitor_connector_dds_exh - and class be_visitor_connector_dds_exs, to capture common - code. - - * TAO_IDL/be/be_visitor_arg_traits.cpp: - * TAO_IDL/be/be_visitor_component.cpp: - * TAO_IDL/be/be_codegen.cpp: - * TAO_IDL/be/be_visitor_connector.cpp: - * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: - * TAO_IDL/be/be_visitor_component/component_ch.cpp: - * TAO_IDL/be/be_visitor_component/facet_svs.cpp: - * TAO_IDL/be/be_visitor_component/component_ci.cpp: - * TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp: - * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp: - * TAO_IDL/be/be_visitor_component/component_cs.cpp: - * TAO_IDL/be/be_visitor_component/component_sh.cpp: - * TAO_IDL/be/be_visitor_component/component_si.cpp: - * TAO_IDL/be/be_visitor_component/servant_svh.cpp: - * TAO_IDL/be/be_visitor_component/context_svh.cpp: - * TAO_IDL/be/be_visitor_component/component_ss.cpp: - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - * TAO_IDL/be/be_visitor_component/context_svs.cpp: - * TAO_IDL/be/be_visitor_component/component_svh.cpp: - * TAO_IDL/be/be_visitor_component/component_svs.cpp: - * TAO_IDL/be/be_visitor_module/module.cpp: - * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: - * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: - * TAO_IDL/be/be_visitor_traits.cpp: - * TAO_IDL/ast/ast_module.cpp: - * TAO_IDL/be_include/be_visitor_connector.h: - * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: - * TAO_IDL/be_include/be_visitor_component/component_sh.h: - * TAO_IDL/be_include/be_visitor_component/component_si.h: - * TAO_IDL/be_include/be_visitor_component/servant_svh.h: - * TAO_IDL/be_include/be_visitor_component/context_svh.h: - * TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h: - * TAO_IDL/be_include/be_visitor_component/component_ss.h: - * TAO_IDL/be_include/be_visitor_component/servant_svs.h: - * TAO_IDL/be_include/be_visitor_component/context_svs.h: - * TAO_IDL/be_include/be_visitor_component/component_svh.h: - * TAO_IDL/be_include/be_visitor_component/component_svs.h: - * TAO_IDL/be_include/be_visitor_component/facet_svh.h: - * TAO_IDL/be_include/be_visitor_component/context_ex_idl.h: - * TAO_IDL/be_include/be_visitor_component/component_ch.h: - * TAO_IDL/be_include/be_visitor_component/facet_svs.h: - * TAO_IDL/be_include/be_visitor_component/component_ci.h: - * TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h: - * TAO_IDL/be_include/be_visitor_component/component_ex_idl.h: - * TAO_IDL/be_include/be_visitor_component/component_cs.h: - * TAO_IDL/be_include/be_visitor_arg_traits.h: - * TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h: - * TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h: - * TAO_IDL/be_include/be_visitor_traits.h: - * TAO_IDL/be_include/be_visitor_component.h: - - Added visit_connector() methods to all visitors where the - code generation for connectors is the same as that for - components. The visit_connector() methods simply call - visit_component(). - -Mon Feb 15 16:32:24 UTC 2010 Jeff Parsons - - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.cpp: - - - Changed connector grammar to allow an empty body - - Removed unused varables - - Added missing AST visitor creation - -Mon Feb 15 12:08:47 UTC 2010 Johnny Willemsen - - * catior/README - * catior/README.catior - * nslist/README - * nslist/README.nslist - Renamed to have the postfix to make packaging and installation easier - -Mon Feb 15 09:35:47 UTC 2010 Johnny Willemsen - - * tao/FoxResource/FoxResource_Loader.h: - User has to specify the full fox path now, some distributions now ship fox-1.6 and - fox-1.4 as directory names - -Mon Feb 15 09:17:47 UTC 2010 Johnny Willemsen - - * m4/tao.m4: - Moved to ACE, seems the latest autoconf tools only support one m4 - directory - - * configure.ac: - * Makefile.am: - * Release: - Updated for move above - -Sun Feb 14 15:57:47 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_codegen.cpp: - - Changed include generation for executor IDL files to - always generate include of CCM_Container.idl, regardless - of whether it is pulled in indirectly or not. An optimizing - check may be added at a later date. - -Fri Feb 12 22:08:24 UTC 2010 Jeff Parsons - - * TAO_IDL/include/idl_global.h: - * TAO_IDL/be/be_visitor_root.cpp: - * TAO_IDL/be/be_codegen.cpp: - * TAO_IDL/be/be_visitor_root/root.cpp: - * TAO_IDL/be/be_visitor_component/component_exh.cpp: - * TAO_IDL/be/be_visitor_module.cpp: - * TAO_IDL/be/be_visitor_module/module.cpp: - * TAO_IDL/be/be_produce.cpp: - * TAO_IDL/be_include/be_visitor_root/root.h: - * TAO_IDL/be_include/be_visitor_module/module.h: - * TAO_IDL/fe/lex.yy.cpp: - * TAO_IDL/fe/idl.ll: - * TAO_IDL/util/utl_global.cpp: - - - Added pragma indicating RTI DDS TypeSupport - header file to include in the connector implementation - header file. - - - Added generation of client stub header file - inclusion in connector implementation header file. - - - Cosmetic changes to be_codegen.cpp - - - Added boilerplate for the spawning of the connector - implementation visitors. - -Thu Feb 11 19:12:11 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_codegen.cpp: - Don't generate any E.idl includes with -Glfa. -Glfa means: - . Generated E.idl won't depend on any other E.idl - . Any required CCM_ local interface for facets, etc will be - generated locally. - -Thu Feb 11 18:51:11 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_codegen.cpp - * TAO_IDL/be/be_global.cpp - * TAO_IDL/be/be_visitor_component/context_svh.cpp - * TAO_IDL/be/be_visitor_component/context_svs.cpp - * TAO_IDL/be/be_visitor_component/servant_svs.cpp - * TAO_IDL/be/be_visitor_component_scope.cpp - * TAO_IDL/be/be_visitor_home/home_svh.cpp - * TAO_IDL/be/be_visitor_home/home_svs.cpp - * TAO_IDL/be/be_visitor_operation/operation_svs.cpp - * TAO_IDL/be/be_visitor_root/root.cpp - * TAO_IDL/be_include/be_global.h - * TAO_IDL/be_include/be_scope.h - * TAO_IDL/be_include/be_visitor_component/context_svs.h - * TAO_IDL/be_include/be_visitor_component_scope.h - * TAO_IDL/be_include/be_visitor_home/home_svs.h - * TAO_IDL/be_include/be_visitor_operation/operation_svs.h - * TAO_IDL/util/utl_err.cpp - Removed swapping container support - -Thu Feb 11 17:04:59 UTC 2010 Jeff Parsons - - * TAO_IDL/fe/lex.yy.cpp: - * TAO_IDL/fe/idl.ll: - * TAO_IDL/tao_idl_fe.mpc: - - Changes to restore mods that Johnny Willemsen made to - lex.yy.cpp without corresponding changes to idl.ll and - tao_idl_fe.mpc. These changes are in - - Mon Feb 8 06:58:43 UTC 2010 Johnny Willemsen - -Wed Feb 10 22:16:15 UTC 2010 Jeff Parsons - - * TAO_IDL/include/idl_global.h: - - Fixed typo in comment. - - * TAO_IDL/be/be_codegen.cpp: - - Added code generation for included files in - the connector implementation. - - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Fixed incorrect comment. - - * TAO_IDL/fe/lex.yy.cpp: - * TAO_IDL/fe/idl.ll: - - Restored code that was added to the cpp file only and - got zapped in the last regeneration. - -Wed Feb 10 22:02:06 UTC 2010 Yan Dai - - * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: - - Added support for ORBKeepalive in SSL mode. - -Wed Feb 10 16:34:24 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp: - * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h: - - In the recreation of the home scope in the corresponding - explicit interface, added support for eventtypes, which - cannot be declared inside a home, but can be referenced. - -Wed Feb 10 10:52:00 UTC 2010 Simon Massey - - * examples/mfc/server.cpp: - - Fixed a long standing typo in mod that was committed by - ChangeLogTag: Mon Mar 5 07:59:00 2001 Michael Kircher - He was adding ACE_TRY_ENV and ACE_TRY_CHECKS to the existing code, - but put in an ACE_TRY_CHECK where an ACE_TRY_ENV was supposed to - go. This has never been touched since and has missed the grand - purge of this old excaption code as it didn't conform to the normal - useage patterns. If TAO is built with #define ACE_LACKS_DEPRECATED_MACROS - this caused this example to not build due to this missuse. - -Wed Feb 10 10:43:11 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL_Test.mpc: - Don't compile the 3821 RTI DDS generated files, they don't compile - at this moment. - -Tue Feb 9 22:55:11 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_root/root_cnh.cpp: - * TAO_IDL/be/be_visitor_root/root_cns.cpp: - * TAO_IDL/be_include/be_visitor_root/root_cnh.h: - * TAO_IDL/be_include/be_visitor_root/root_cns.h: - - New visitors that create the files and streams - for the connector header and source implementation - generation. - - * TAO_IDL/include/idl_global.h: - * TAO_IDL/be/be_visitor_root.cpp: - * TAO_IDL/be/be_codegen.cpp: - * TAO_IDL/be/be_visitor_root/root.cpp: - * TAO_IDL/be/be_visitor_component/component.cpp: - * TAO_IDL/be/be_visitor_module/module.cpp: - * TAO_IDL/be/be_global.cpp: - * TAO_IDL/be/be_visitor_attribute/attribute.cpp: - * TAO_IDL/be/be_produce.cpp: - * TAO_IDL/ast/ast_connector.cpp: - * TAO_IDL/be_include/be_visitor_root/root_exs.h: - * TAO_IDL/be_include/be_visitor_root/root_exh.h: - * TAO_IDL/be_include/be_codegen.h: - * TAO_IDL/be_include/be_helper.h: - * TAO_IDL/be_include/be_visitor_root.h: - * TAO_IDL/be_include/be_global.h: - * TAO_IDL/util/utl_global.cpp: - - Added beginning support for code generation for - connectors. - - * docs/compiler.html: - - Updated IDL compiler docs with info about connector - code generation support. - -Tue Feb 9 18:12:00 UTC 2010 Jeff Parsons - - * TAO_IDL/astast_visitor_reifying.cpp: - - Added support for IDL native constructs. - - * TAO_IDL/be/be_visitor_native/native_ch.cpp: - - Cosmetic changes. - -Tue Feb 9 09:39:10 UTC 2010 Vladimir Zykov - - * TAO_IDL/be/be_helper.cpp: - Fixed generation of constants for case labels in switch statement - for unions with char discriminator. - -Mon Feb 8 23:23:48 UTC 2010 Jeff Parsons - - * TAO_IDL/include/ast_union.h: - * TAO_IDL/be/be_union.cpp: - * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp: - * TAO_IDL/ast/ast_visitor_reifying.cpp: - * TAO_IDL/be_include/be_union.h: - * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h: - - Added support for all legal home-scope declarations - in the generation of implied IDL for the explicit - home interface. - -Mon Feb 8 17:16:31 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp: - * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h: - - In transfer of scope contents from IDL home to the - implied IDL explicit interface, added support for - typedefs. This change fixes a build problem in - CIAO_ROOT/tests/IDL3/Lookup. Support for other - constructs legal for declaration inside a home is - pending. - -Mon Feb 8 14:48:43 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_component/component_ch.cpp: - * TAO_IDL/be/be_visitor_root/root.cpp: - * TAO_IDL/be/be_visitor_traits.cpp: - Layout changes for the generated code - -Mon Feb 8 13:52:43 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_helper.cpp: - Removed link to website which doesn't seem to exist anymore - -Mon Feb 8 11:57:33 UTC 2010 Vladimir Zykov - - * tests/IDL_Test/IDL_Test.mpc: - Added Bug_3821_Regression.idl to MPC. - -Mon Feb 8 10:58:21 UTC 2010 Vladimir Zykov - - * tests/Bug_3821_Regression/test.cpp: - * tests/Bug_3821_Regression/test.idl: - * tests/Bug_3821_Regression/Bug_3821_Regression.mpc: - * tests/Bug_3821_Regression/run_test.pl: - * tests/Bug_3821_Regression/README: - * tests/IDL_Test/Bug_3821_Regression.idl: - * bin/tao_orb_tests.lst: - Added a test for bug#3821 and scheduled it for run. Added the same - IDL file to IDL_Test, it can be useful for testing tao_idl's - behavior on unions. - - * TAO_IDL/be/be_union.cpp: - * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp: - * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp: - * TAO_IDL/be/be_visitor_union/union_cs.cpp: - * TAO_IDL/ast/ast_union.cpp: - * TAO_IDL/be_include/be_union.h: - Fixed a bug#3821. In particular it changes how tao_idl generates - code for enum discriminated unions. Fixed other minor bugs. - -Mon Feb 8 10:35:30 UTC 2010 Martin Corino - - * orbsvcs/orbsvcs/Trader/Constraint_l.cpp: - * orbsvcs/tests/Concurrency/lex.CC_command.cpp: - * performance-tests/POA/Demux/demux_test_server.cpp: - * tests/Exposed_Policies/RT_Properties.cpp: - - Fixed new GCC 4.4.x warning about ignoring return values of - function marked by the new warn_unused_result attribute. - -Mon Feb 8 06:58:43 UTC 2010 Johnny Willemsen - - * TAO_IDL/fe/lex.yy.cpp: - Fixed Windows CE compile error - -Sat Feb 6 13:50:43 UTC 2010 Martin Corino - - * tao/GIOP_Message_State.cpp: - Fixed strict aliasing warning. - -Fri Feb 5 19:20:42 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_home/home_svs.cpp: - * TAO_IDL/be/be_visitor_home/home_svh.cpp: - * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp: - * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: - * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h: - - Fixed bug introduced by the recent change in handling of - home factories and finders, where the return type of an - inherited factory or finder was the type of the component - managed by the derived home, instead of the managed component - of the base home, as it should be. - -Thu Feb 4 14:13:32 UTC 2010 Vladimir Zykov - - * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp: - Changed code to generate octal numbers where they are meant instead - of decimals. Removed code for wchars since wchar discriminant is - not allowed in unions. - - * TAO_IDL/be/be_global.cpp: - Fixed a memory leak in tao_idl. - - * TAO_IDL/ast/ast_module.cpp: - Fixed bug#3819. Multiple forward declarations of valuetypes, - eventtypes, and components don't crash tao_idl now. - -Thu Feb 4 13:56:43 UTC 2010 Johnny Willemsen - - * TAO_IDL/Makefile.am: - Regenerated - -Thu Feb 4 09:25:43 UTC 2010 Johnny Willemsen - - Merged revision 88756-88826 from idl3_plus_backend2 to svn head. - - * orbsvcs/IFR_Service/ifr_adding_visitor.h: - * orbsvcs/IFR_Service/ifr_adding_visitor.cpp: - - Change IFR loader backend correspondingly with the - change above to home factories and finders. - -Thu Feb 4 09:15:43 UTC 2010 Johnny Willemsen - - * TAO_IDL/*.cpp: - Converted to doxygen style of documentation - -Thu Feb 4 09:01:43 UTC 2010 Johnny Willemsen - - * TAO_IDL/*.h: - Converted to doxygen style of documentation - -Thu Feb 4 08:36:43 UTC 2010 Johnny Willemsen - - Merged revision 88756-88826 from idl3_plus_backend2 to svn head. - - Wed Feb 3 21:37:08 UTC 2010 Jeff Parsons - - * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h: - * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp: - - New visitor specialized to generate the contents of - the home explicit implied IDL interface. - - * TAO_IDL/include/ast_home.h: - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: - * TAO_IDL/ast/ast_home.cpp: - * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: - * TAO_IDL/util/utl_scope.cpp: - - Completed changes to handle home factories and finders - as part of the home scope rather than in separate list - members of the home class. - - Mon Feb 1 22:30:44 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_home/factory_svs.cpp: - * TAO_IDL/be_include/be_visitor_home/factory_svs.h: - - Removed this recently-added visitor, turned out - to be unnecessary. - - * TAO_IDL/be/be_visitor_home/home_svs.cpp: - * TAO_IDL/be/be_visitor_home/home_exs.cpp: - * TAO_IDL/be/be_visitor_home/home_svh.cpp: - * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp: - * TAO_IDL/be/be_visitor_home/home_exh.cpp: - * TAO_IDL/be/be_visitor_operation/arglist.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/arglist.cpp: - * TAO_IDL/be/be_decl.cpp: - * TAO_IDL/be/be_visitor_home.cpp: - * TAO_IDL/be/be_visitor_operation.cpp: - * TAO_IDL/be/be_scope.cpp: - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: - * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: - * TAO_IDL/be_include/be_visitor_home/home_ex_idl.h: - * TAO_IDL/be_include/be_visitor_home/home_exh.h: - * TAO_IDL/be_include/be_visitor_home/home_svs.h: - * TAO_IDL/be_include/be_visitor_home/home_exs.h: - * TAO_IDL/be_include/be_visitor_home/home_svh.h: - * TAO_IDL/be_include/be_visitor_operation/arglist.h: - * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: - * TAO_IDL/be_include/be_visitor_home.h: - - More work toward handling home factories and - finders as members of the home's scope rather - than as a list in the home class. In progress. - - Fri Jan 29 22:03:03 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_home/factory_svs.cpp: - * TAO_IDL/be_include/be_visitor_home/factory_svs.h: - - New visitor for homes, encapsulating the issues of - factory and finder code generation in the servant - source file. - - * TAO_IDL/include/ast_valuetype.h: - * TAO_IDL/include/ast_home.h: - * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: - * TAO_IDL/include/utl_scope.h: - * TAO_IDL/be/be_visitor_home/home_svs.cpp: - * TAO_IDL/be/be_visitor_home/home_svh.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp: - * TAO_IDL/be/be_visitor_home.cpp: - * TAO_IDL/be/be_finder.cpp: - * TAO_IDL/ast/ast_home.cpp: - * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: - * TAO_IDL/ast/ast_finder.cpp: - * TAO_IDL/ast/ast_redef.cpp: - * TAO_IDL/be_include/be_visitor_home/home_svs.h: - * TAO_IDL/be_include/be_visitor_home/home_svh.h: - * TAO_IDL/be_include/be_visitor_home.h: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/util/utl_scope.cpp: - - In-progress change of home factory and finder handling. - Instead of being stored in lists in the home node, they - will be members of the home scope like any other legal - construct for a home scope. - - Fri Jan 29 18:08:41 UTC 2010 Jeff Parsons - - * TAO_IDL/include/ast_finder.h: - * TAO_IDL/be/be_finder.cpp: - * TAO_IDL/ast/ast_finder.cpp: - * TAO_IDL/be_include/be_finder.h: - - New AST node classes, representing an IDL home - finder construct. - - * orbsvcs/IFR_Service/ifr_visitor.h: - * orbsvcs/IFR_Service/ifr_visitor.cpp: - * orbsvcs/IFR_Service/ifr_adding_visitor.cpp: - - Updated backend with no-op overrides of - visit_* methods added to the front end. - - * TAO_IDL/include/ast_generator.h: - * TAO_IDL/include/ast_visitor_reifying.h: - * TAO_IDL/include/ast_decl.h: - * TAO_IDL/include/ast_factory.h: - * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: - * TAO_IDL/include/ast_visitor.h: - * TAO_IDL/be/be_factory.cpp: - * TAO_IDL/be/be_visitor.cpp: - * TAO_IDL/be/be_generator.cpp: - * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: - * TAO_IDL/ast/ast_generator.cpp: - * TAO_IDL/ast/ast_visitor_reifying.cpp: - * TAO_IDL/ast/ast_factory.cpp: - * TAO_IDL/be_include/be_visitor.h: - * TAO_IDL/be_include/be_factory.h: - * TAO_IDL/be_include/be_generator.h: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/narrow/narrow.cpp: - - Other changes corresponding to the addition - of the new AST classes and visit_* methods - above. - - Thu Jan 28 20:04:42 UTC 2010 Jeff Parsons - - * TAO_IDL/include/ast_decl.h: - * TAO_IDL/include/utl_scope.h: - * TAO_IDL/be/be_visitor_operation/arglist.cpp: - * TAO_IDL/be/be_visitor_operation/argument.cpp: - * TAO_IDL/be/be_sequence.cpp: - * TAO_IDL/ast/ast_interface.cpp: - * TAO_IDL/ast/ast_module.cpp: - * TAO_IDL/ast/ast_interface_fwd.cpp: - * TAO_IDL/ast/ast_decl.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/fe_extern.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/util/utl_scope.cpp: - - Removal of more unnecessary code. - - Thu Jan 28 18:13:19 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_union.cpp: - * TAO_IDL/be/be_visitor_exception/exception.cpp: - * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_exception/exception_cs.cpp: - * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp: - * TAO_IDL/be/be_visitor_exception/exception_ch.cpp: - * TAO_IDL/be/be_visitor_exception/exception_ci.cpp: - * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp: - * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_exception/ctor_assign.cpp: - * TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_typedef/typedef.cpp: - * TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp: - * TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp: - * TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp: - * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp: - * TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp: - * TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp: - * TAO_IDL/be/be_interface_fwd.cpp: - * TAO_IDL/be/be_attribute.cpp: - * TAO_IDL/be/be_visitor_native.cpp: - * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp: - * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: - * TAO_IDL/be/be_visitor_arg_traits.cpp: - * TAO_IDL/be/be_valuetype.cpp: - * TAO_IDL/be/be_visitor_argument/invoke_cs.cpp: - * TAO_IDL/be/be_visitor_argument/argument.cpp: - * TAO_IDL/be/be_visitor_argument/arglist.cpp: - * TAO_IDL/be/be_visitor_argument/upcall_ss.cpp: - * TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp: - * TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp: - * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp: - * TAO_IDL/be/be_visitor_argument/paramlist.cpp: - * TAO_IDL/be/be_visitor_home/home_ch.cpp: - * TAO_IDL/be/be_visitor_home/home_exs.cpp: - * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp: - * TAO_IDL/be/be_visitor_home/home_exh.cpp: - * TAO_IDL/be/be_visitor_home/home_cs.cpp: - * TAO_IDL/be/be_union_fwd.cpp: - * TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp: - * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp: - * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp: - * TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp: - * TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp: - * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp: - * TAO_IDL/be/be_visitor_interface/interface_ci.cpp: - * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp: - * TAO_IDL/be/be_visitor_interface/amh_ch.cpp: - * TAO_IDL/be/be_visitor_interface/interface_ih.cpp: - * TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp: - * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: - * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp: - * TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp: - * TAO_IDL/be/be_visitor_interface/interface_sh.cpp: - * TAO_IDL/be/be_visitor_interface/interface_si.cpp: - * TAO_IDL/be/be_visitor_interface/interface_is.cpp: - * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_interface/amh_sh.cpp: - * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp: - * TAO_IDL/be/be_visitor_interface/amh_si.cpp: - * TAO_IDL/be/be_visitor_interface/ami_interface_ch.cpp: - * TAO_IDL/be/be_visitor_interface/interface.cpp: - * TAO_IDL/be/be_visitor_interface/interface_ss.cpp: - * TAO_IDL/be/be_visitor_interface/amh_ss.cpp: - * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp: - * TAO_IDL/be/be_visitor_interface/tie_sh.cpp: - * TAO_IDL/be/be_visitor_interface/interface_svh.cpp: - * TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp: - * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp: - * TAO_IDL/be/be_visitor_interface/tie_ss.cpp: - * TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp: - * TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp: - * TAO_IDL/be/be_visitor_interface/interface_svs.cpp: - * TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp: - * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp: - * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp: - * TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp: - * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp: - * TAO_IDL/be/be_visitor_operation/arglist.cpp: - * TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp: - * TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp: - * TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp: - * TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp: - * TAO_IDL/be/be_visitor_operation/operation_ih.cpp: - * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp: - * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: - * TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp: - * TAO_IDL/be/be_visitor_operation/operation_sh.cpp: - * TAO_IDL/be/be_visitor_operation/operation_is.cpp: - * TAO_IDL/be/be_visitor_operation/rettype.cpp: - * TAO_IDL/be/be_visitor_operation/amh_sh.cpp: - * TAO_IDL/be/be_visitor_operation/operation.cpp: - * TAO_IDL/be/be_visitor_operation/operation_ss.cpp: - * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp: - * TAO_IDL/be/be_visitor_operation/amh_ss.cpp: - * TAO_IDL/be/be_visitor_operation/tie_sh.cpp: - * TAO_IDL/be/be_visitor_operation/ami_ch.cpp: - * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp: - * TAO_IDL/be/be_visitor_operation/argument.cpp: - * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp: - * TAO_IDL/be/be_visitor_operation/tie_ss.cpp: - * TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp: - * TAO_IDL/be/be_visitor_operation/argument_marshal.cpp: - * TAO_IDL/be/be_visitor_operation/ami_cs.cpp: - * TAO_IDL/be/be_visitor_operation/argument_invoke.cpp: - * TAO_IDL/be/be_visitor_root.cpp: - * TAO_IDL/be/be_codegen.cpp: - * TAO_IDL/be/be_union_branch.cpp: - * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp: - * TAO_IDL/be/be_visitor_sequence/sequence_base.cpp: - * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: - * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp: - * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp: - * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp: - * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: - * TAO_IDL/be/be_visitor_union.cpp: - * TAO_IDL/be/be_valuetype_fwd.cpp: - * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: - * TAO_IDL/be/be_visitor_interface_fwd.cpp: - * TAO_IDL/be/be_visitor_root/root_ci.cpp: - * TAO_IDL/be/be_visitor_root/root_sth.cpp: - * TAO_IDL/be/be_visitor_root/root_exs.cpp: - * TAO_IDL/be/be_visitor_root/root_ih.cpp: - * TAO_IDL/be/be_visitor_root/root_svh.cpp: - * TAO_IDL/be/be_visitor_root/cdr_op.cpp: - * TAO_IDL/be/be_visitor_root/serializer_op.cpp: - * TAO_IDL/be/be_visitor_root/root_ex_idl.cpp: - * TAO_IDL/be/be_visitor_root/root_cs.cpp: - * TAO_IDL/be/be_visitor_root/root_sh.cpp: - * TAO_IDL/be/be_visitor_root/root_svs.cpp: - * TAO_IDL/be/be_visitor_root/root_is.cpp: - * TAO_IDL/be/be_visitor_root/root_si.cpp: - * TAO_IDL/be/be_visitor_root/root.cpp: - * TAO_IDL/be/be_visitor_root/any_op.cpp: - * TAO_IDL/be/be_visitor_root/root_exh.cpp: - * TAO_IDL/be/be_visitor_root/root_ss.cpp: - * TAO_IDL/be/be_visitor_root/root_ch.cpp: - * TAO_IDL/be/be_type.cpp: - * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp: - * TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp: - * TAO_IDL/be/be_visitor_valuebox/valuebox.cpp: - * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp: - * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp: - * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_valuebox/field_ch.cpp: - * TAO_IDL/be/be_visitor_enum.cpp: - * TAO_IDL/be/be_home.cpp: - * TAO_IDL/be/be_visitor_template_export.cpp: - * TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/field_ci.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp: - * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/arglist.cpp: - * TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp: - * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp: - * TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp: - * TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp: - * TAO_IDL/be/be_visitor_valuetype/obv_module.cpp: - * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp: - * TAO_IDL/be/be_helper.cpp: - * TAO_IDL/be/be_valuebox.cpp: - * TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype_fwd.cpp: - * TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp: - * TAO_IDL/be/be_component.cpp: - * TAO_IDL/be/be_visitor_exception.cpp: - * TAO_IDL/be/be_visitor_typedef.cpp: - * TAO_IDL/be/be_visitor_union_branch.cpp: - * TAO_IDL/be/be_visitor_typecode.cpp: - * TAO_IDL/be/be_visitor_argument.cpp: - * TAO_IDL/be/be_component_fwd.cpp: - * TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp: - * TAO_IDL/be/be_visitor_union_branch/public_cs.cpp: - * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp: - * TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp: - * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp: - * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp: - * TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp: - * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp: - * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp: - * TAO_IDL/be/be_visitor_home.cpp: - * TAO_IDL/be/be_visitor_constant.cpp: - * TAO_IDL/be/be_visitor_amh_pre_proc.cpp: - * TAO_IDL/be/be_interface_strategy.cpp: - * TAO_IDL/be/be_operation_strategy.cpp: - * TAO_IDL/be/be_field.cpp: - * TAO_IDL/be/be_visitor_native/native_ch.cpp: - * TAO_IDL/be/be_module.cpp: - * TAO_IDL/be/be_visitor_sequence.cpp: - * TAO_IDL/be/be_visitor_constant/constant_cs.cpp: - * TAO_IDL/be/be_visitor_constant/constant_ch.cpp: - * TAO_IDL/be/be_structure_fwd.cpp: - * TAO_IDL/be/be_visitor_component/component_ch.cpp: - * TAO_IDL/be/be_visitor_component/component_ci.cpp: - * TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_component/component_ih.cpp: - * TAO_IDL/be/be_visitor_component/component_cs.cpp: - * TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_component/component_sh.cpp: - * TAO_IDL/be/be_visitor_component/component_is.cpp: - * TAO_IDL/be/be_visitor_component/component_si.cpp: - * TAO_IDL/be/be_visitor_component/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_component/component.cpp: - * TAO_IDL/be/be_visitor_component/component_ss.cpp: - * TAO_IDL/be/be_visitor_component/any_op_cs.cpp: - * TAO_IDL/be/be_predefined_type.cpp: - * TAO_IDL/be/be_visitor_array/array.cpp: - * TAO_IDL/be/be_visitor_array/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp: - * TAO_IDL/be/be_visitor_array/array_cs.cpp: - * TAO_IDL/be/be_visitor_array/array_ci.cpp: - * TAO_IDL/be/be_visitor_array/any_op_cs.cpp: - * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp: - * TAO_IDL/be/be_visitor_component_fwd.cpp: - * TAO_IDL/be/be_argument.cpp: - * TAO_IDL/be/be_visitor_module/module_ch.cpp: - * TAO_IDL/be/be_visitor_module/module_sh.cpp: - * TAO_IDL/be/be_visitor_module/any_op.cpp: - * TAO_IDL/be/be_visitor_module/module.cpp: - * TAO_IDL/be/be_visitor_module/module_ih.cpp: - * TAO_IDL/be/be_visitor_module/cdr_op.cpp: - * TAO_IDL/be/be_visitor_module/serializer_op.cpp: - * TAO_IDL/be/be_visitor_decl.cpp: - * TAO_IDL/be/be_visitor_union/discriminant_ch.cpp: - * TAO_IDL/be/be_visitor_union/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp: - * TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp: - * TAO_IDL/be/be_visitor_union/union_ch.cpp: - * TAO_IDL/be/be_visitor_union/union_ci.cpp: - * TAO_IDL/be/be_visitor_union/union.cpp: - * TAO_IDL/be/be_visitor_union/discriminant_cs.cpp: - * TAO_IDL/be/be_visitor_union/any_op_cs.cpp: - * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp: - * TAO_IDL/be/be_visitor_union/union_cs.cpp: - * TAO_IDL/be/be_constant.cpp: - * TAO_IDL/be/be_visitor_valuetype.cpp: - * TAO_IDL/be/be_exception.cpp: - * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_structure/structure.cpp: - * TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp: - * TAO_IDL/be/be_visitor_structure/structure_cs.cpp: - * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp: - * TAO_IDL/be/be_visitor_structure/structure_ch.cpp: - * TAO_IDL/be/be_visitor_structure/structure_ci.cpp: - * TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp: - * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp: - * TAO_IDL/be/be_global.cpp: - * TAO_IDL/be/be_null_return_emitter.cpp: - * TAO_IDL/be/be_visitor_enum/enum_ch.cpp: - * TAO_IDL/be/be_visitor_enum/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp: - * TAO_IDL/be/be_visitor_enum/enum_cs.cpp: - * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp: - * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp: - * TAO_IDL/be/be_visitor_context.cpp: - * TAO_IDL/be/be_visitor_union_fwd.cpp: - * TAO_IDL/be/be_visitor_structure_fwd.cpp: - * TAO_IDL/be/be_visitor_field/field_ci.cpp: - * TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp: - * TAO_IDL/be/be_visitor_field/field_cs.cpp: - * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp: - * TAO_IDL/be/be_visitor_field/field_ch.cpp: - * TAO_IDL/be/be_root.cpp: - * TAO_IDL/be/be_interface.cpp: - * TAO_IDL/be/be_enum.cpp: - * TAO_IDL/be/be_string.cpp: - * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp: - * TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp: - * TAO_IDL/be/be_array.cpp: - * TAO_IDL/be/be_visitor_traits.cpp: - * TAO_IDL/be/be_visitor_factory.cpp: - * TAO_IDL/be/be_native.cpp: - * TAO_IDL/be/be_generator.cpp: - * TAO_IDL/ast/ast_union_fwd.cpp: - * TAO_IDL/ast/ast_structure_fwd.cpp: - * TAO_IDL/ast/ast_concrete_type.cpp: - * TAO_IDL/ast/ast_predefined_type.cpp: - * TAO_IDL/ast/ast_enum_val.cpp: - * TAO_IDL/ast/ast_recursive.cpp: - * TAO_IDL/ast/ast_valuetype_fwd.cpp: - * TAO_IDL/ast/ast_root.cpp: - * TAO_IDL/ast/ast_eventtype_fwd.cpp: - * TAO_IDL/ast/ast_valuebox.cpp: - * TAO_IDL/ast/ast_redef.cpp: - * TAO_IDL/ast/ast_union_label.cpp: - * TAO_IDL/ast/ast_interface_fwd.cpp: - * TAO_IDL/ast/ast_component_fwd.cpp: - * TAO_IDL/ast/ast_enum.cpp: - * TAO_IDL/ast/ast_string.cpp: - * TAO_IDL/ast/ast_check.cpp: - * TAO_IDL/ast/ast_type.cpp: - * TAO_IDL/ast/ast_native.cpp: - * TAO_IDL/be_include/be_visitor_context.h: - * TAO_IDL/fe/fe_global.cpp: - * TAO_IDL/fe/fe_init.cpp: - * TAO_IDL/fe/fe_extern.cpp: - * TAO_IDL/fe/fe_private.cpp: - * TAO_IDL/driver/drv_mcpp_preproc.cpp: - * TAO_IDL/driver/drv_preproc.cpp: - * TAO_IDL/narrow/narrow.cpp: - * TAO_IDL/util/utl_identifier.cpp: - * TAO_IDL/util/utl_tmpl/utl_exprlist.cpp: - * TAO_IDL/util/utl_tmpl/utl_list.cpp: - * TAO_IDL/util/utl_tmpl/utl_namelist.cpp: - * TAO_IDL/util/utl_tmpl/utl_decllist.cpp: - * TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp: - * TAO_IDL/util/utl_tmpl/utl_strlist.cpp: - * TAO_IDL/util/utl_tmpl/utl_idlist.cpp: - * TAO_IDL/util/utl_decllist.cpp: - * TAO_IDL/util/utl_strlist.cpp: - * TAO_IDL/util/utl_stack.cpp: - * TAO_IDL/util/utl_string.cpp: - - Removed many unused methods from class be_visitor_context, - and bits of unused code from many other files. - - Thu Jan 28 15:56:11 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_home/home_svs.cpp: - * TAO_IDL/be/be_visitor_home/home_svh.cpp: - - Added code generation for method overrides that appear as pure - virtual in the skeleton base class when the home has - a primary key. These methods throw CORBA::NO_IMPLEMENT, - since primary keys are not supported in CIAO. - -Wed Feb 3 15:23:16 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: - * orbsvcs/tests/AVStreams/Pluggable/run_test.pl: - * orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl: - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl: - - Increase sleep out time to allow these tests to pass on the - iPhone Simulator. - -Wed Feb 3 09:52:47 UTC 2010 Vladimir Zykov - - * tests/IDL_Test/IDL_Test.mpc: - * tests/IDL_Test/Bug_3819_Regression.idl: - Added a test for bug#3819. - -Tue Feb 2 11:07:14 UTC 2010 Vladimir Zykov - - * tests/Bug_1361_Regression/server.cpp: - * tests/Bug_1361_Regression/shutdown.cpp: - * tests/Bug_1361_Regression/client.cpp: - * tests/Bug_1361_Regression/Echo.cpp: - * tests/Bug_1361_Regression/Bug_1361_Regression.mpc: - Simplified the test. It used libTAO_Messaging without any - need for it. - - * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h: - * tao/AnyTypeCode/Any_Array_Impl_T.cpp: - * tao/AnyTypeCode/Objref_TypeCode.cpp: - * tao/PortableServer/Any_SArg_Traits.h: - * tao/PortableServer/get_arg.h: - * tao/PI_Server/Policy_Creator_T.h: - * tao/Load_Protocol_Factory_T.h: - * tao/TransportCurrent/IIOP_Current_Impl.h: - * tao/Valuetype/Valuetype_Traits_Base_T.h: - Added required include. - - * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h: - * tao/TransportCurrent/Current_ORBInitializer.h: - Removed unnecessary for templates export directive. - - * tao/ImR_Client/ServerObject.pidl: - * tao/ImR_Client/ImplRepo.pidl: - * tao/AnyTypeCode/BasicTypeTraits.h: - * tao/IORTable/IORTable.pidl: - * tao/Object_Key.pidl: - * tao/TransportCurrent/Transport_Current.h: - * tao/TransportCurrent/IIOP_Transport_Current.h: - Added inclusion guards. - - * tao/AnyTypeCode/Union_TypeCode.h: - Added necessary forward declaration. - - * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h: - * tao/PortableServer/Upcall_Command.h: - * tao/PortableServer/Upcall_Wrapper.h: - * tao/Object_Reference_Traits_T.h: - * tao/String_Traits_T.h: - * tao/Value_Traits_T.h: - * tao/Array_Traits_T.h: - * tao/Utils/Servant_Var.inl: - * tao/Valuetype/Valuetype_Traits_T.h: - Changed 'ifndef ACE_LACKS_PRAGMA_ONCE' to - 'if !defined (ACE_LACKS_PRAGMA_ONCE)'. So that ifndef is only used - for inclusion guards in TAO. - - * tao/Transport.cpp: - Changed 0 to false for boolean type. - - * tao/RTScheduling/ThreadAction.h: - Fixed code that didn't compile. - -Mon Feb 1 19:27:43 UTC 2010 Johnny Willemsen - - * orbsvcs/orbsvcs/Notify/QoSProperties.h - * orbsvcs/orbsvcs/Notify/Topology_Saver.h - * orbsvcs/orbsvcs/Time_Utilities.h - * orbsvcs/orbsvcs/Time_Utilities.inl - Doxygen fixes - -Sun Jan 31 01:04:43 CST 2010 Johnny Willemsen - - * TAO version 1.7.6 released. - -Thu Jan 28 12:56:31 UTC 2010 Abdul Sowayan - - * NEWS: - - ACE/TAO now supports the new iPad ;-). - -Thu Jan 28 07:54:30 UTC 2010 Johnny Willemsen - - Merged revision 88742-88757 from idl3_plus_backend2 to svn head. This - gives us templated modules for the small parts we need for dds4ccm - - Wed Jan 27 22:19:17 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_decl.cpp: - * TAO_IDL/be/be_visitor_component/facet_exs.cpp: - * TAO_IDL/be/be_visitor_component/facet_exh.cpp: - * TAO_IDL/be_include/be_decl.h: - - Added check to ensure that a facet interface gets generated - only once in the executor header and source files. This fix - closes [BUGID:3817]. Thanks to Abdul Sowayan - for reporting the bug. - - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Cosmetic changes. - - Wed Jan 27 20:08:48 UTC 2010 Jeff Parsons - - * TAO_IDL/include/ast_union.h: - * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: - * TAO_IDL/include/utl_labellist.h: - * TAO_IDL/include/ast_union_branch.h: - * TAO_IDL/include/utl_scope.h: - * TAO_IDL/be/be_union_label.cpp: - * TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp: - * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: - * TAO_IDL/ast/ast_visitor_reifying.cpp: - * TAO_IDL/ast/ast_enum.cpp: - * TAO_IDL/ast/ast_union_branch.cpp: - * TAO_IDL/util/utl_labellist.cpp: - * TAO_IDL/util/utl_exceptlist.cpp: - * TAO_IDL/util/utl_idlist.cpp: - * TAO_IDL/util/utl_scope.cpp: - - Added support for unions and enums in the scope of a - template module. - -Wed Jan 27 22:55:24 UTC 2010 Adam Mitz - - * TAO_IDL/util/utl_global.cpp(add_dcps_data_type): - - Now that lookup_by_name_local() has been re-written in - Tue Jan 26 20:21:30 UTC 2010 Jeff Parsons - on the idl3_plus_backend2 branch which was merged in - Wed Jan 27 14:19:30 UTC 2010 Johnny Willemsen - it doesn't add an extra space at the end of the name. Changed - add_dcps_data_type() to account for this. - -Wed Jan 27 14:29:30 UTC 2010 Johnny Willemsen - - * TAO_IDL/Makefile.am: - Regenerated - -Wed Jan 27 14:19:30 UTC 2010 Johnny Willemsen - - Merged revision 88605-88741 from idl3_plus_backend2 to svn head. This - gives us templated modules for the small parts we need for dds4ccm - - Tue Jan 26 20:21:30 UTC 2010 Jeff Parsons - - * TAO_IDL/include/ast_visitor_tmpl_module_ref.h: - * TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp: - - New files, defining a new visitor specialized to - create implied IDL related to template module - references as soon as they're parsed, rather than waiting - until template module instantiation time. The - template module instantiation visitor then copies - this implied IDL into its scope of instantiation. - The extra copy of the implied IDL nodes is justified - by the simplification of lookups involving a reference - to the instantiation of a template module reference. - - This new visitor inherits from the template module - instantiation visitor, and overrides one method, - visit_template_module_ref(). The other are reused - as is. - - * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: - * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: - - Changed the method overridden by the new visitor - above to a no-op, since the new visitor now handles - template module references. - - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Added code to launch the new visitor immediately after - a template module reference is parsed and created. - - * TAO_IDL/fe/lex.yy.cpp: - * TAO_IDL/fe/idl.ll: - - Fixed a bug that apparently just cropped up in the - "version" block of idl_store_pragma. - - * TAO_IDL/util/utl_scope.cpp(lookup_by_name_local): - - Now checks for a match with a template module reference, - and skips it, matching instead with the corresoponding - regular module created immediately after it in the scope. - - Mon Jan 25 22:39:39 UTC 2010 Jeff Parsons - - * TAO_IDL/include/fe_home_header.h: - - Cosmetic changes. - - * TAO_IDL/include/ast_visitor_reifying.h: - * TAO_IDL/include/ast_connector.h: - * TAO_IDL/include/ast_consumes.h: - * TAO_IDL/include/ast_publishes.h: - * TAO_IDL/include/ast_emits.h: - * TAO_IDL/ast/ast_consumes.cpp: - * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: - * TAO_IDL/ast/ast_publishes.cpp: - * TAO_IDL/ast/ast_emits.cpp: - * TAO_IDL/ast/ast_visitor_reifying.cpp: - - Added support for components, homes, connectors, - porttypes, simple/extended ports and mirror - ports and aliases in an instantiated template - module. - - * TAO_IDL/util/utl_global.cpp(string_to_scoped_name): - - Completely rewrote the method using ACE_CString. - - Fri Jan 22 19:42:38 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_template_module.cpp: - - * TAO_IDL/fe/idl.ll: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/lex.yy.cpp: - * TAO_IDL/fe/y.tab.h: - * TAO_IDL/fe/y.tab.cpp: - - * TAO_IDL/fe/fe_event_header.cpp: - - * TAO_IDL/include/fe_event_header.h: - - Removed these files. - - Fri Jan 22 18:26:17 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: - * TAO_IDL/be/be_visitor_reifying.cpp: - * TAO_IDL/be_include/be_visitor_reifying.h: - * TAO_IDL/be_include/be_visitor_tmpl_module_inst.h: - - Removed these files, the visitors have been moved - to the front end. - - * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: - * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: - - Added some missing no-op visit_* methods. - - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Added spawn of template instantiation visitor. - - * TAO_IDL/fe/fe_interface_header.cpp: - - Removed recently added debugging output. - - Thu Jan 21 20:20:47 UTC 2010 Jeff Parsons - - * TAO_IDL/include/ast_visitor_reifying.h: - * TAO_IDL/include/ast_visitor_tmpl_module_inst.h: - * TAO_IDL/include/ast_visitor_context.h: - * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp: - * TAO_IDL/ast/ast_visitor_reifying.cpp: - * TAO_IDL/ast/ast_visitor_context.cpp: - - Moved the visitors that create implied IDL upon - template module instantiation to the front end, - along with a piece of the visitor context class - that becomes a base class for the backend visitor - context class. This move is motivated by the fact - that generation of executor IDL turns this implied - IDL into explicit IDL, so in order to parse the - executor IDL file, this implied IDL must be added - to the AST in the front end. - - The corresponding backend visitor classes will be - removed after further testing. - - * TAO_IDL/include/ast_factory.h: - * TAO_IDL/include/ast_operation.h: - * TAO_IDL/be/be_factory.cpp: - * TAO_IDL/be/be_visitor_scope.cpp: - * TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp: - * TAO_IDL/be/be_visitor_module.cpp: - * TAO_IDL/be/be_produce.cpp: - * TAO_IDL/be/be_visitor_context.cpp: - * TAO_IDL/be/be_visitor.cpp: - * TAO_IDL/be/be_operation.cpp: - * TAO_IDL/be/be_scope.cpp: - * TAO_IDL/be/be_generator.cpp: - * TAO_IDL/ast/ast_visitor.cpp: - * TAO_IDL/ast/ast_operation.cpp: - * TAO_IDL/ast/ast_generator.cpp: - * TAO_IDL/ast/ast_factory.cpp: - * TAO_IDL/be_include/be_operation.h: - * TAO_IDL/be_include/be_visitor_context.h: - * TAO_IDL/be_include/be_factory.h: - * TAO_IDL/be_include/be_scope.h: - * TAO_IDL/fe/fe_interface_header.cpp: - * TAO_IDL/util/utl_scope.cpp: - - Other changes related to the above visitor move, plus - some cosmetic changes. Spawning of the new visitors - when a template module instantiation is seen is not - added in this set of changes. - - Mon Jan 18 15:35:54 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp: - * TAO_IDL//be_visitor_valuebox/union_member_ci.cpp: - * TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h: - * TAO_IDL/be_include/be_visitor_valuebox/field_ci.h: - - Removed parameter 'vb_node' from private methods - emit_member_get() and emit_member_set(), since this value - is now stored in a member variable. - -Tue Jan 26 14:23:30 UTC 2010 Johnny Willemsen - - * orbsvcs/tests/ImplRepo/run_test.pl: - Reverted back to the original times, the changes broke the regular - running - -Mon Jan 25 14:53:00 UTC 2010 Jeff Parsons - - * NEWS: - Updated file with my changes since the last release. - -Fri Jan 22 12:34:30 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_component/context_svh.cpp: - * TAO_IDL/be/be_visitor_component/context_svs.cpp: - Pass the ciao instance id through the constructor - -Fri Jan 22 11:58:30 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_component/context_svh.cpp: - * TAO_IDL/be/be_visitor_component/context_svs.cpp: - * TAO_IDL/be/be_visitor_component/servant_svh.cpp: - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - More tweaks for AMI4CCM - -Fri Jan 22 10:14:30 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_interface.cpp: - Generate another ami4ccm interface - -Thu Jan 21 08:00:30 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_codegen.cpp: - * TAO_IDL/fe/lex.yy.cpp: - * TAO_IDL/include/idl_global.h: - * TAO_IDL/util/utl_global.cpp: - Added support for #pragma ciao lem "X". When a lem is generated - than any X seen will be generated into the new lem file - -Thu Jan 21 01:50:30 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/Bug_3215_Regression/client.cpp: - - Added "include "tao/PI/PI.h" to the file to allow - this test to pass on the iPhone Simulator. The - inclusion of PI.h is rquired for static builds. - -Thu Jan 21 01:45:41 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/Bug_3216_Regression/client.cpp: - - Added "include "tao/PI/PI.h" to the file to allow - this test to pass on the iPhone Simulator. The - inclusion of PI.h is rquired for static builds. - -Wed Jan 20 19:19:19 UTC 2010 Olli Savia - - * orbsvcs/ImplRepo_Service/Activator_Options.cpp: - Fixed compile warning. - -Wed Jan 20 15:15:02 UTC 2010 Abdul Sowayan - - * MPC/config/tao_idl_fe.mpb: - * TAO_IDL/tao_idl_fe.mpc: - * orbsvcs/IFR_Service/IFR_Service.mpc: - - Build the IFR_Service executable on cross-build platforms. - This will allow more tests to pass on the iPhone Simulator. - According to Johnny Willemsen, there is no reason not to build - IFR_Service executable on cross-build platforms. - -Wed Jan 20 09:09:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/fe/lex.yy.cpp: - * TAO_IDL/util/utl_global.cpp: - Const changes - -Tue Jan 19 14:56:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_interface.cpp - * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp - * TAO_IDL/be/be_visitor_component/context_svh.cpp - * TAO_IDL/be/be_visitor_component/context_svs.cpp - * TAO_IDL/be/be_visitor_component/servant_svh.cpp - * TAO_IDL/be/be_visitor_component/servant_svs.cpp - Generate the correct type for the AMI4CCM implied methods - -Tue Jan 19 14:32:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_produce.cpp: - Don't call the ami4ccm preprocessor - -Tue Jan 19 14:02:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp - * TAO_IDL/be/be_visitor_component/context_svh.cpp - * TAO_IDL/be/be_visitor_component/context_svs.cpp - * TAO_IDL/be/be_visitor_component/servant_svs.cpp - Const improvements and more AMI4CCM generation - -Tue Jan 19 13:39:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: - * TAO_IDL/be/be_visitor_component/context_svh.cpp: - * TAO_IDL/be/be_visitor_component/context_svs.cpp: - * TAO_IDL/be/be_visitor_component/servant_svh.cpp: - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - Generate additional methods for AMI4CCM - -Tue Jan 19 13:00:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_codegen.cpp: - * TAO_IDL/be/be_interface.cpp: - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: - * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: - Changed the generation for AMI4CCM, add the implied interfaces - to the generated LEM file. - -Tue Jan 19 11:33:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_module.cpp: - strip tailing white space - - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: - Removed some debug lines - - * TAO_IDL/fe/fe_component_header.cpp: - * TAO_IDL/fe/fe_interface_header.cpp: - * TAO_IDL/fe/fe_obv_header.cpp: - Initialise pointers to 0 - - * TAO_IDL/util/utl_scope.cpp: - Simplified some methods - -Tue Jan 19 09:04:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_interface.cpp: - Generate correct base class - -Tue Jan 19 08:44:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_codegen.cpp: - Simplification - - * TAO_IDL/be/be_interface.cpp: - Generate implied AMI4CCM node - - * TAO_IDL/be/be_produce.cpp: - Do CCM preprocessing after AMI4CCM - -Tue Jan 19 07:25:19 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL_Test.mpc: - Only generate the export file as part of one idl file - -Tue Jan 19 07:18:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_scope.cpp - * TAO_IDL/be/be_template_module.cpp - Fixed warnings - -Tue Jan 19 04:00:00 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/Simple_Naming/run_test.pl: - - Added some sleep statements to allow this test to pass on the - iPhone Simulator. - -Tue Jan 19 03:50:44 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/ImplRepo/run_test.pl: - - Increase the sleep() value to allow this test to pass on the - iPhone Simulator. - -Tue Jan 19 03:43:50 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/CosEvent/Timeout/run_test.pl: - - Added some sleep statements to allow this test to pass on the - iPhone Simulator. - -Mon Jan 18 19:34:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp - * TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp - * TAO_IDL/be_include/be_visitor_valuebox/field_ci.h - * TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h - Merged revision 88580-88605 from idl3_plus_backend2 to svn head - -Mon Jan 18 14:23:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_uses.cpp: - Layout change - - * TAO_IDL/be/be_visitor_root/root_ex_idl.cpp: - Const change - -Mon Jan 18 13:55:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be_include/be_operation_strategy.h: - Fixed typo in comment - - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: - Generate local interfaces - -Mon Jan 18 13:16:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: - Only one exit point in the method - -Mon Jan 18 12:19:19 UTC 2010 Johnny Willemsen - - * TAO/be/be_attribute.cpp: - * TAO/be_include/be_attribute.h: - Added original_attribute member - - * TAO/be/be_operation.cpp: - * TAO/be_include/be_operation.h: - Added original_operation attribute member - -Mon Jan 18 10:00:19 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/IDL_Test.mpc: - Put all stubs an skeleton in a DLL and added two projects to - compile all TAO test idl files also with the RTI ddsgen tool - when that is enabled. All idl files and generated code that - cause warnings and/or errors are disabled and reported back - to RTI. - -Sun Jan 17 20:05:43 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/ImplRepo/run_test.pl: - - Increase the sleep() value to allow this test to pass on the - iPhone Simulator. - -Sun Jan 17 19:59:45 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/ImplRepo/scale/run_test.pl: - - Increase the sleep() value to allow this test to pass on the - iPhone Simulator. - -Sun Jan 17 19:50:33 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: - - Increase the sleep() value to allow this test to pass on the - iPhone Simulator. - -Sun Jan 17 19:42:25 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/Log/Basic_Log_Test/run_test.pl: - - Increase the sleep() value to allow this test to pass on the - iPhone Simulator. - -Sun Jan 17 19:15:16 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: - - Added some sleep statements to allow this test to pass on the - iPhone Simulator. - -Sun Jan 17 19:00:25 UTC 2010 Abdul Sowayan - - * orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl: - - Added some sleep statements to allow this test to pass on the - iPhone Simulator. - -Sun Jan 17 18:34:36 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: - - Increase the sleep() value to allow this test to pass on the - iPhone Simulator. - -Sun Jan 17 18:31:07 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: - - Increase the sleep() value to allow this test to pass on the - iPhone Simulator. - -Sun Jan 17 17:38:48 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: - - Increase the sleep() value to allow this test to pass on the - iPhone Simulator. - -Sun Jan 17 01:09:57 UTC 2010 Abdul Sowayan - - * TAO_IDL/be/be_visitor_reifying.cpp: - - Fixed fuzz error by ending a new empty line to the end of the file. - -Sat Jan 16 23:58:21 UTC 2010 Abdul Sowayan - - * orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: - - Increase the sleep() value to allow this test to pass on the - iPhone Simulator. - -Sat Jan 16 23:14:41 UTC 2010 Abdul Sowayan - - * examples/ior_corbaloc/run_test.pl: - - Increase the sleep() value to allow this test to pass on the - iPhone Simulator. - -Sat Jan 16 18:48:19 UTC 2010 Johnny Willemsen - - Merged revision 88565-88579 from idl3_plus_backend2 to svn head - - Fri Jan 15 20:31:51 UTC 2010 Jeff Parsons - - * TAO_IDL/include/idl_global.h: - * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: - * TAO_IDL/be/be_visitor_context.cpp: - * TAO_IDL/be/be_visitor_reifying.cpp: - * TAO_IDL/be_include/be_visitor_context.h: - * TAO_IDL/be_include/be_visitor_reifying.h: - * TAO_IDL/util/utl_global.cpp: - * TAO_IDL/util/utl_scope.cpp: - - - Removed the template module instantation - scope storage in the visitor context, using - instead the global scope stack for that - purpose. - - - Modified reifying visitor to find and store - a node already created in a template module - instantiation, if the corresponding node is - referenced in the template module. - - Fri Jan 15 15:31:56 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: - - Reverted a small change made yesterday where the - generation of a double colon was prefixed to a name - that is not global. - -Fri Jan 15 13:25:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/Makefile.am: - Updated for all changes related to IDL3+ - -Fri Jan 15 11:21:19 UTC 2010 Johnny Willemsen - - * tests/IDL_Test/valuetype.idl: - Extended this test to reproduce a problem with valuetypes and modules - -Fri Jan 15 10:17:19 UTC 2010 Johnny Willemsen - - Merged revision 88537-88564 from idl3_plus_backend2 to svn head - - Thu Jan 14 22:50:03 UTC 2010 Jeff Parsons - - * TAO_IDL/include/ast_module.h: - * TAO_IDL/include/ast_factory.h: - * TAO_IDL/include/global_extern.h: - * TAO_IDL/include/fe_obv_header.h: - * TAO_IDL/include/ast_operation.h: - * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: - * TAO_IDL/be/be_factory.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp: - * TAO_IDL/be/be_visitor_reifying.cpp: - * TAO_IDL/be/be_operation.cpp: - * TAO_IDL/be/be_scope.cpp: - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: - * TAO_IDL/ast/ast_operation.cpp: - * TAO_IDL/ast/ast_module.cpp: - * TAO_IDL/ast/ast_attribute.cpp: - * TAO_IDL/ast/ast_factory.cpp: - * TAO_IDL/be_include/be_operation.h: - * TAO_IDL/be_include/be_visitor_reifying.h: - * TAO_IDL/be_include/be_factory.h: - * TAO_IDL/be_include/be_scope.h: - * TAO_IDL/be_include/be_visitor_tmpl_module_inst.h: - * TAO_IDL/fe/fe_event_header.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/util/utl_namelist.cpp: - Added template instantiation code generation for - valuetypes and eventtypes. - -Fri Jan 15 09:59:19 UTC 2010 Johnny Willemsen - - * orbsvcs/IFR_Service/ifr_visitor.cpp: - * orbsvcs/IFR_Service/ifr_visitor.h: - Fixed compile errors because of tao_idl changes - -Fri Jan 15 09:56:19 UTC 2010 Johnny Willemsen - - * tao/PortableServer/POA.pidl - * tao/PortableServer/Root_POA.cpp - * tao/PortableServer/Root_POA.h - * tao/PortableServer/ServantRetentionStrategy.h - * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp - * tao/PortableServer/ServantRetentionStrategyNonRetain.h - * tao/PortableServer/ServantRetentionStrategyRetain.cpp - * tao/PortableServer/ServantRetentionStrategyRetain.h - Enable activate_object_with_id with CORBA/e micro. Thanks to - Frank Pilhofer for reporting this and creating the patch - -Thu Jan 14 12:27:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_array/array_ch.cpp - * TAO_IDL/be/be_visitor_reifying.cpp - * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp - * TAO_IDL/be_include/be_visitor_reifying.h - Fuzz fixes - -Thu Jan 14 11:00:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: - Fixed crash - -Thu Jan 14 10:39:19 UTC 2010 Johnny Willemsen - - Merged revision 88432-88536 from the idl3_plus_backend2 branch to - svn head. - - Wed Jan 13 23:16:57 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: - * TAO_IDL/be/be_visitor_operation/arglist.cpp: - * TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp: - * TAO_IDL/be/be_visitor_reifying.cpp: - * TAO_IDL/ast/ast_attribute.cpp: - * TAO_IDL/ast/ast_argument.cpp: - * TAO_IDL/be_include/be_visitor_reifying.h: - * TAO_IDL/be_include/be_visitor_tmpl_module_inst.h: - * TAO_IDL/util/utl_err.cpp: - - Added support for template instantiation of contained - interfaces, operations, attributes, and the associated - arguments and exception lists. - - Tue Jan 12 22:45:58 UTC 2010 Jeff Parsons - - * TAO_IDL/include/utl_scope.h: - - Changed the fe_add_* methods from private to - protected, so they can be called (polymorphically) - by the template module instantiation preprocessing - visitor through be_scope. Only fe_add_field() - is used this way so far, but there may be occasion - to expand the coverage. - - * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: - * TAO_IDL/be/be_expression.cpp: - * TAO_IDL/be/be_structure.cpp: - * TAO_IDL/be/be_visitor_field.cpp: - * TAO_IDL/be/be_visitor_context.cpp: - * TAO_IDL/be/be_scope.cpp: - * TAO_IDL/ast/ast_constant.cpp: - * TAO_IDL/ast/ast_expression.cpp: - * TAO_IDL/be_include/be_visitor_context.h: - * TAO_IDL/be_include/be_structure.h: - * TAO_IDL/be_include/be_scope.h: - * TAO_IDL/be_include/be_visitor_tmpl_module_inst.h: - - Implemented visit_constant() and visit_structure() - in the template module instantiation visitor. - - Fri Jan 8 22:37:35 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_visitor_reifying.cpp: - * TAO_IDL/be_include/be_visitor_reifying.h: - - New files containing a new visitor that - handles the (possible) reification of - template parameter references when they - are replaced by template arguments. Also - checks to see if areference lookup is in - the scope of a template module. If so, a - copy needs to be made in the current - instantiation scope (see below). - - * TAO_IDL/include/ast_visitor.h: - * TAO_IDL/be/be_visitor.cpp: - * TAO_IDL/be_include/be_visitor.h: - - Added method visit_param_holder(). - - * TAO_IDL/be/be_param_holder.cpp: - * TAO_IDL/ast/ast_param_holder.cpp: - - Added call to new visit_* method in the - accept() methods. - - * TAO_IDL/be/be_visitor_context.cpp: - * TAO_IDL/be_include/be_visitor_context.h: - - Added new state storage, namely the scope in - which the contents of an instantiated template - module are to be created. It is now stored in - the visitor context since both be_visitor_reifying - and be_visitor_tmpl_module_inst need to know it. - - * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: - * TAO_IDL/be_include/be_visitor_tmpl_module_inst.h: - - Moved some code to the visitor context, and some - to the new reifying visitor (see above). - - * TAO_IDL/be/be_visitor_array.cpp: - * TAO_IDL/be/be_visitor_array/array_ch.cpp: - - Cosmetic changes. - - Thu Jan 7 22:01:06 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_module.cpp: - - Cosmetic changes. - - * TAO_IDL/be/be_visitor_tmpl_module_inst.cpp: - * TAO_IDL/be_include/be_visitor_tmpl_module_inst.h: - - New files containing a new visitor dedicated to the - generation of implied IDL in the AST resulting - from a template module instantiation. This 'preprocessing' - visitor will make a traversal before any of the others, - so that CCM, AMI and AMH implied IDL can be generated - from the contents of an instantiated module. - - Wed Jan 6 23:21:23 UTC 2010 Jeff Parsons - - * TAO_IDL/include/ast_template_module.h: - * TAO_IDL/include/ast_template_module_inst.h: - * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp: - * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp: - * TAO_IDL/be/be_visitor_scope.cpp: - * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp: - * TAO_IDL/be/be_visitor_interface/interface_svs.cpp: - * TAO_IDL/be/be_visitor_operation/argument_marshal.cpp: - * TAO_IDL/be/be_visitor_sequence/sequence_base.cpp: - * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: - * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp: - * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: - * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: - * TAO_IDL/be/be_visitor_root/root_sth.cpp: - * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp: - * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp: - * TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp: - * TAO_IDL/be/be_visitor_template_export.cpp: - * TAO_IDL/be/be_visitor_valuetype/field_ci.cpp: - * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp: - * TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp: - * TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp: - * TAO_IDL/be/be_visitor_union_branch/public_cs.cpp: - * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp: - * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp: - * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp: - * TAO_IDL/be/be_visitor_component/component_cs.cpp: - * TAO_IDL/be/be_visitor_array/array.cpp: - * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp: - * TAO_IDL/be/be_visitor_array/array_cs.cpp: - * TAO_IDL/be/be_visitor_array/array_ch.cpp: - * TAO_IDL/be/be_visitor_array/array_ci.cpp: - * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp: - * TAO_IDL/be/be_produce.cpp: - * TAO_IDL/be/be_visitor_context.cpp: - * TAO_IDL/be/be_visitor_field/field_ci.cpp: - * TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp: - * TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp: - * TAO_IDL/be/be_visitor_field/field_cs.cpp: - * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp: - * TAO_IDL/be/be_visitor_field/field_ch.cpp: - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: - * TAO_IDL/be/be_template_module.cpp: - * TAO_IDL/ast/ast_template_module.cpp: - * TAO_IDL/ast/ast_template_module_inst.cpp: - * TAO_IDL/be_include/be_visitor_context.h: - * TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h: - * TAO_IDL/be_include/be_visitor_valuebox/field_ci.h: - * TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h: - * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: - - - Changed 'scope' member of class be_visitor_context to - actually be a scope type, rather than a decl type as - previously. - - - Added a new visitor and a separate pass for template module - instantiation. - - - Added a few of the necessary visit_* methods to the - new visitor. - - Tue Jan 5 23:22:24 UTC 2010 Jeff Parsons - - * TAO_IDL/be/be_connector.cpp: - * TAO_IDL/be/be_template_module_inst.cpp: - * TAO_IDL/be/be_template_module_ref.cpp: - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: - * TAO_IDL/be/be_template_module.cpp: - * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: - - Uncommented code in accept() methods, started - implementation of instantiated template module - traversal in be_visitor_ccm_pre_proc, and - cosmetic changes. - - Tue Jan 5 19:33:27 UTC 2010 Jeff Parsons - - * TAO_IDL/ast/ast_template_module.cpp: - * TAO_IDL/ast/ast_template_module_ref.cpp: - * TAO_IDL/ast_template_module_inst.cpp: - Uncommented code in ast_accept() methods. - -Thu Jan 14 04:03:17 UTC 2010 Abdul Sowayan - - * tests/Bug_3766_Regression/client.cpp: - - Removed: - - "CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA");" - - This is a client, it doesn't link the PortableServer library - and does not use the RootPOA in the program. - - Trying to resolve the RootPOA is believed to cause the test to fail - on the iPhone Simulator build. - -Wed Jan 13 10:47:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: - * TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h: - Bool changes - -Wed Jan 13 10:24:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: - Const change - - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: - Create AMI_ sendc interface nodes - -Wed Jan 13 08:51:19 UTC 2010 Johnny Willemsen - - * tao/AnyTypeCode/NVList.cpp: - Const changes, layout changes, only one exit point in a method - - * tao/AnyTypeCode/NVList_Adapter_Impl.cpp: - * tao/AnyTypeCode/NVList_Adapter_Impl.h: - Layout change - - * tao/debug.cpp: - Explicitly initialise TAO_orb_debug to 0 - - * tao/debug.h: - Layout changes - - * tao/Messaging/ExceptionHolder.pidl: - Layout changes - - * tao/Messaging/ExceptionHolder_i.cpp: - Bool and layout changes - - * tao/ORB_Core.cpp: - Layout changes - -Wed Jan 13 08:30:19 UTC 2010 Johnny Willemsen - - * orbsvcs/examples/RtEC/Simple/run_test.pl: - Fixed fuzz error - -Tue Jan 12 20:12:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: - * TAO_IDL/be_include/be_visitor_ami_pre_proc.h: - No need to pass the exceptionholder through all methods, there is only - one - - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: - * TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h: - Started generating the AMI_ sendc interface - -Tue Jan 12 19:31:19 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: - Bool changes - - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: - * TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h: - More tweaks to ami4ccm code generation - -Tue Jan 12 19:08:39 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: - * TAO_IDL/be_include/be_visitor_ami_pre_proc.h: - No seperate method needed for creating the exceptionholder - -Tue Jan 12 14:12:39 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: - Commented out some code not needed for ami4ccm, but needed for - ami - -Tue Jan 12 08:34:39 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: - * TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h: - Extended AMI4CCM code generation - -Fri Jan 8 11:42:39 UTC 2010 Johnny Willemsen - - * TAO_IDL/ast/ast_interface.cpp: - layout change - - * TAO_IDL/be/be_global.cpp: - CCM_AMI::ReplyHandler is a local interface - - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: - * TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h: - Enable most code in this file in order to implement this ami4ccm - implied node generation - - * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: - Don't crash when create_inheritance_list returns 0, but log an error - -Fri Jan 8 11:18:39 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_global.cpp: - * TAO_IDL/be_include/be_global.h: - Added CCM_AMI::ReplyHandler base interface - -Fri Jan 8 10:56:39 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_global.cpp: - * TAO_IDL/be_include/be_global.h: - Added members for CCM_AMI module and its ExceptionHolder - -Fri Jan 8 10:12:39 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_uses.cpp: - * TAO_IDL/be_include/be_uses.h: - Added original_uses member - - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: - Prevent recursion using the new original_uses member - -Thu Jan 7 18:56:39 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_array.cpp - * TAO_IDL/be/be_interface.cpp - * TAO_IDL/be/be_operation_strategy.cpp - * TAO_IDL/be/be_visitor_interface/amh_ss.cpp - * TAO_IDL/be/be_visitor_interface/interface.cpp - * TAO_IDL/be/be_visitor_interface/interface_is.cpp - Initialise pointers with 0, small layout changes - -Thu Jan 7 18:45:39 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp: - Added some more code for implicit sendc_ ports - - * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: - Fixed typos - - * TAO_IDL/be_include/be_interface_strategy.h: - Layout changes - -Thu Jan 7 11:04:58 UTC 2010 Martin Corino - - * tests/OBV/Supports/Supports_Test.mpc: - Reinstated dummy_label dependency. - - * bin/tao_orb_tests.lst: - Disabled the OBV/Supports test again since there Solaris compilers - as well as CB2010 do not grok the TAO code for valuetype 'supports' - constructs and there is currently no budget to fix this. - This will need to be resolved at some time by either compiler fixes - or a redesign of the TAO valuetype framework. - -Thu Jan 7 10:44:39 UTC 2010 Johnny Willemsen - - * TAO_IDL/ast/ast_component.cpp - * TAO_IDL/be/be_codegen.cpp - * TAO_IDL/be/be_global.cpp - * TAO_IDL/be/be_produce.cpp - * TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp - * TAO_IDL/be/be_visitor_arg_traits.cpp - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp - * TAO_IDL/be_include/be_global.h - * TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h - * TAO_IDL/include/ast_component.h - Committing the initial files for the ami4ccm visitors - which should create all implied nodes for ami4ccm. - This can be enabled using the new -GM option. - -Mon Jan 4 14:25:39 UTC 2010 Johnny Willemsen - - * TAO_IDL/be/be_visitor_argument/argument.cpp - * TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp - * TAO_IDL/be/be_visitor_array/array.cpp - * TAO_IDL/be/be_visitor_component/component_cs.cpp - * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp - * TAO_IDL/be/be_visitor_field/field_ch.cpp - * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp - * TAO_IDL/be/be_visitor_interface/interface_cs.cpp - * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp - * TAO_IDL/be/be_visitor_operation/ami_cs.cpp - * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp - * TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp - * TAO_IDL/be/be_visitor_operation/rettype.cpp - * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp - * TAO_IDL/be/be_visitor_sequence/sequence_base.cpp - * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp - * TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp - * TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp - * TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp - * TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp - * TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp - * TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp - * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp - * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp - * TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp - * TAO_IDL/be/be_visitor_union/discriminant_ch.cpp - * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp - * TAO_IDL/be/be_visitor_union/discriminant_cs.cpp - * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp - * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp - * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp - * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp - * TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp - * TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp - * TAO_IDL/be/be_visitor_valuebox/field_ch.cpp - * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp - * TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp - * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp - * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp - * TAO_IDL/be/be_visitor_valuetype/field_ci.cpp - * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp - Initialise pointer with 0 - -Thu Dec 31 13:20:32 UTC 2009 Vladimir Zykov - - * tests/Bug_1330_Regression/run_test.pl: - Added missing assignment for $TARGETHOSTNAME. - -Tue Dec 29 16:37:54 UTC 2009 Vladimir Zykov - - * orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp: - Fixed a small memory leak. - - * tests/RTCORBA/Banded_Connections/run_test.pl: - Fixed a typo in IOR name. - -Tue Dec 29 09:23:00 UTC 2009 Johnny Willemsen - - * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h: - Fix for CB2010 - -Tue Dec 29 09:12:00 UTC 2009 Johnny Willemsen - - * TAO_IDL/Makefile.am: - Updated for all changes related to IDL3+ - -Tue Dec 29 04:07:06 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_union.cpp: - * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp: - * TAO_IDL/be/be_valuetype.cpp: - * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_structure.cpp: - * TAO_IDL/be/be_type.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp: - * TAO_IDL/be/be_typedef.cpp: - * TAO_IDL/be/be_structure.cpp: - * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp: - * TAO_IDL/be/be_field.cpp: - * TAO_IDL/be/be_predefined_type.cpp: - * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp: - * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp: - * TAO_IDL/be/be_produce.cpp: - * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp: - * TAO_IDL/be/be_sequence.cpp: - * TAO_IDL/be/be_interface.cpp: - * TAO_IDL/be/be_enum.cpp: - * TAO_IDL/be/be_string.cpp: - * TAO_IDL/be/be_array.cpp: - * TAO_IDL/be_include/be_field.h: - * TAO_IDL/be_include/be_interface.h: - * TAO_IDL/be_include/be_enum.h: - * TAO_IDL/be_include/be_type.h: - * TAO_IDL/be_include/be_union.h: - * TAO_IDL/be_include/be_predefined_type.h: - * TAO_IDL/be_include/be_string.h: - * TAO_IDL/be_include/be_array.h: - * TAO_IDL/be_include/be_typedef.h: - * TAO_IDL/be_include/be_structure.h: - * TAO_IDL/be_include/be_valuetype.h: - * TAO_IDL/be_include/be_sequence.h: - - Fixed inconsistencies in the generation of ostream operators - for array types, both as top-level declarations and as - members. - -Thu Dec 24 16:58:36 UTC 2009 Phil Mesnier - - * bin/tao_other_tests.lst: - Skip the new LB tests on singlethreaded builds. - -Thu Dec 24 13:15:42 UTC 2009 Jeff Parsons - - * TAO_IDL/be_include/be_template_module_ref.h: - * TAO_IDL/be/be_template_module_ref.cpp: - - Fixed cut-and-paste error in virtual method name. - -Thu Dec 24 10:20:00 UTC 2009 Johnny Willemsen - - * orbsvcs/orbsvcs/Trader/Trader.h: - * tao/Incoming_Message_Stack.h: - Fixes for C++ Builder 2010 Update 4/5 - - * tao/Synch_Invocation.cpp: - Updated some very old comments - -Wed Dec 23 19:14:42 UTC 2009 Johnny Willemsen - - * orbsvcs/tests/Bug_2248_Regression/client.cpp: - Fixed QNX compile problem - -Wed Dec 23 19:07:38 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: - - In implied IDL generation for AMI, added a copy of - exception list to AMI-releated operation nodes corresponding - to attributes the same as they already are for other - operation nodes. Thanks to Johnny Willemsen - for reporting the problem and creating a regression test. - -Wed Dec 23 18:48:31 UTC 2009 Yan Dai - - * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: - - Made bool changes according to ACE-guidelines.html. - -Wed Dec 23 15:47:02 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.cpp: - - Reverted a change to the 'state_member' production rule that - was causing the public/private qualifier to be lost in - valuetypes and eventtypes. - - * TAO_IDL/include/ast_field.h: - - Removed extra spaces. - -Wed Dec 23 11:56:42 UTC 2009 Vladimir Zykov - - * tests/CodeSets/simple/client.cpp: - * tests/CodeSets/simple/server.cpp: - * tests/CodeSets/simple/run_test.pl: - * tests/Bug_3766_Regression/client.cpp: - * tests/Bug_3766_Regression/server.cpp: - * tests/Bug_3766_Regression/run_test.pl: - Changed the tests so they accept IORs from command line. - - * tests/Bug_3790_Regression/server2.cpp: - Fixed compile error on wchar builds. - - * bin/tao_orb_tests.lst: - Disabled a test for bug#3542 on static builds. - -Wed Dec 23 09:31:42 UTC 2009 Johnny Willemsen - - * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp: - Small code layout improvement - -Wed Dec 23 09:13:42 UTC 2009 Johnny Willemsen - - * tests/Bug_3801_Regression: - New test to reproduce problem with AMI and attributes - - * bin/tao_orb_tests.lst: - Added 3801 - - * bin/tao_other_tests.lst: - Removed WinCE - - * tao/Messaging/ExceptionHolder_i.cpp: - bool changes - -` * tao/Object.cpp: - bool changes, check all return values - - * tao/Valuetype/ValueBase.cpp: - bool changes, fixed a lot of debug messages that had a totally - wrong layout - -Tue Dec 22 17:19:42 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/attribute.idl: - A readonly attribute should just use raises, on a rw attribute - first getraises and after that setraises has to be specified, - not other way around - -Tue Dec 22 15:59:42 UTC 2009 Johnny Willemsen - - * tests/IDL_Test/attribute.idl: - * tests/IDL_Test/IDL_Test.mpc: - Added test file for attributes - -Tue Dec 22 17:06:08 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/fe_utils.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.h: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/include/fe_utils.h: - * TAO_IDL/include/utl_err.h: - - - Fixed bug in grammar that did not allow a template module - to be declared inside a regular module. - - - Removed unused data types from FE_Utils and from the big - parser union. - -Mon Dec 21 20:11:42 UTC 2009 Jeff Parsons - - * TAO_IDL/ast/ast_operation.cpp(fe_add_exception): - - In adding support for template param holders in a raises clause, - inadvertently exluded the use case for Messaging::UserExceptionBase, - which is native. This fix restores the handling of that use case. - -Mon Dec 21 15:13:57 UTC 2009 Denis Budko - - * orbsvcs/tests/EC_Mcast/run_test.pl: - * performance-tests/Throughput/run_test.pl: - * tests/AMI_Buffering/run_timeout.pl: - * tests/AMI_Buffering/run_message_count.pl: - * tests/AMI_Buffering/run_buffer_size.pl: - * tests/AMI_Buffering/run_timeout_reactive.pl: - * tests/AMI_Buffering/run_test.pl: - * tests/CodeSets/simple/run_test.pl: - * tests/Oneway_Buffering/run_timeout.pl: - * tests/Oneway_Buffering/run_message_count.pl: - * tests/Oneway_Buffering/run_buffer_size.pl: - * tests/Oneway_Buffering/run_timeout_reactive.pl: - * tests/Oneway_Buffering/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Mon Dec 21 13:09:35 UTC 2009 Denis Budko - - * DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp: - * tests/Oneway_Send_Timeouts/run_test.pl: - * tests/Optimized_Connection/run_test.pl: - * examples/Simple/time-date/svc.conf: - * examples/Simple/time-date/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Mon Dec 21 12:39:29 UTC 2009 Vladimir Zykov - - * bin/tao_orb_tests.lst: - * tao/ORB_Core.cpp: - Fixed bug#3790 and marked corresponding test as fixed in lst. - Now when object is reinitialized and it's not collocated then - it's explicitly marked as remote one. - -Sun Dec 20 15:57:15 UTC 2009 Abdul Sowayan - - * TAO_IDL/be/be_template_module_ref.cpp: - Removed a stray charachter that was causing a compile time error. - -Sat Dec 19 06:59:00 UTC 2009 Johnny Willemsen - - * TAO_IDL/be/be_interface.cpp - * TAO_IDL/be_include/be_interface.h - Merged changes back in that I reverted by accident - -Fri Dec 18 18:58:00 UTC 2009 Johnny Willemsen - - Merged changes for templated modules in the TAO_IDL front end to svn head - - Thu Dec 17 20:35:28 UTC 2009 Jeff Parsons - - * orbsvcs/IFR_Service/ifr_adding_visitor.h: - * orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp: - * orbsvcs/IFR_Service/ifr_adding_visitor.cpp: - - Changes to TAO IFR loader required by changes to TAO_IDL - front end in - - Wed Dec 16 20:20:13 UTC 2009 Jeff Parsons - - Wed Dec 16 20:20:13 UTC 2009 Jeff Parsons - - * TAO_IDL/include/ast_generator.h: - * TAO_IDL/include/ast_valuetype.h: - * TAO_IDL/include/ast_eventtype.h: - * TAO_IDL/include/ast_home.h: - * TAO_IDL/include/ast_interface.h: - * TAO_IDL/include/ast_component.h: - * TAO_IDL/be/be_visitor_typecode/value_typecode.cpp: - * TAO_IDL/be/be_valuetype.cpp: - * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp: - * TAO_IDL/be/be_visitor_interface/interface_sh.cpp: - * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp: - * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: - * TAO_IDL/be/be_home.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp: - * TAO_IDL/be/be_component.cpp: - * TAO_IDL/be/be_visitor_amh_pre_proc.cpp: - * TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp: - * TAO_IDL/be/be_visitor_component/component_sh.cpp: - * TAO_IDL/be/be_eventtype.cpp: - * TAO_IDL/be/be_interface.cpp: - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: - * TAO_IDL/be/be_generator.cpp: - * TAO_IDL/ast/ast_home.cpp: - * TAO_IDL/ast/ast_interface.cpp: - * TAO_IDL/ast/ast_component.cpp: - * TAO_IDL/ast/ast_generator.cpp: - * TAO_IDL/ast/ast_valuetype.cpp: - * TAO_IDL/ast/ast_eventtype.cpp: - * TAO_IDL/be_include/be_interface.h: - * TAO_IDL/be_include/be_component.h: - * TAO_IDL/be_include/be_eventtype.h: - * TAO_IDL/be_include/be_home.h: - * TAO_IDL/be_include/be_generator.h: - * TAO_IDL/be_include/be_valuetype.h: - * TAO_IDL/be_include/be_visitor_ami_pre_proc.h: - * TAO_IDL/fe/fe_obv_header.cpp: - * TAO_IDL/fe/fe_home_header.cpp: - * TAO_IDL/fe/fe_interface_header.cpp: - * TAO_IDL/fe/fe_component_header.cpp: - * TAO_IDL/narrow/narrow.cpp: - * TAO_IDL/util/utl_scope.cpp: - - Changes to support template parameters as base - interfaces/valuetypes, supported interfaces, - primary keys, and members of a throw spec list. - Several internal container types were widened to AST_Type - from whatever they were originally, to enable - them to also contain AST_Param_Holder. This - change precipitated many small mods, to the - backend as well as the frontend. - - Tue Dec 15 20:34:51 UTC 2009 Jeff Parsons - - * TAO_IDL/include/utl_exceptlist.h: - * TAO_IDL/include/fe_home_header.h: - * TAO_IDL/include/fe_interface_header.h: - * TAO_IDL/include/fe_obv_header.h: - * TAO_IDL/include/ast_interface.h: - * TAO_IDL/include/fe_component_header.h: - * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp: - * TAO_IDL/be/be_field.cpp: - * TAO_IDL/ast/ast_operation.cpp: - * TAO_IDL/fe/fe_obv_header.cpp: - * TAO_IDL/fe/fe_home_header.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/fe_interface_header.cpp: - * TAO_IDL/fe/fe_component_header.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/util/utl_exceptlist.cpp: - * TAO_IDL/util/utl_scope.cpp: - - - Added support for template parameters in an - operation throw spec. - - - Began support for template parameters as - base interfaces/valuetypes and supported interfaces. - - Mon Dec 14 20:26:51 UTC 2009 Jeff Parsons - - * TAO_IDL/include/ast_template_common.h: - * TAO_IDL/include/fe_template_interface_header.h: - * TAO_IDL/include/fe_template_header_common.h: - * TAO_IDL/include/fe_instantiated_interface_header.h: - * TAO_IDL/include/ast_template_interface.h: - * TAO_IDL/be/be_template_interface.cpp: - * TAO_IDL/be/be_visitor_iface_inst.cpp: - * TAO_IDL/ast/ast_template_common.cpp: - * TAO_IDL/ast/ast_template_interface.cpp: - * TAO_IDL/be_include/be_template_interface.h: - * TAO_IDL/be_include/be_visitor_iface_inst.h: - * TAO_IDL/fe/fe_template_header_common.cpp: - * TAO_IDL/fe/fe_template_interface_header.cpp: - * TAO_IDL/fe/fe_instantiated_interface_header.cpp: - - Removed these files, they were part of the support - for the original version of IDL3+, before the - revisions. - - * TAO_IDL/fe/y.tab.h: - * TAO_IDL/fe/lex.yy.cpp: - * TAO_IDL/include/ast_generator.h: - * TAO_IDL/be/be_visitor_interface.cpp: - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: - * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: - * TAO_IDL/fe/idl.ll: - - Changes mandated by the removal of the above - files. - - Mon Dec 14 19:21:39 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.cpp: - - Restored semantic action to create a non-template porttype, - removed at the beginning of revised IDL3+ template support - work. - - Mon Dec 14 18:16:17 UTC 2009 Jeff Parsons - - * TAO_IDL/ast/ast_expression.cpp: - * TAO_IDL/ast/ast_array.cpp: - - Completed support for template parameters as array bounds. - - Fri Dec 11 19:17:52 UTC 2009 Jeff Parsons - - * TAO_IDL/ast/ast_sequence.cpp: - * TAO_IDL/ast/ast_array.cpp: - * TAO_IDL/ast/ast_field.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - - More error checking when using template parameter for - sequence element type. - - - Start on support for template parameter as array - bound, not yet complete. - - Fri Dec 4 19:23:17 UTC 2009 Jeff Parsons - - * TAO_IDL/include/ast_generator.h: - * TAO_IDL/include/ast_param_holder.h: - * TAO_IDL/include/ast_expression.h: - * TAO_IDL/be/be_param_holder.cpp: - * TAO_IDL/be/be_generator.cpp: - * TAO_IDL/ast/ast_expression.cpp: - * TAO_IDL/ast/ast_sequence.cpp: - * TAO_IDL/ast/ast_generator.cpp: - * TAO_IDL/ast/ast_param_holder.cpp: - * TAO_IDL/be_include/be_param_holder.h: - * TAO_IDL/be_include/be_generator.h: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/fe_declarator.cpp: - * TAO_IDL/util/utl_err.cpp: - * TAO_IDL/util/utl_scope.cpp: - - Support for template parameter as sequence - bound, and additional error checking for - template parameter as const type, sequence - type and sequence bound. - - Thu Dec 3 20:39:05 UTC 2009 Jeff Parsons - - * TAO_IDL/include/ast_expression.h: - * TAO_IDL/ast/ast_expression.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Added check to see if an expression has been created as the - rhs of a constant declaration that is a reference to a - template module parameter. If so, we can skip the coercion - and some of the evaluation until instantiation time. - - Thu Dec 3 19:15:15 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.cpp: - - * TAO_IDL/include/fe_utils.h: - - Thu Dec 3 18:52:22 UTC 2009 Jeff Parsons - - * TAO_IDL/ast/ast_field.cpp: - - Added check for AST_Param_Holder as field type, and - made this type (along with sequence and array) one - whose lifetime is tied to the field node. - - * TAO_IDL/util/utl_global.cpp: - - Added initialization in the constuctor for the new - member that stores a template param list. - - Wed Dec 2 21:21:24 UTC 2009 Jeff Parsons - - * TAO_IDL/include/ast_generator.h: - * TAO_IDL/include/ast_param_holder.h: - * TAO_IDL/include/fe_utils.h: - * TAO_IDL/include/idl_global.h: - * TAO_IDL/include/fe_interface_header.h: - * TAO_IDL/include/utl_scope.h: - * TAO_IDL/include/ast_consumes.h: - * TAO_IDL/include/ast_publishes.h: - * TAO_IDL/include/ast_operation.h: - * TAO_IDL/include/ast_emits.h: - * TAO_IDL/be/be_param_holder.cpp: - * TAO_IDL/be/be_publishes.cpp: - * TAO_IDL/be/be_decl.cpp: - * TAO_IDL/be/be_consumes.cpp: - * TAO_IDL/be/be_emits.cpp: - * TAO_IDL/be/be_generator.cpp: - * TAO_IDL/ast/ast_consumes.cpp: - * TAO_IDL/ast/ast_publishes.cpp: - * TAO_IDL/ast/ast_expression.cpp: - * TAO_IDL/ast/ast_interface.cpp: - * TAO_IDL/ast/ast_template_module.cpp: - * TAO_IDL/ast/ast_emits.cpp: - * TAO_IDL/ast/ast_template_common.cpp: - * TAO_IDL/ast/ast_module.cpp: - * TAO_IDL/ast/ast_generator.cpp: - * TAO_IDL/ast/ast_union.cpp: - * TAO_IDL/ast/ast_param_holder.cpp: - * TAO_IDL/ast/ast_exception.cpp: - * TAO_IDL/ast/ast_structure.cpp: - * TAO_IDL/ast/ast_attribute.cpp: - * TAO_IDL/ast/ast_valuetype.cpp: - * TAO_IDL/ast/ast_argument.cpp: - * TAO_IDL/be_include/be_publishes.h: - * TAO_IDL/be_include/be_param_holder.h: - * TAO_IDL/be_include/be_emits.h: - * TAO_IDL/be_include/be_generator.h: - * TAO_IDL/be_include/be_consumes.h: - * TAO_IDL/fe/fe_utils.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/fe_template_interface_header.cpp: - * TAO_IDL/fe/fe_interface_header.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/util/utl_global.cpp: - * TAO_IDL/util/utl_scope.cpp: - - - Added code to UTL_Scope::lookup_by_name() that can - match an input to a template parameter, if any, of the - enclosing scope. - - - Changed constructor and IDL compiler factory function - signatures for publishes, emits and consumes nodes to - take AST_Type rather than AST_EventType, allowing a - template parameter placeholder to be accepted if that - particular IDL construct is parameterized. - - - Removed #include of ast_typedef.h from utl_scope.h and - added it to the necessary .cpp files. - - - Added check for duplicate names in a formal template - parameter list. - - Tue Dec 1 18:00:15 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.cpp: - - Fixed typo and regenerated/recompiled. - - Tue Dec 1 17:39:09 UTC 2009 Jeff Parsons - - * TAO_IDL/include/ast_template_module.h: - * TAO_IDL/include/utl_scope.h: - * TAO_IDL/ast/ast_template_module.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/util/utl_scope.cpp: - - - Finished matching/error checking code for template - parameter references - - Finished semantic actions for template module aliases - and the associated template parameter references - - Factored ACE_NEW_RETURN macro out of both paths of an - IF block in several production rules dealing with - comma-separated lists - - Tue Dec 1 14:46:26 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/y.tab.cpp: - - Regenrerated and recompiled. - - Mon Nov 30 23:14:05 UTC 2009 Jeff Parsons - - * TAO_IDL/include/idl_global.h: - * TAO_IDL/include/ast_template_module.h: - * TAO_IDL/ast/ast_template_module.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/util/utl_err.cpp: - - Added parse state flags & associated error messages - for aliased modules. Also added error-checking code - for aliases to AST_Template_Module, and some semantic - action code for aliased modules. - - Mon Nov 30 21:46:22 UTC 2009 Jeff Parsons - - * TAO_IDL/include/ast_module.h: - * TAO_IDL/include/utl_scope.h: - * TAO_IDL/include/utl_err.h: - * TAO_IDL/ast/ast_expression.cpp: - * TAO_IDL/ast/ast_template_module.cpp: - * TAO_IDL/ast/ast_template_common.cpp: - * TAO_IDL/ast/ast_module.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/util/utl_err.cpp: - * TAO_IDL/util/utl_scope.cpp: - - Finished semantic actions and added diagnostics - for template module instantiations. - - Mon Nov 30 20:11:27 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.cpp: - - Fixed typo and regenerated. - - Mon Nov 30 20:04:13 UTC 2009 Jeff Parsons - - * TAO_IDL/includ/idl_global.h: - * TAO_IDL/util/utl_err.cpp: - - Added new parse states for instantiated template modules, - with corresponding error messages. - - * TAO_IDL/include/ast_template_module.h: - * TAO_IDL/ast/ast_template_module.cpp: - - Added methods to check the arglist of an instantiated - template modules against the formal parameters. - - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Added semantic actions for creation of instantiated - template module. - - Mon Nov 30 17:30:44 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.cpp: - - Added overlooked case IDL_ENUM to - and regenerated. - - Mon Nov 30 16:56:21 UTC 2009 Jeff Parsons - - * TAO_IDL/include/idl_global.h: - * TAO_IDL/util/utl_global.cpp: - - Removed check for illegal const type added in - - Fri Nov 27 23:13:05 UTC 2009 Jeff Parsons - - since it turned out to be unnecessary, the check is made elswhere. - - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Added semantic action for single template arg. - - Fri Nov 27 23:13:05 UTC 2009 Jeff Parsons - - * TAO_IDL/include/idl_global.h: - * TAO_IDL/include/utl_list.h: - * TAO_IDL/include/utl_idlist.h: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/util/utl_exprlist.cpp: - * TAO_IDL/util/utl_list.cpp: - * TAO_IDL/util/utl_exceptlist.cpp: - * TAO_IDL/util/utl_idlist.cpp: - * TAO_IDL/util/utl_global.cpp: - - - Cosmetic changes to list classes - - Check for illegal const type in expression with scoped name - - Minor modifications of production rule code - - Fri Nov 27 19:03:58 UTC 2009 Jeff Parsons - - * TAO_IDL/ast/ast_constant.cpp: - * TAO_IDL/ast/ast_expression.cpp: - - Cosmetic changes. - - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.h: - * TAO_IDL/fe/y.tab.cpp: - - Added semantic actions for template argument list. - - Fri Nov 27 16:53:09 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/fe_template_interface_header.cpp: - - Minor change to avoid compilation error. This file will - eventually be removed once some of its code has been - relocated. - - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Cleaned up semantic action for and tested - lookup and narrowing of template module referenced in a - template module instantiation. - - Wed Nov 25 20:19:10 UTC 2009 Jeff Parsons - - * TAO_IDL/include/utl_err.h: - * TAO_IDL/util/utl_err.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Start of semantic actions for instantiated template modules, - and related error messages. - - Wed Nov 25 18:52:19 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.cpp: - - Fixed typos and some discrepancies between idl.yy and a - hand-crafted y.tab.cpp, and regenerated. - - Wed Nov 25 17:58:50 UTC 2009 Jeff Parsons - - * TAO_IDL/include/fe_utils.h: - * TAO_IDL/fe/fe_utils.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Added support for the 'const' formal template parameter type. - - Wed Nov 25 01:35:38 UTC 2009 Jeff Parsons - - * TAO_IDL/include/idl_global.h: - * TAO_IDL/util/utl_global.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Fixed bugs in 'sequence' template param checking. - - Tue Nov 24 21:20:55 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.cpp: - - Regenerated parsing code and recompiled. - - Tue Nov 24 20:54:20 UTC 2009 Jeff Parsons - - * TAO_IDL/include/idl_global.h: - * TAO_IDL/include/utl_err.h: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/util/utl_err.cpp: - * TAO_IDL/util/utl_global.cpp: - - - Added check for mismatched 'sequence' template param - - Updated parse state values - - Updated semantic action that creates a fixed module - - Added semantic action to create a template module - - Tue Nov 24 18:32:54 UTC 2009 Jeff Parsons - - * TAO_IDL/ast/ast_param_holder.cpp: - * TAO_IDL/ast/ast_template_module.cpp: - * TAO_IDL/ast/ast_template_module_inst.cpp: - * TAO_IDL/ast/ast_template_module_ref.cpp: - * TAO_IDL/be/be_visitor.cpp: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/include/ast_param_holder.h: - * TAO_IDL/include/ast_template_module.h: - * TAO_IDL/include/ast_template_module_inst.h: - * TAO_IDL/include/ast_template_module_ref.h: - * TAO_IDL/include/idl_global.h: - * TAO_IDL/util/utl_global.cpp: - - Fixed compile warnings and added semantic actions for - formal template parameters. - - Mon Nov 23 20:37:29 UTC 2009 Jeff Parsons - - * TAO_IDL/include/ast_template_module_ref.h: - * TAO_IDL/ast/ast_template_module_ref.cpp: - * TAO_IDL/be_include/be_template_module_ref.h: - * TAO_IDL/be/be_template_module_ref.cpp: - - New files, containing the AST node type - representing a reference to an IDL template - module denoted by the IDL keyword 'alias'. - - * TAO_IDL/include/ast_visitor.h: - * TAO_IDL/be/be_template_interface.cpp: - * TAO_IDL/be/be_typedef.cpp: - * TAO_IDL/be/be_visitor.cpp: - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: - * TAO_IDL/ast/ast_template_interface.cpp: - * TAO_IDL/be_include/be_visitor.h: - * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: - - - Removed methods and code blocks referencing - AST node types that have been removed. - - - Updated visit_* methods to frontend and backend - visitor classes. - - - Updated create_* methods in generator classes. - - * orbsvcs/IFR_Service/ifr_visitor.h: - * orbsvcs/IFR_Service/ifr_visitor.cpp: - - Update visit_* methods in base class visitor so - backend IFR loader library will comple. New visit_* - methods are not yet implemented. - - Fri Nov 20 20:22:23 UTC 2009 Jeff Parsons - - * TAO_IDL/include/ast_module.h: - * TAO_IDL/include/ast_connector.h: - * TAO_IDL/ast/ast_connector.cpp: - * TAO_IDL/ast/ast_module.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Removed more operations and includes that were caught - by a build from scratch. - - Fri Nov 20 20:09:59 UTC 2009 Jeff Parsons - - * TAO_IDL/include/ast_instantiated_connector.h: - * TAO_IDL/include/ast_tmpl_port.h: - * TAO_IDL/include/ast_tmpl_mirror_port.h: - * TAO_IDL/ast/ast_instantiated_connector.cpp: - * TAO_IDL/ast/ast_tmpl_mirror_port.cpp: - * TAO_IDL/ast/ast_tmpl_port.cpp: - * TAO_IDL/be_include/be_tmpl_port.h: - * TAO_IDL/be_include/be_instantiated_connector.h: - * TAO_IDL/be_include/be_tmpl_mirror_port.h: - * TAO_IDL/be/be_tmpl_mirror_port.cpp: - * TAO_IDL/be/be_tmpl_port.cpp: - * TAO_IDL/be/be_instantiated_connector.cpp: - - Removed these files, the AST node types they contain - are not relevant to the updated IDL3+ spec. - - * TAO_IDL/include/ast_template_module_inst.h: - * TAO_IDL/ast/ast_template_module_inst.cpp: - * TAO_IDL/be/be_template_module_inst.cpp: - * TAO_IDL/be_include/be_template_module_inst.h: - - New files, containing the AST node type corresponding - to an IDL template module declaration. - - * TAO_IDL/include/ast_generator.h: - * TAO_IDL/include/fe_utils.h: - * TAO_IDL/include/ast_mirror_port.h: - * TAO_IDL/include/ast_provides.h: - * TAO_IDL/include/ast_template_module.h: - * TAO_IDL/include/ast_extended_port.h: - * TAO_IDL/include/ast_uses.h: - * TAO_IDL/include/ast_porttype.h: - * TAO_IDL/include/ast_consumes.h: - * TAO_IDL/include/ast_publishes.h: - * TAO_IDL/include/ast_emits.h: - * TAO_IDL/be/be_mirror_port.cpp: - * TAO_IDL/be/be_extended_port.cpp: - * TAO_IDL/be/be_generator.cpp: - * TAO_IDL/be/be_porttype.cpp: - * TAO_IDL/ast/ast_template_module.cpp: - * TAO_IDL/ast/ast_generator.cpp: - * TAO_IDL/ast/ast_extended_port.cpp: - * TAO_IDL/ast/ast_mirror_port.cpp: - * TAO_IDL/ast/ast_porttype.cpp: - * TAO_IDL/be_include/be_generator.h: - * TAO_IDL/be_include/be_porttype.h: - * TAO_IDL/be_include/be_extended_port.h: - * TAO_IDL/be_include/be_mirror_port.h: - * TAO_IDL/fe/fe_utils.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Removed operations, args and blocks of code that are - not relelvant to the updated IDL3+ spec. - - Thu Nov 19 20:47:43 UTC 2009 Jeff Parsons - - * TAO_IDL/include/ast_param_holder.h: - * TAO_IDL/include/ast_template_module.h: - * TAO_IDL/be/be_param_holder.cpp: - * TAO_IDL/be/be_template_module.cpp: - * TAO_IDL/ast/ast_template_module.cpp: - * TAO_IDL/ast/ast_param_holder.cpp: - * TAO_IDL/be_include/be_template_module.h: - * TAO_IDL/be_include/be_param_holder.h: - - New files, containing new AST node types - corresponding to updates in the IDL3+ grammar. - - * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: - * TAO_IDL/include/ast_generator.h: - * TAO_IDL/include/ast_decl.h: - * TAO_IDL/include/ast_connector.h: - * TAO_IDL/be/be_enum_val.cpp: - * TAO_IDL/be/be_template_interface.cpp: - * TAO_IDL/be/be_connector.cpp: - * TAO_IDL/be/be_generator.cpp: - * TAO_IDL/ast/ast_connector.cpp: - * TAO_IDL/ast/ast_template_common.cpp: - * TAO_IDL/ast/ast_generator.cpp: - * TAO_IDL/ast/ast_decl.cpp: - * TAO_IDL/be_include/be_connector.h: - * TAO_IDL/be_include/be_generator.h: - - Cosmetic changes. - - * TAO_IDL/be_include/be_typedef.h: - * TAO_IDL/include/ast_typedef.h: - * TAO_IDL/ast/ast_typedef.cpp: - * TAO_IDL/be/be_typedef.cpp: - * TAO_IDL/ast/ast_field.cpp: - * TAO_IDL/include/ast_field.h: - - Made typedef nodes subclasses of field - nodes, similar to argument, attribute, - port, etc. so the case when these nodes - refer to IDL template parameters can be - handled in a consistent manner. - - Thu Nov 19 14:43:01 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.cpp: - - Fixed typos in generated file. - - Thu Nov 19 14:23:09 UTC 2009 Jeff Parsons - - * TAO_IDL/ast/ast_expression.cpp: - - Cosmetic changes. - - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.cpp: - - Finished first cut of production rules for revised IDL3+ grammar. - - Mon Nov 16 20:22:50 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/y.tab.cpp: - - Started adding new production rules for template modules. - - Mon Nov 16 15:28:01 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/idl.ll: - * TAO_IDL/fe/idl.yy: - * TAO_IDL/fe/lex.yy.cpp: - * TAO_IDL/fe/lex.yy.cpp.diff: - * TAO_IDL/fe/y.tab.h: - * TAO_IDL/fe/y.tab.cpp: - - Removed '$' as keyword and added keyword 'alias'. Regenerated flex and - bison files. - -Fri Dec 18 14:02:52 UTC 2009 Denis Budko - - * tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl: - - Added started argument for server. - -Fri Dec 18 13:44:00 UTC 2009 Martin Corino - - * NEWS: - Updated with fixed bugzilla entries. - -Fri Dec 18 09:23:37 UTC 2009 Vladimir Zykov - - * tests/Bug_3790_Regression/server2.cpp: - Simplified the test. - -Thu Dec 17 13:12:00 UTC 2009 Martin Corino - - * tao/Leader_Follower.h: - * tao/Leader_Follower.inl: - Added method set_new_leader_generator(). - This resolves Bugzilla #3772. - -Thu Dec 17 13:03:32 UTC 2009 Denis Budko - - * interop-tests/wchar/run_test.pl: - - Test is converted to use new test framework - and added to fuzz build. - -Thu Dec 17 12:42:58 UTC 2009 Johnny Willemsen - - * tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl: - Fix fuzz - -Thu Dec 17 11:45:30 UTC 2009 Denis Budko - - * orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl: - * tests/Bug_3479_Regression/run_test.pl: - * tests/TransportCurrent/IIOP/run_test.pl: - * tests/TransportCurrent/Framework/run_test.pl: - * tests/Client_Leaks/run_test.pl: - * tests/ZIOP/run_test.pl: - * tests/RTCORBA/Bug_3382_Regression/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Thu Dec 17 10:22:00 UTC 2009 Martin Corino - - * tao/GIOP_Message_Base.cpp: - Fixed missing request id in logging of LocateRequest/LocateReply & - CancelRequest. - This fixed Bugzilla #2898. - -Thu Dec 17 09:52:52 UTC 2009 Vladimir Zykov - - * tests/Bug_3790_Regression/simple_test.idl: - * tests/Bug_3790_Regression/simple_test_i.cpp: - * tests/Bug_3790_Regression/simple_test_i.h: - * tests/Bug_3790_Regression/server.cpp: - * tests/Bug_3790_Regression/server2.cpp: - * tests/Bug_3790_Regression/run_test.pl: - * tests/Bug_3790_Regression/README: - * tests/Bug_3790_Regression/Bug_3790_Regression.mpc: - * bin/tao_orb_tests.lst: - Added a test for bug#3790 and scheduled it for run as not fixed. - -Wed Dec 16 19:22:58 UTC 2009 Johnny Willemsen - - * tests/CDR/run_test.pl: - Fuzz fix. - -Wed Dec 16 15:19:22 UTC 2009 Denis Budko - - * tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: - - Fuzz fix. - -Wed Dec 16 14:18:03 UTC 2009 Denis Budko - - * orbsvcs/tests/Notify/Timeout/run_test.pl: - * orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl: - * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: - * orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl: - * orbsvcs/tests/Notify/Persistent_POA/run_test.pl: - * orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl: - * orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl: - * orbsvcs/tests/Notify/Reconnecting/run_test.pl: - * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl: - * orbsvcs/tests/Notify/Basic/run_test.pl: - * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: - * orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: - * orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl: - * orbsvcs/tests/Notify/Blocking/run_test.pl: - * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: - * orbsvcs/tests/Notify/Lanes/run_test.pl: - * orbsvcs/tests/Notify/Structured_Filter/run_test.pl: - - Removed AddLibPath where it isn't needed. - -Wed Dec 16 13:03:30 UTC 2009 Vladimir Zykov - - * orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp: - * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp: - * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: - Changed the test so that event channel is destroyed before - orb is shutdown. Removed unnecessary lib pathes from perl script. - -Wed Dec 16 11:26:30 UTC 2009 Denis Budko - - * orbsvcs/tests/Notify/Ordering/run_test.pl: - - Fuzz fix. - -Tue Dec 15 12:20:00 UTC 2009 Martin Corino - - * tests/OBV/Supports/server.cpp: - Fuzz fix. - -Mon Dec 14 15:13:30 UTC 2009 Denis Budko - - * orbsvcs/tests/Simple_Naming/run_test_ipv6.pl: - * orbsvcs/tests/Simple_Naming/run_test.pl: - * orbsvcs/tests/Redundant_Naming/run_test.pl: - * orbsvcs/tests/Bug_1437_Regression/run_test.pl: - * orbsvcs/examples/ImR/Combined_Service/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Mon Dec 14 14:52:39 UTC 2009 Abdul Sowayan - - * NEWS: - - Updated to note iPhone/iPod Touch support. - -Mon Dec 14 14:50:00 UTC 2009 Martin Corino - - * tests/OBV/Supports/server.cpp: - * tests/OBV/Supports/Supports_Test_impl.cpp: - Fixed faulty shutdown code causing server crashes. - -Mon Dec 14 13:58:58 UTC 2009 Johnny Willemsen - - * TAO_IDL/be/be_visitor_component/context_svh.cpp: - * TAO_IDL/be/be_visitor_component/context_svs.cpp: - * TAO_IDL/be/be_visitor_component/servant_svh.cpp: - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - Simplified generated code - -Mon Dec 14 07:26:58 UTC 2009 Johnny Willemsen - - * tests/Exposed_Policies/RT_Properties.{h,cpp}: - Fixed unicode runtime problems - -Fri Dec 11 18:27:58 UTC 2009 Johnny Willemsen - - * tao/Makefile.am: - Removed all duplicated files - -Fri Dec 11 16:36:58 UTC 2009 Yan Dai - - * tao/Valuetype/ValueBase.h: - - Removed explicit type specification for indirection flag to - fix implicit constant conversion overflow warning. - -Fri Dec 11 12:27:25 UTC 2009 Denis Budko - - * orbsvcs/tests/Bug_2285_Regression/run_test2.pl: - * orbsvcs/tests/Bug_2285_Regression/server2.cpp: - * orbsvcs/tests/Notify/Ordering/run_test.pl: - * orbsvcs/tests/Notify/MC/run_test.pl: - * orbsvcs/tests/Notify/Discarding/run_test.pl: - * orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl: - * orbsvcs/tests/ImplRepo/NameService/run_test.pl: - * orbsvcs/tests/ImplRepo/run_test.pl: - * orbsvcs/tests/Bug_2248_Regression/server.cpp: - * orbsvcs/tests/Bug_2248_Regression/run_test.pl: - * tests/AlternateIIOP/run_test.pl: - * examples/Load_Balancing/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Fri Dec 11 09:58:33 UTC 2009 Denis Budko - - * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Fri Dec 11 09:26:32 UTC 2009 Denis Budko - - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl: - * orbsvcs/tests/AVStreams/Pluggable/run_test.pl: - * orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_all.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_all.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/run_all.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/run_all.pl: - * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl: - * orbsvcs/examples/Notify/Lanes/run_test.pl: - * tests/IOR_Endpoint_Hostnames/run_test.pl: - * tests/Optimized_Connection/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Fri Dec 11 09:01:58 UTC 2009 Johnny Willemsen - - * tao/Makefile.am: - BooleanSeq.pidl was listed twice - -Thu Dec 10 18:42:58 UTC 2009 Johnny Willemsen - - * bin/tao_other_tests.lst: - * bin/tao_orb_tests.lst: - Removed FUZZ completely, fuzz now checks all run*.pl scripts - -Thu Dec 10 16:45:24 UTC 2009 Denis Budko - - * bin/tao_other_tests.lst: - * bin/tao_orb_tests.lst: - - Tests are added to fuzz build. - -Thu Dec 10 15:06:28 UTC 2009 Denis Budko - - * orbsvcs/examples/ImR/Combined_Service/run_test.pl: - - Test is converted to use new test framework - and added to fuzz build. - -Thu Dec 10 14:54:27 UTC 2009 Denis Budko - - * orbsvcs/tests/Simple_Naming/run_test_ipv6.pl: - * orbsvcs/tests/Simple_Naming/run_test_ffp.pl: - * orbsvcs/tests/Simple_Naming/run_test.pl: - * orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl: - * orbsvcs/tests/Redundant_Naming/run_test.pl: - * orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl: - * orbsvcs/tests/ImplRepo/NameService/run_test.pl: - * orbsvcs/tests/Bug_3444_Regression/run_test_ipv6.pl: - * orbsvcs/tests/Bug_3444_Regression/run_test.pl: - * orbsvcs/examples/ImR/Advanced/TestServer.cpp: - * orbsvcs/examples/ImR/Advanced/server_main.cpp: - * orbsvcs/examples/ImR/Advanced/TestServer.h: - * orbsvcs/examples/ImR/Advanced/TestClient.cpp: - * orbsvcs/examples/ImR/Advanced/manager_main.cpp: - * orbsvcs/examples/ImR/Advanced/TestClient.h: - * orbsvcs/examples/ImR/Advanced/run_test.pl: - * tests/Bug_1635_Regression/run_test.pl: - * tests/Bug_1628_Regression/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Thu Dec 10 13:45:00 UTC 2009 Martin Corino - - * tests/Oneways_Invoking_Twoways/Client_Task.cpp: - * tests/Oneways_Invoking_Twoways/Receiver_i.cpp: - * tests/Oneways_Invoking_Twoways/client.cpp: - * tests/Oneways_Invoking_Twoways/Sender_i.cpp: - * tests/Oneways_Invoking_Twoways/run_test.pl: - Changed to fix problems with incorrect shutdown sequence - (see Bugzilla 2068). - -Thu Dec 10 13:03:58 UTC 2009 Johnny Willemsen - - Reverted change below, causes correct code to break - - Thu Dec 10 11:57:58 UTC 2009 Johnny Willemsen - - * tao/String_Manager_T.h - * tao/String_Sequence_Element_T.h: - Added private operator != and ==, the string elements - just behave like char*, so != and == on them is illegal - and doesn't check the strings itself. If any user has - done this without realizing this, this change will now - give the user a compile error - -Thu Dec 10 12:42:00 UTC 2009 Martin Corino - - * tests/BiDirectional_DelayedUpcall/client.cpp: - * tests/BiDirectional_DelayedUpcall/test_i.cpp: - * tests/BiDirectional_DelayedUpcall/test_i.inl: - * tests/BiDirectional_DelayedUpcall/test_i.h: - Fixed problem with illegal send of request after ORB shutdown. - See Bugzilla 2068. - -Thu Dec 10 11:57:58 UTC 2009 Johnny Willemsen - - * tao/String_Manager_T.h - * tao/String_Sequence_Element_T.h: - Added private operator != and ==, the string elements - just behave like char*, so != and == on them is illegal - and doesn't check the strings itself. If any user has - done this without realizing this, this change will now - give the user a compile error - - * tao/TransportCurrent/Transport_Current.h: - Layout change - -Thu Dec 10 11:42:00 UTC 2009 Martin Corino - - * tests/Bug_3672_Regression/ami_test_i.cpp: - * tests/Bug_3672_Regression/client.cpp: - Test did not work correctly on Windows because of timing issues. - Changed to work correctly on Windows also. - -Thu Dec 10 10:32:56 UTC 2009 Denis Budko - - * orbsvcs/tests/Bug_1436_Regression/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_high_path.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_other_paths.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl: - * orbsvcs/tests/FT_App/run_test_demo.pl: - * orbsvcs/tests/FT_App/run_test_fault_consumer.pl: - * orbsvcs/tests/FT_App/run_test_detector.pl: - * orbsvcs/tests/Event/Mcast/Complex/run_test.pl: - * orbsvcs/tests/Bug_2248_Regression/client.cpp: - * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp: - * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl: - * orbsvcs/tests/Bug_1437_Regression/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Wed Dec 9 21:16:38 UTC 2009 Yan Dai - - * tests/OBV/Indirection/MessengerClient.cpp: - - Fixed a warning. - -Wed Dec 9 14:24:58 UTC 2009 Johnny Willemsen - - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - Don't generate code to call get_receptacle_policy, that doesn't - do anything - -Wed Dec 9 12:45:58 UTC 2009 Martin Corino - - * tests/OBV/Supports/Supports_Test.mpc: - Removed dummy_label dependency. - - * tests/OBV/Supports/client.cpp: - Fixed small coding error. - - * bin/tao_orb_tests.lst: - Reenabled the OBV/Supports test again since the reason for - excluding this one seems to have been invalidated (long ago?). - -Wed Dec 9 12:31:58 UTC 2009 Vladimir Zykov - - * tests/Bug_1361_Regression/Server_Thread_Pool.h: - Fixed fuzz error. - -Wed Dec 9 10:38:26 UTC 2009 Denis Budko - - * orbsvcs/tests/CosEvent/Basic/run_test.pl: - * orbsvcs/tests/Bug_1334_Regression/run_test.pl: - * orbsvcs/tests/Notify/Timeout/run_test.pl: - * orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl: - * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: - * orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl: - * orbsvcs/tests/Notify/Persistent_POA/run_test.pl: - * orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: - * orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl: - * orbsvcs/tests/Notify/Ordering/run_test.pl: - * orbsvcs/tests/Notify/Reconnecting/run_test.pl: - * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl: - * orbsvcs/tests/Notify/Basic/run_test.pl: - * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: - * orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: - * orbsvcs/tests/Notify/Blocking/run_test.pl: - * orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl: - * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: - * orbsvcs/tests/Notify/MC/run_test.pl: - * orbsvcs/tests/Notify/Lanes/run_test.pl: - * orbsvcs/tests/Notify/Discarding/run_test.pl: - * orbsvcs/tests/Notify/Structured_Filter/run_test.pl: - * orbsvcs/tests/Event/Basic/run_test.pl: - * orbsvcs/tests/Event/Performance/run_test.pl: - * orbsvcs/tests/Bug_1393_Regression/run_test.pl: - * orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl: - * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl: - * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl: - * tests/Bug_1476_Regression/run_test.pl: - * tests/Bug_2494_Regression/run_test.pl: - * tests/POA/Adapter_Activator/run_test.pl: - * tests/POA/Explicit_Activation/run_test.pl: - * tests/POA/On_Demand_Activation/run_test.pl: - * tests/POA/Loader/run_test.pl: - * tests/POA/On_Demand_Loading/run_test.pl: - * tests/POA/Reference_Counted_Servant/run_test.pl: - * tests/Collocation/run_test.pl: - * tests/CodeSets/simple/run_test.pl: - * tests/CSD_Strategy_Tests/Broken/run_test.pl: - * tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl: - * tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl: - * tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl: - * tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl: - * tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl: - * tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl: - * tests/Oneway_Timeouts/run_test.pl: - * tests/Smart_Proxies/On_Demand/server.cpp: - * tests/Smart_Proxies/On_Demand/run_test.pl: - * tests/Smart_Proxies/Benchmark/server.cpp: - * tests/Smart_Proxies/Benchmark/run_test.pl: - * tests/Bug_3676_Regression/run_test.pl: - * tests/Oneways_Invoking_Twoways/run_test_svc.pl: - * bin/tao_other_tests.lst: - - Tests are converted to use new test framework - and added to fuzz build. - -Wed Dec 9 10:11:14 UTC 2009 Johnny Willemsen - - * TAO_IDL/be/be_provides.cpp: - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: - * TAO_IDL/be/be_visitor_component/servant_svh.cpp: - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - * TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp: - Merged changes from local facets branch - - Mon Dec 7 17:51:59 UTC 2009 William R. Otte - - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - - filled in connection logic. - - Sat Dec 5 05:35:27 UTC 2009 William R. Otte - - * TAO_IDL/be/be_provides.cpp: - * TAO_IDL/be/be_visitor_component/servant_svh.cpp: - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - - Codegen modifications for local facets. - - Wed Dec 2 00:45:54 UTC 2009 William R. Otte - - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: - * TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp: - - preliminary changes. - -Wed Dec 9 09:40:10 UTC 2009 Vladimir Zykov - - * tests/Bug_1361_Regression/Echo_Caller.cpp: - * tests/Bug_1361_Regression/Echo_Caller.h: - * tests/Bug_1361_Regression/server.cpp: - * tests/Bug_1361_Regression/Server_Thread_Pool.cpp: - * tests/Bug_1361_Regression/Server_Thread_Pool.h: - * tests/Bug_1361_Regression/run_test.pl: - Changed the test so that it doesn't shutdown the orb until - all threads are done with the remote calls. Substantially - extended the time for server shutdown since threads in server's - pool don't handle shutdown message until they send all (50) - remote messages. - - * tao/ORB_Core.cpp: - * tao/Messaging/Messaging_Policy_i.cpp: - * tao/ORB_Core.h: - This fixes Bug#3682. SYNC_WITH_TRANSPORT is now really - default synch scope policy in TAO. - - * tao/Leader_Follower_Flushing_Strategy.cpp: - Changed the code to poll the reactor instead of running - it indefinitely. This fixes bug#3697. - -Wed Dec 9 08:15:14 UTC 2009 Johnny Willemsen - - * TAO_IDL/be/be_codegen.cpp: - Use Error in error messages so that the scoreboard flags them red - -Wed Dec 9 05:55:14 UTC 2009 Yan Dai - - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl: - * tests/OBV/Indirection/Factory.h: - * tests/OBV/Indirection/Factory.cpp: - * tests/OBV/Indirection/Messenger.idl: - * tests/OBV/Indirection/Messenger_i.h: - * tests/OBV/Indirection/Messenger_i.cpp: - - Fixed fuzz errors. - -Wed Dec 9 01:27:54 UTC 2009 Yan Dai - - * tao/CDR.cpp: - - Fixed bugs in offset() method that incorrectly calculate - the offset when multiple message blocks are chained. - - * tao/Valuetype/ValueBase.cpp: - - Fixed bugs that should use the offset() to find out a - position to current wr_ptr. - - * tests/OBV/Indirection/Factory.h: - * tests/OBV/Indirection/Factory.cpp: - * tests/OBV/Indirection/Messenger.idl: - * tests/OBV/Indirection/MessengerClient.cpp: - * tests/OBV/Indirection/MessengerServer.cpp: - * tests/OBV/Indirection/Messenger_i.h: - * tests/OBV/Indirection/Messenger_i.cpp: - - Added test case to verify the fixes. The new test case - send longer message that would involve multiple message - blocks with indirection in output CDR stream. - -Tue Dec 8 10:25:47 UTC 2009 Denis Budko - - * orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl: - * orbsvcs/tests/Notify/Persistent_POA/Structured_Supplier.cpp: - * orbsvcs/tests/Notify/Persistent_POA/run_test.pl: - * orbsvcs/tests/Notify/Blocking/run_test.pl: - * orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp: - * orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp: - * orbsvcs/tests/Notify/Structured_Filter/run_test.pl: - * orbsvcs/tests/FT_App/run_test_rmregistry.pl: - * orbsvcs/tests/FT_App/run_test_registry.pl: - * orbsvcs/tests/EC_Throughput/run_test_overflow.pl: - * orbsvcs/tests/EC_Throughput/run_test.pl: - * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl: - * orbsvcs/tests/Event/Mcast/Simple/run_test.pl: - * orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl: - * orbsvcs/tests/Bug_2248_Regression/client.cpp: - * orbsvcs/tests/Bug_2248_Regression/run_test.pl: - * orbsvcs/tests/RTCosScheduling/run_test.pl: - * orbsvcs/tests/Bug_3387_Regression/run_test.pl: - * performance-tests/CSD_Strategy/TestApps/run_test.pl: - * performance-tests/RTCorba/Thread_Pool/run_test.pl: - * tests/CSD_Strategy_Tests/Broken/run_test.pl: - * tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Tue Dec 8 09:20:00 UTC 2009 Johnny Willemsen - - * bin/tao_orb_tests.lst: - Added OBV/Indirection - -Mon Dec 7 18:22:00 UTC 2009 Martin Corino - - * bin/tao_orb_tests.lst: - Removed !FIXED_BUGS_ONLY for Bug_3672_Regression test. - -Mon Dec 7 10:40:49 UTC 2009 Denis Budko - - * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl: - * bin/tao_other_tests.lst: - - Test is converted to use new test framework - and added to fuzz build. - -Mon Dec 7 10:19:29 UTC 2009 Denis Budko - - * tests/IOR_Endpoint_Hostnames/run_test.pl: - * examples/Quoter/run_test.pl: - * examples/Callback_Quoter/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Mon Dec 7 09:59:08 UTC 2009 Denis Budko - - * orbsvcs/tests/EC_Custom_Marshal/run_test.pl: - * orbsvcs/tests/COIOP_Naming_Test/run_test.pl: - * orbsvcs/tests/Notify/Timeout/run_test.pl: - * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: - * orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl: - * orbsvcs/tests/Notify/Reconnecting/run_test.pl: - * orbsvcs/tests/Notify/Basic/run_test.pl: - * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp: - * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp: - * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: - * orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: - * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: - * orbsvcs/tests/Notify/MC/Structured_Consumer.cpp: - * orbsvcs/tests/Notify/MC/test_monitor.cpp: - * orbsvcs/tests/Notify/MC/Structured_Supplier.cpp: - * orbsvcs/tests/Notify/MC/run_test.pl: - * orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl: - * orbsvcs/tests/ImplRepo/scale/run_test.pl: - * orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp: - * orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp: - * orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl: - * orbsvcs/tests/ImplRepo/NameService/run_test.pl: - * orbsvcs/tests/ImplRepo/locked/run_test.pl: - * orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: - * orbsvcs/tests/ImplRepo/run_test.pl: - * orbsvcs/tests/Bug_3598b_Regression/run_test.pl: - * tests/Muxing/run_test.pl: - * tests/ORB_init/Portspan/run_test.pl: - * tests/Bug_2183_Regression/run_test.pl: - * tests/Bug_3108_Regression/run_test.pl: - * bin/tao_other_tests.lst: - * bin/tao_orb_tests.lst: - * utils/nslist/run_test.pl: - * examples/Quoter/run_test.pl: - * examples/Callback_Quoter/run_test.pl: - * examples/Persistent_Grid/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Mon Dec 7 09:43:00 UTC 2009 Martin Corino - - * ACE_wrappers/TAO/tao/Thread_Lane_Resources.h: - * ACE_wrappers/TAO/tao/Thread_Lane_Resources.cpp: - * ACE_wrappers/TAO/tao/Thread_Lane_Resources_Manager.h: - * ACE_wrappers/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp: - * ACE_wrappers/TAO/tao/Default_Thread_Lane_Resources_Manager.h: - * ACE_wrappers/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h: - * ACE_wrappers/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp: - * ACE_wrappers/TAO/tao/ORB_Core.cpp: - - Replaced #clear_rw_transports() method by #close_all_transports() method. - This fixes Bugzilla #3672. - Like before this behaviour is controlled by ORB option - ORBDropRepliesDuringShutdown, which by default is on. - - -Mon Dec 7 07:13:34 UTC 2009 Yan Dai - - * tao/PortableServer/Upcall_Wrapper.cpp: - * tao/operation_details.cpp: - - Fixed the issue that the indirection maps are not cleaned up - when marshal/demarshal raises exception. - -Sun Dec 6 03:07:00 UTC 2009 Yan Dai - - * tao/Makefile.am: - - Updated automake files. - - * tests/OBV/Indirection/Makefile.am: - - Added automake file. - - * tao/CDR.inl: - - Made copy constructor initialize indirection maps instead of - using assign operator. - -Sun Dec 6 02:01:17 UTC 2009 Yan Dai - - * tao/Intrusive_Ref_Count_Object_T.h: - * tao/Intrusive_Ref_Count_Object_T.inl: - * tao/Intrusive_Ref_Count_Object_T.cpp: - - Added missing files in last commit. - -Fri Dec 4 23:18:26 UTC 2009 Yan Dai - - Merged in valuetype repository id and value indirection support - on both input and output streams from OCI (RT #13502). - - * MPC/config/valuetype_out_indirection.mpb: - - Added mpc feature to optionally turn on the indirection - support on valuetype outgoing message. It defaults to - be enabled. To be compatible with previous version TAO, - run mwc.pl with - "-features valuetype_out_indirection=0" to disable it. - - * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp: - * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: - - Modified the valuetype unmarshall method to support - value indirection. - - * tao/Intrusive_Ref_Count_Object_T.h: - * tao/Intrusive_Ref_Count_Object_T.inl: - * tao/Intrusive_Ref_Count_Object_T.cpp: - - Added wrapper for non reference counted data type to provide reference - counting feature so it can use the TAO_Intrusive_Ref_Count_Handle - smart-pointer. - - * tao/CDR.h: - * tao/CDR.inl: - * tao/CDR.cpp: - - - Used smart point hash map for indirection maps (repository id, value - and codebase_url). The maps map the already read/written values. - - Added methods to access/update indirection maps. - - The maps are only created when valuetype data is marshalled or - demarshalled. - - Added offset(pos) method to calculate the offset between provided - position and current wr_ptr. - - * tao/Valuetype/ValueBase.h: - * tao/Valuetype/ValueBase.inl: - * tao/Valuetype/ValueBase.cpp: - - - Added repository id and value indirection support on both input - and output stream. - - The codebase_url indirection on input stream was also added but - not tested. TAO does not support codebase currently and the codebase - url indirection is added for future support. TAO can read codebase_url - from other ORB implementation but the codebase_url is not used. - - Used TAO_HAS_VALUETYPE_OUT_INDIRECTION define to optionally turn on - and off the outgoing message indirection. This is to support backward - compatibility. - - * tao/operation_details.cpp: - * tao/PortableServer/Upcall_Wrapper.cpp: - - Cleaned the indirection maps after marshalling/unmarshalling complete. - - * tao/AnyTypeCode/Any_Impl_T.cpp: - * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp: - - Made Any_Unknown_IDL_Type cdr share the maps from input cdr of the - request so previous indirection can be used during unmarshalling any. - - * tao/DynamicInterface/AMH_DSI_Response_Handler.cpp: - - Updated unmarshal method based on tao_idl changes. - - * tao/Valuetype.mpc: - * tao/PortableServer.mpc: - * tao/tao.mpc: - - Added dependency on valuetype_out_indirection feature. - - * tests/OBV/indirection/Factory.h: - * tests/OBV/indirection/Factory.cpp: - * tests/OBV/indirection/Messenger.idl: - * tests/OBV/indirection/MessengerClient.cpp: - * tests/OBV/indirection/MessengerServer.cpp: - * tests/OBV/indirection/Messenger_i.h: - * tests/OBV/indirection/Messenger_i.cpp: - * tests/OBV/indirection/README: - * tests/OBV/indirection/indirection.mpc: - * tests/OBV/indirection/run_test.pl: - - - Added automation test for indirection support in TAO. The test - based on the JacORB demo/value test. This can also be used for - interoperability test between TAO and JacORB. - - The indirection test with truncatable value was added. The test - passed between the TAO server and client, but the interoperablity - test with JacORB failed. It also failed on previous TAO version. - - * NEWS: - - Added entry for indirection support. - -Fri Dec 4 21:00:38 UTC 2009 Yan Dai - - * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h: - * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp: - * orbsvcs/LoadBalancer/LoadManager.cpp: - - Renamed init() to initialize() to avoid Warning W8022 on borland build. - -Fri Dec 4 17:25:32 UTC 2009 Yan Dai - - * NEWS: - - Added entry for member validation feature in LoadBalancer. - - * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h: - - Disable Warning 8022 for borland build. - - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DeadMemberDetection_Inf_Ctrl.mpc: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl: - - Fixed fuzz warning and errors. - -Fri Dec 4 12:39:26 UTC 2009 Denis Budko - - * tests/Bug_1869_Regression/client.cpp: - - Tests is converted to use new test framework - and added to fuzz build. - -Fri Dec 4 09:13:17 UTC 2009 Denis Budko - - * orbsvcs/tests/Notify/Persistent_Filter/run_test.pl: - * orbsvcs/tests/Notify/Discarding/run_test.pl: - * orbsvcs/tests/FT_App/run_test_notifier.pl: - * orbsvcs/tests/Event/Basic/run_test.pl: - * orbsvcs/tests/Event/Performance/run_test.pl: - * orbsvcs/tests/Event/UDP/run_test.pl: - * orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp: - * orbsvcs/tests/Bug_3387_Regression/MessengerClient.cpp: - * orbsvcs/tests/Bug_3387_Regression/run_test.pl: - * orbsvcs/tests/Bug_2247_Regression/run_test.pl: - * orbsvcs/tests/EC_MT_Mcast/run_test.pl: - * performance-tests/Protocols/run_senders.pl: - * tests/Server_Leaks/run_test.pl: - * tests/Bug_1551_Regression/server.cpp: - * tests/Bug_1551_Regression/run_test.pl: - * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp: - * tests/Connection_Purging/run_test.pl: - * tests/Bug_1482_Regression/server.cpp: - * tests/Bug_1482_Regression/run_test.pl: - * tests/ForwardOnceUponException/run_test.pl: - * tests/Reliable_Oneways/run_test.pl: - * examples/Buffered_Oneways/run_test.pl: - * examples/ior_corbaloc/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Thu Dec 3 12:15:35 UTC 2009 Johnny Willemsen - - * tao/Incoming_Message_Stack.h: - C++ Builder 2010 fix - - * tao/Object.cpp: - Extended some debug info - - * tao/Synch_Invocation.cpp: - Removed intermediate variable - - * tao/TAO_Internal.cpp: - Improved debug message - - * tao/ZIOP/ZIOP.cpp: - Layout change - -Thu Dec 3 09:24:17 UTC 2009 Denis Budko - - * orbsvcs/tests/Bug_1395_Regression/run_test.pl: - * orbsvcs/tests/CosEvent/Basic/run_test.pl: - * orbsvcs/tests/Bug_2285_Regression/run_test2.pl: - * orbsvcs/tests/Bug_2285_Regression/run_test.pl: - * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: - * orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl: - * orbsvcs/tests/Notify/Ordering/run_test.pl: - * orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl: - * orbsvcs/tests/Notify/ThreadPool/run_test.pl: - * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp: - * orbsvcs/tests/FT_App/FT_TestReplica_i.h: - * orbsvcs/tests/FT_App/run_test_rmnotifier.pl: - * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h: - * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp: - * orbsvcs/tests/FT_App/run_test_basic.pl: - * tests/Nested_Upcall_Crash/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Thu Dec 3 08:09:35 UTC 2009 Johnny Willemsen - - * orbsvcs/IFR_Service/IFR_Service.mpc: - Enable mcpp support - -Thu Dec 3 08:03:35 UTC 2009 Johnny Willemsen - - * orbsvcs/Naming_Service/NT_Naming_Server.cpp: - Unicode fixes - - * orbsvcs/orbsvcs/Notify/Delivery_Request.h: - Doxygen fix - - * orbsvcs/orbsvcs/Trader/Trader.h: - Fix for CB2010 - -Wed Dec 2 20:56:35 UTC 2009 Yan Dai - - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl: - - Tests are converted to use new test framework. - - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DeadMemberDetection_App_Ctrl.mpc: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DeadMemberDetection_Inf_Ctrl.mpc: - - Removed duplicated sections introduced from merging. - -Wed Dec 2 18:17:04 UTC 2009 Yan Dai - - Merged in changes from OCI (RT #13323) that added member validation - feature to LoadBalancer. - - * orbsvcs/LoadBalancer/LoadManager.cpp: - - - Added parameters for passing ping_timeout in milliseconds('-t') and - ping_interval in seconds('-i'). The default ping_interval is 0 which means - no validation thread launched. Otherwise each member will be validated - periodically. The period is in a range of minimum ping_interval and maximum - num of members validated * ping_timeout. - - The LB service needs be run with RW strategy configuration to ensure the - next_member, add_member and remove_member performed sequentially. - - static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy - exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1" - static Resource_Factory "-ORBFlushingStrategy blocking" - - * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h: - * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp: - - Added the validate thread to periodically ping all active members. The - liveliness status update is done in PortableGroup lib. The next_member() - query strategy to get next member in maximum number of existing members - times until an active member is found. - - * orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h: - * orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp: - - Fixed issue that the location index from previous next_member() call may - not be valid if the member list is changed since then. Now it verify if - the list is changed and then find the next member based on RR strategy. - - * orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp: - - Added try/catch around factory delete_object() call, - because it's possible the factory is down. This could - be called in the path of remove_member after member - liveliness check failure. Without try/catch, the member - will not be removed cleanly. - - * orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h: - - Added liveliness status and group reference. - - * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h: - * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp: - - Added more functions to support member validation and inactive - member removing. - - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DeadMemberDetection_App_Ctrl.mpc: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Makefile.am: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/README: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Test.idl: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/svc.conf: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DeadMemberDetection_Inf_Ctrl.mpc: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.h: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Map.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Makefile.am: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/README: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Test.idl: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/factory_server.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/server.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf: - * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml: - - Added validation tests. - - * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp: - - Fixed a bug that deleted object after orb shutdown and got - COMM_FAILURE. - - * bin/tao_other_tests.lst: - - Added validation tests. - -Wed Dec 2 14:01:43 UTC 2009 Vladimir Zykov - - * tao/RTCORBA/RT_ORB_Loader.cpp: - Improved a little the fix for bug#3755. There is no need - to obtain a global gestalt. - -Wed Dec 2 12:32:36 UTC 2009 Denis Budko - - * examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: - * examples/RTScheduling/MIF_Scheduler/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Wed Dec 2 10:07:02 UTC 2009 Denis Budko - - * orbsvcs/tests/Bug_1630_Regression/run_test.pl: - * orbsvcs/tests/BiDir_CORBALOC/run_test.pl: - * orbsvcs/tests/HTIOP/Hello/run_test.pl: - * orbsvcs/tests/HTIOP/AMI/run_test.pl: - * orbsvcs/tests/HTIOP/BiDirectional/run_test.pl: - * orbsvcs/tests/Notify/Lanes/README: - * orbsvcs/tests/Notify/Lanes/run_test.pl: - * orbsvcs/tests/FaultTolerance/IOGR/run_test.pl: - * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/run_test.pl: - * orbsvcs/tests/Bug_2248_Regression/run_test.pl: - * orbsvcs/tests/Time/run_test.pl: - * DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl: - * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp: - * tests/IOR_Endpoint_Hostnames/generate_ior.cpp: - * tests/IOR_Endpoint_Hostnames/IOR_Endpoint_Hostnames.mpc: - * tests/IOR_Endpoint_Hostnames/Makefile.am: - * tests/IOR_Endpoint_Hostnames/run_test.pl: - * tests/Bug_1482_Regression/run_test.pl: - * tests/Nested_Upcall_Crash/run_test.pl: - * examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: - * examples/RTScheduling/MIF_Scheduler/run_test.pl: - * examples/AMH/Sink_Server/run_test.pl: - * examples/Load_Balancing/run_test.pl: - - Tests are converted to use new test framework - and added to fuzz build. - -Tue Dec 1 10:44:09 UTC 2009 Denis Budko - - * orbsvcs/examples/Notify/Subscribe/run_test.pl: - * orbsvcs/examples/Notify/Filter/run_test.pl: - - Test are converted to use new test framework - and added to fuzz build. - -Tue Dec 1 09:48:38 UTC 2009 Denis Budko - - * orbsvcs/tests/Log/Basic_Log_Test/run_test.pl: - * orbsvcs/tests/Bug_2800_Regression/client.cpp: - * orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl: - * orbsvcs/tests/Bug_2800_Regression/nsmain.cpp: - * orbsvcs/tests/Bug_2800_Regression/run_test.pl: - * orbsvcs/tests/Bug_2777_Regression/run_test.pl: - * orbsvcs/tests/Bug_3673_Regression/client.cpp: - * orbsvcs/tests/Bug_3673_Regression/nsmain.cpp: - * orbsvcs/tests/Bug_3673_Regression/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl: - * orbsvcs/tests/EC_Multiple/run_test.pl: - * orbsvcs/tests/Interoperable_Naming/run_test.pl: - * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl: - * orbsvcs/examples/ORT/run_test.pl: - * orbsvcs/examples/Notify/Subscribe/run_test.pl: - * orbsvcs/examples/Notify/ThreadPool/run_test.pl: - * orbsvcs/examples/Notify/Lanes/run_test.pl: - * orbsvcs/examples/Notify/Filter/run_test.pl: - * orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl: - * orbsvcs/examples/RtEC/IIOPGateway/run_test.pl: - * orbsvcs/examples/RtEC/Simple/run_test.pl: - * performance-tests/POA/Create_Reference/run_test.pl: - * tests/Faults/run_test_pp.pl: - * tests/Faults/run_test.pl: - * tests/Muxing/run_test.pl: - * tests/Bug_1020_Regression/run_test.pl: - * tests/Bug_1551_Regression/run_test.pl: - * tests/Bug_2678_Regression/run_test.pl: - * tests/MT_Server/run_test.pl: - * tests/LongUpcalls/run_test.pl: - * tests/Bug_2084_Regression/run_test.pl: - * tests/Bug_1482_Regression/run_test.pl: - * tests/Bug_3547_Regression/run_test.pl: - * tests/Bug_2174_Regression/run_test.pl: - * tests/POA/TIE/server.cpp: - * tests/POA/TIE/run_test.pl: - * tests/MT_BiDir/run_test.pl: - * tests/Monitor/Marshal_Buffer/run_test.pl: - * tests/Bug_1869_Regression/client.cpp: - * tests/Bug_1869_Regression/run_test.pl: - * tests/Nested_Upcall_Crash/run_test.pl: - * tests/ORB_Local_Config/run_tests_all.pl: - * tests/Bug_1269_Regression/run_test.pl: - * tests/Forwarding/run_test.pl: - * bin/tao_orb_tests.lst: - - Test are converted to use new test framework - and added to fuzz build. - -Thu Nov 26 02:02:24 UTC 2009 Douglas C. Schmidt - - * docs/documentation.html: Updated the documentation to reference - the "CORBA Explained Simply" and "Advanced CORBA Programming - with C++" books. Thanks to Joost Kraaijeveld for motivating this. - -Mon Nov 30 12:26:32 UTC 2009 Denis Budko - - * orbsvcs/tests/Simple_Naming/run_test.pl: - * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: - * tests/Oneway_Timeouts/run_test.pl: - * tests/Parallel_Connect_Strategy/run_test.pl: - * tests/Muxed_GIOP_Versions/run_test.pl: - * tests/InterOp-Naming/run_test.pl: - * bin/tao_other_tests.lst: - - Test are converted to use new test framework - and added to fuzz build. - -Mon Nov 30 10:01:49 UTC 2009 Denis Budko - - * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/default_configuration.pl: - * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/run_test.pl: - * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/default_configuration.pl: - * orbsvcs/tests/Simple_Naming/run_test.pl: - * orbsvcs/tests/Security/InsecureReferences/run_test.pl: - * orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl: - * orbsvcs/tests/Security/Bug_1107_Regression/run_test.pl: - * orbsvcs/tests/Security/Crash_Test/run_test.pl: - * orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl: - * orbsvcs/tests/Security/MT_SSLIOP/run_test_heavy.pl: - * orbsvcs/tests/Security/MT_SSLIOP/run_test.pl: - * orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: - * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: - * orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl: - * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl: - * orbsvcs/tests/AVStreams/Latency/run_test.pl: - * orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: - * orbsvcs/tests/AVStreams/Pluggable/run_test.pl: - * orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: - * orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl: - * orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl: - * orbsvcs/tests/AVStreams/Multicast/run_test.pl: - * orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl: - * orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl: - * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl: - * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_all.pl: - * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: - * orbsvcs/tests/Notify/XML_Persistence/run_test.pl: - * orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl: - * orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl: - * orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl: - * orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl: - * orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl: - * performance-tests/POA/Implicit_Activation/run_test.pl: - * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl: - * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl: - * performance-tests/Callback/run_test.pl: - * performance-tests/Latency/AMH_Single_Threaded/run_test.pl: - * performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: - * performance-tests/Cubit/TAO/DII_Cubit/run_test.pl: - * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: - * tests/Big_Twoways/run_test.pl: - * tests/Bug_2918_Regression/run_test.pl: - * tests/Strategies/run_test.pl: - * tests/Bug_1482_Regression/run_test.pl: - * tests/Portable_Interceptors/Benchmark/run_test.pl: - * tests/Xt_Stopwatch/run_test.pl: - * tests/Multiple/run_test.pl: - * tests/CSD_Strategy_Tests/Broken/run_test.pl: - * tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl: - * tests/Oneway_Timeouts/client.cpp: - * tests/Oneway_Timeouts/server.cpp: - * tests/Oneway_Timeouts/run_test.pl: - * tests/Smart_Proxies/Policy/server.cpp: - * tests/Smart_Proxies/Policy/run_test.pl: - * tests/Bug_1270_Regression/run_test.pl: - * tests/Parallel_Connect_Strategy/run_test.pl: - * tests/Muxed_GIOP_Versions/run_test.pl: - * tests/Connect_Strategy_Test/run_test.pl: - * tests/Big_Oneways/run_test.pl: - * tests/Bug_1627_Regression/server.cpp: - * tests/Bug_1627_Regression/run_test.pl: - * tests/InterOp-Naming/run_test.pl: - * tests/Nested_Upcall_Crash/run_test.pl: - * tests/Bug_1269_Regression/client.cpp: - * tests/Bug_1269_Regression/run_test.pl: - - Test are converted to use new test framework - and added to fuzz build. - -Sun Nov 29 13:06:02 CST 2009 Johnny Willemsen - - * TAO version 1.7.5 released. - -Fri Nov 27 10:12:19 UTC 2009 Denis Budko - - * tests/OctetSeq/run_test1.pl: - * tests/OctetSeq/run_test2.pl: - * tests/Bug_3000_Regression/run_test.pl: - * tests/Bug_3068_Regression/run_test.pl: - * tests/Bug_2186_Regression/run_test.pl: - - Test are converted to use new test framework - and added to fuzz build. - -Thu Nov 26 12:45:41 UTC 2009 Denis Budko - - * tests/Bug_1361_Regression/run_test.pl: - - Test is converted to use new test framework and added to fuzz build. - -Thu Nov 26 10:42:27 UTC 2009 Denis Budko - - * orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp: - * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp: - - Tests are converted to use new test framework and added to fuzz build. - -Wed Nov 25 15:37:11 UTC 2009 Vladimir Zykov - - * tao/RTCORBA/RT_ORB_Loader.cpp: - Additional fix for bug#3755. Previous fix broke Bug_3755_Regression. - -Wed Nov 25 12:07:28 UTC 2009 Denis Budko - - * orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl: - * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl: - * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: - * tests/AMI_Buffering/run_timeout.pl: - * tests/AMI_Buffering/run_message_count.pl: - * tests/AMI_Buffering/run_buffer_size.pl: - * tests/AMI_Buffering/run_timeout_reactive.pl: - * tests/AMI_Buffering/run_test.pl: - * tests/Bug_1495_Regression/run_test.pl: - * tests/Oneway_Buffering/run_timeout.pl: - * tests/Oneway_Buffering/run_message_count.pl: - * tests/Oneway_Buffering/run_buffer_size.pl: - * tests/Oneway_Buffering/run_timeout_reactive.pl: - * tests/Oneway_Buffering/run_test.pl: - - Tests are converted to use new test framework and added to fuzz build. - -Wed Nov 25 09:01:20 UTC 2009 Denis Budko - - * orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp: - * orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp: - * orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl: - * orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerServer.cpp: - * orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp: - * orbsvcs/DevGuideExamples/Security/PolicyControllingApp/run_test.pl: - * orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerServer.cpp: - * orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/MessengerClient.cpp: - * orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/run_test.pl: - * orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerServer.cpp: - * orbsvcs/DevGuideExamples/NotifyService/QoSProperties/MessengerClient.cpp: - * orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl: - * orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl: - * orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp: - * orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerClient.cpp: - * orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl: - * orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp: - * orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl: - * orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp: - * orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/run_test.pl: - * orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp: - * orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerClient.cpp: - * orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl: - * orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp: - * orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp: - * orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerClient.cpp: - * orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl: - * orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/MessengerServer.cpp: - * orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl: - * orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl: - * orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl: - * orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl: - * orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp: - * orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerClient.cpp: - * orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl: - * orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl: - * orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp: - * orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl: - * orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl: - * orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl: - * orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl: - * orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp: - * orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp: - * orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h: - * orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl: - * orbsvcs/examples/Log/Basic/run_test.pl: - * orbsvcs/examples/Log/Event/run_test.pl: - * orbsvcs/examples/Log/RTEvent/run_test.pl: - * orbsvcs/examples/Log/Notify/run_test.pl: - * orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp: - * orbsvcs/examples/CosEC/TypedSimple/run_test.pl: - * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl: - * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl: - * orbsvcs/examples/LoadBalancing/run_test.pl: - * performance-tests/Sequence_Latency/DSI/run_test.pl: - * performance-tests/Sequence_Latency/Deferred/run_test.pl: - * performance-tests/Sequence_Latency/Thread_Pool/run_test.pl: - * performance-tests/Sequence_Latency/Single_Threaded/default_configuration.pl: - * performance-tests/Sequence_Latency/Single_Threaded/run_test.pl: - * performance-tests/Sequence_Latency/DII/run_test.pl: - * performance-tests/Sequence_Latency/AMH_Single_Threaded/run_test.pl: - * performance-tests/Sequence_Latency/AMI/run_test.pl: - * performance-tests/Sequence_Latency/Thread_Per_Connection/run_test.pl: - * performance-tests/RTCorba/Oneways/Reliable/client_test.pl: - * performance-tests/RTCorba/Oneways/Reliable/server.cpp: - * performance-tests/RTCorba/Oneways/Reliable/run_test.pl: - * performance-tests/Latency/Thread_Pool/run_test.pl: - * performance-tests/Latency/Single_Threaded/default_configuration.pl: - * performance-tests/Latency/Single_Threaded/run_test.pl: - * performance-tests/Latency/Thread_Per_Connection/run_test.pl: - * tests/GIOP_Fragments/Java_Big_Request/run_test.pl: - * tests/GIOP_Fragments/Java_Big_Reply/run_test.pl: - * examples/CSD_Strategy/ThreadPool2/run_test.pl: - * examples/CSD_Strategy/ThreadPool4/run_test.pl: - * examples/CSD_Strategy/ThreadPool5/run_test.pl: - * examples/CSD_Strategy/ThreadPool6/run_test.pl: - - Tests are converted to use new test framework and added to fuzz build. - -Tue Nov 24 13:12:18 UTC 2009 Vladimir Zykov - - * tao/RTCORBA/RT_ORB_Loader.cpp: - Fixed a problem with double initialization of RTCORBA library. - This is required for bug#3755. Now RTCORBA initialization code - checks whether it's initialized in current gestalt. - -Tue Nov 24 10:29:27 UTC 2009 Denis Budko - - * orbsvcs/tests/EC_Mcast/run_test.pl: - * orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl: - * orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl: - * orbsvcs/tests/Notify/Validate_Client/run_test.pl: - * orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl: - * orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl: - * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp: - * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl: - * orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl: - * DevGuideExamples/AMH_AMI/inner_server.cpp: - * DevGuideExamples/AMH_AMI/client.cpp: - * DevGuideExamples/AMH_AMI/middle_server.cpp: - - Tests are converted to use new test framework and added to fuzz build. - -Mon Nov 23 12:08:00 UTC 2009 Simon Massey - - * NEWS: - * TAO_IDL/util/utl_global.cpp: - - Another Space in roots fix. - -Mon Nov 23 11:23:28 UTC 2009 Denis Budko - - * examples/RTCORBA/Activity/run_test.pl: - - Test is converted to use new test framework and added to fuzz build. - -Mon Nov 23 11:07:56 UTC 2009 Denis Budko - - * tests/MT_Client/run_test.pl: - * examples/RTCORBA/Activity/run_test.pl: - - Tests are converted to use new test framework and added to fuzz build. - -Mon Nov 23 10:50:58 UTC 2009 Marcel Smit - - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - In the generated servant code (_svnt.cpp) we have an - access violation in the method populate_port_tables. - The access violation is indirectly caused by a wrong - call of the method ports_servant_activator of the - Servant_Activator. - An instance of Port_Activator is created as a copy - of tmp. Instead of the new copy pa the tmp variable - is used in the call of ports_servant_activator. - Thanks to Wolfgang Pickartz. - -Mon Nov 23 09:38:57 UTC 2009 Denis Budko - - * orbsvcs/DevGuideExamples/InterfaceRepo/run_test.pl: - * orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp: - * orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerClient.cpp: - * orbsvcs/DevGuideExamples/ImplRepo/Basic/run_test.pl: - * orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp: - * orbsvcs/DevGuideExamples/ImplRepo/IORTable/run_test.pl: - * orbsvcs/DevGuideExamples/ImplRepo/MessengerClient.cpp: - * orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl: - * orbsvcs/DevGuideExamples/ImplRepo/run_test.pl: - * orbsvcs/tests/Miop/McastHello/run_test.pl: - * orbsvcs/tests/Security/Callback/client.cpp: - * orbsvcs/tests/CosEvent/Timeout/run_test.pl: - * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h: - * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl: - * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp: - * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h: - * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: - * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl: - * performance-tests/Protocols/run_test.pl: - * tests/CollocationLockup/run_test.pl: - * tests/Bug_1495_Regression/Threaded_Client.cpp: - * tests/Bug_1495_Regression/run_test_complex.pl: - * tests/Bug_1495_Regression/run_test.pl: - * tests/Bug_1361_Regression/run_test.pl: - * tests/COIOP/run_test.pl: - * tests/Bug_3000_Regression/run_test.pl: - * tests/Bug_2186_Regression/run_test.pl: - * tests/AlternateIIOP/run_test.pl: - * tests/NestedUpcall/Simple/run_test.pl: - * tests/MT_BiDir/run_test.pl: - * tests/MT_Client/run_test.pl: - * tests/ForwardUponObjectNotExist/run_test.pl: - * tests/No_Server_MT_Connect_Test/run_test.pl: - * tests/Cache_Growth_Test/run_test.pl: - * tests/Bug_1476_Test/run_test.pl: - * bin/tao_other_tests.lst: - * bin/tao_orb_tests.lst: - * examples/Simple/time-date/run_test.pl: - * examples/CSD_Strategy/ThreadPool/run_test.pl: - * examples/CSD_Strategy/ThreadPool3/run_test.pl: - * examples/RTCORBA/Activity/run_test.pl: - * examples/AMH/Sink_Server/run_test.pl: - - Tests are converted to use new test framework and added to fuzz build. - -Sat Nov 21 14:20:19 UTC 2009 Abdullah Sowayan - - * tests/Bug_3766_Regression/Test.idl: - * tests/Bug_3766_Regression/TestI.h: - * tests/Bug_3766_Regression/TestI.cpp: - * tests/Bug_3766_Regression/client.cpp: - * tests/Bug_3766_Regression/server.cpp: - - Minor improvement to this test. Add a way for the client to - shut down the server so this test can pass on the scoreboard. - -Sat Nov 21 04:44:20 UTC 2009 Abdullah Sowayan - - * tao/VarOut_T.h: - * tao/VarOut_T.inl: - - Fixed Bug 3766. - -Fri Nov 20 19:52:15 UTC 2009 Abdullah Sowayan - - * tao/VarOut_T.h: - * tao/VarOut_T.inl: - - Revert the changes and reopen Bug 3766. The prior commit causes build issues. - -Fri Nov 20 18:46:27 UTC 2009 Abdullah Sowayan - - * tao/VarOut_T.h: - * tao/VarOut_T.inl: - - Fixed Bug 3766. - -Fri Nov 20 16:55:01 UTC 2009 Yan Dai - - * NEWS: - - Update for next release. - -Fri Nov 20 13:53:51 UTC 2009 Jeff Parsons - - * NEWS: - - Update for next release. - -Fri Nov 20 13:02:24 UTC 2009 Denis Budko - - * orbsvcs/tests/Security/Callback/server.cpp: - - Test is converted to use new test framework and added to fuzz build. - -Fri Nov 20 10:03:43 UTC 2009 Marcel Smit - - * tests/Bug_3766_Regression/server.cpp: - Resolved compiler error related to invisible - characters on Linux. - -Fri Nov 20 09:28:50 UTC 2009 Denis Budko - - * orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl: - * orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl: - * orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl: - * orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl: - * orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl: - * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl: - * orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl: - * orbsvcs/tests/Security/EndpointPolicy/run_test.pl: - * DevGuideExamples/Multithreading/ThreadPool/MessengerServer.cpp: - * DevGuideExamples/Multithreading/ThreadPool/MessengerClient.cpp: - * DevGuideExamples/Multithreading/ThreadPool/run_test.pl: - * DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp: - * DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp: - * DevGuideExamples/Multithreading/GracefulShutdown/run_test.pl: - * DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp: - * DevGuideExamples/Multithreading/ThreadPerConnection/MessengerClient.cpp: - * DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl: - * DevGuideExamples/AMH_AMI/inner_server.cpp: - * DevGuideExamples/AMH_AMI/client.cpp: - * DevGuideExamples/AMH_AMI/middle_server.cpp: - * DevGuideExamples/AMH_AMI/run_test.pl: - * tests/OctetSeq/run_test1.pl: - * tests/OctetSeq/run_test2.pl: - * tests/OctetSeq/run_test.pl: - * tests/Bug_1330_Regression/server.cpp: - * tests/Bug_1330_Regression/run_test.pl: - * tests/Leader_Followers/run_test.pl: - * tests/NestedUpcall/MT_Client_Test/run_test.pl: - * tests/Bug_2702_Regression/run_test.pl: - * tests/IPV6/run_test.pl: - * tests/MProfile_Connection_Timeout/run_test.pl: - - Tests are converted to use new test framework and added to fuzz build. - -Fri Nov 20 08:56:26 UTC 2009 Vladimir Zykov - - * tests/Bug_3755_Regression/server.cpp: - * tests/Bug_3755_Regression/run_test.pl: - * bin/tao_orb_tests.lst: - Fixed this test on Win32 and disabled it from compact, - minimum and single threaded builds. - -Fri Nov 20 08:34:48 UTC 2009 Marcel Smit - - * examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h: - * examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp: - * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h: - * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp: - Resolved compiler errors related to the IDL compiler - change (see see Tue Nov 17 20:47:27 UTC 2009 Jeff Parsons - for more details). - -Thu Nov 19 20:18:53 UTC 2009 Abdullah Sowayan - - * tests/Bug_3766_Regression/Test.idl: - * tests/Bug_3766_Regression/TestI.h: - * tests/Bug_3766_Regression/TestI.cpp: - * tests/Bug_3766_Regression/client.cpp: - - Extend this test to test Variable sized types in addition - to Fixed size types. - -Thu Nov 19 19:50:30 UTC 2009 Abdullah Sowayan - - * bin/tao_orb_tests.lst: - - Add BUG_3766_Regression to the list of tests to run. - -Thu Nov 19 15:40:53 UTC 2009 Abdullah Sowayan - - * tests/Bug_3766_Regression: - * tests/Bug_3766_Regression/Bug_3766_Regression.mpc: - * tests/Bug_3766_Regression/Test.idl: - * tests/Bug_3766_Regression/TestI.h: - * tests/Bug_3766_Regression/TestI.cpp: - * tests/Bug_3766_Regression/run_test.pl: - * tests/Bug_3766_Regression/server.cpp: - - Added a regression test for Bugzilla 3766. - -Thu Nov 19 12:38:10 UTC 2009 Denis Budko - - * tests/Bug_2234_Regression/server.cpp: - - Test is converted to use new test framework and added to fuzz build. - -Thu Nov 19 08:25:13 UTC 2009 Denis Budko - - * orbsvcs/tests/Trading/export_test.cpp: - * orbsvcs/tests/Trading/run_test.pl: - * orbsvcs/tests/Security/Callback/server.cpp: - * orbsvcs/tests/Security/Callback/client.cpp: - * orbsvcs/tests/Security/Callback/run_test.pl: - * orbsvcs/tests/Security/mixed_security_test/run_test.pl: - * orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp: - * orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp: - * orbsvcs/tests/Security/ssliop_CSD/run_test.pl: - * orbsvcs/examples/CosEC/Simple/Service.cpp: - * orbsvcs/examples/CosEC/Simple/Supplier.cpp: - * orbsvcs/examples/CosEC/Simple/Consumer.cpp: - * orbsvcs/examples/CosEC/Simple/run_test.pl: - * tests/AMI_Buffering/run_timeout.pl: - * tests/AMI_Buffering/run_buffer_size.pl: - * tests/AMI_Buffering/run_timeout_reactive.pl: - * tests/AMI_Buffering/run_test.pl: - * tests/Big_Request_Muxing/run_test.pl: - * tests/Bug_3743_Regression/run_test.pl: - * tests/Bug_3531_Regression/client.cpp: - * tests/Bug_3531_Regression/server.cpp: - * tests/Bug_3531_Regression/run_test.pl: - * tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp: - * tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl: - * tests/Server_Connection_Purging/server.cpp: - * tests/Server_Connection_Purging/run_test.pl: - * tests/Oneway_Buffering/run_timeout.pl: - * tests/Oneway_Buffering/run_message_count.pl: - * tests/Oneway_Buffering/run_buffer_size.pl: - * tests/Oneway_Buffering/run_timeout_reactive.pl: - * tests/Oneway_Buffering/run_test.pl: - * bin/tao_other_tests.lst: - * bin/tao_orb_tests.lst: - - Tests are converted to use new test framework and added to fuzz build. - -Wed Nov 18 12:58:16 UTC 2009 Denis Budko - - * orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl: - * orbsvcs/tests/Bug_2925_Regression/run_test.pl: - * orbsvcs/tests/Security/Secure_Invocation/run_test.pl: - * orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp: - * orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp: - * orbsvcs/tests/Security/Bug_2908_Regression/run_test.pl: - * orbsvcs/tests/Security/BiDirectional/run_test.pl: - * orbsvcs/tests/Security/Big_Request/run_test.pl: - * orbsvcs/tests/HTIOP/BiDirectional/run_test.pl: - * orbsvcs/tests/Property/run_test.pl: - * orbsvcs/tests/Bug_2316_Regression/client.cpp: - * orbsvcs/tests/Bug_2316_Regression/server.cpp: - * orbsvcs/tests/Bug_2316_Regression/run_test.pl: - * orbsvcs/tests/Bug_2615_Regression/client.cpp: - * orbsvcs/tests/Bug_2615_Regression/server.cpp: - * orbsvcs/tests/Bug_2615_Regression/run_test.pl: - * orbsvcs/tests/Bug_3216_Regression/run_test.pl: - * orbsvcs/tests/Bug_2709_Regression/client.cpp: - * orbsvcs/tests/Bug_2709_Regression/server.cpp: - * orbsvcs/tests/Bug_2709_Regression/run_test.pl: - * orbsvcs/tests/IOR_MCast/run_test_ipv6.pl: - * orbsvcs/tests/Bug_3215_Regression/run_test.pl: - * orbsvcs/tests/Bug_2287_Regression/run_test.pl: - * DevGuideExamples/SmartProxies/MessengerServer.cpp: - * DevGuideExamples/SmartProxies/LoggerServer.cpp: - * DevGuideExamples/SmartProxies/MessengerClient.cpp: - * DevGuideExamples/SmartProxies/run_test.pl: - * performance-tests/Latency/DSI/run_test.pl: - * performance-tests/Latency/Deferred/run_test.pl: - * performance-tests/Latency/DII/run_test.pl: - * performance-tests/Latency/AMI/run_test.pl: - * performance-tests/Throughput/run_test.pl: - * tests/AMI_Buffering/run_message_count.pl: - * tests/Bug_1495_Regression/run_test_complex.pl: - * tests/Bug_1495_Regression/run_test.pl: - * tests/Crashed_Callback/run_test.pl: - * tests/BiDirectional/run_test_bug3282.pl: - * tests/Bug_1020_Basic_Regression/run_test.pl: - * tests/CallbackTest/run_test_ipv6.pl: - * tests/CallbackTest/run_test_mixed_ip.pl: - * tests/Bug_2289_Regression/run_test.pl: - * tests/DIOP/run_test_ipv6.pl: - * tests/DIOP/run_test.pl: - * tests/NestedUpcall/Triangle_Test/run_test.pl: - * tests/MT_Timeout/run_test.pl: - * tests/Single_Read/server.cpp: - * tests/Single_Read/test_i.cpp: - * tests/Single_Read/run_test.pl: - * tests/Single_Read/test_i.h: - * examples/Logging/run_test.pl: - * examples/Simple/time-date/run_test.pl: - * examples/PluggableUDP/tests/Performance/run_test_ipv6.pl: - * examples/PluggableUDP/tests/Performance/run_test.pl: - - Tests are converted to use new test framework and added to fuzz build. - -Wed Nov 18 11:09:55 UTC 2009 Marcel Smit - - * examples/Kokyu_dsrt_schedulers/FP_Scheduler.h: - * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp: - * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h: - * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp: - * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h: - * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp: - Added policy_type implementation. As a result of - change in the IDL compiler (see Tue Nov 17 - 20:47:27 UTC 2009 Jeff Parsons for more details). - -Tue Nov 17 20:47:27 UTC 2009 Jeff Parsons - - * TAO_IDL/ast/ast_decl.cpp: - * TAO_IDL/be/be_visitor_interface.cpp: - * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: - * TAO_IDL/be/be_visitor_operation/operation_ch.cpp: - * TAO_IDL/be/be_visitor_operation.cpp: - - Cosmetic changes. - - * TAO_IDL/be/be_interface.cpp: - - Fixed bug in stub header code generation for local interfaces. - Operations inherited from non-local interfaces are re-generated - as pure virtual, but the operations associated with attributes - were getting skipped. Thanks to Marcel Smit - and Johnny Willemsen - for reporting the problem. - -Tue Nov 17 17:18:51 UTC 2009 Vladimir Zykov - - * tests/Bug_3755_Regression/server.cpp: - Extended test's output. - -Tue Nov 17 14:43:36 UTC 2009 Denis Budko - - * bin/tao_other_tests.lst: - - Test, which is not converted now, is disabled in FUZZ build. - -Tue Nov 17 13:49:10 UTC 2009 Denis Budko - - * bin/tao_other_tests.lst: - * bin/tao_orb_tests.lst: - - Tests, which are not converted now, are disabled in FUZZ build. - -Tue Nov 17 11:45:03 UTC 2009 Denis Budko - - * orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp: - * orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp: - * orbsvcs/DevGuideExamples/Security/ParticipatingApp/run_test.pl: - * DevGuideExamples/Multithreading/Reactive/MessengerServer.cpp: - * DevGuideExamples/Multithreading/Reactive/MessengerClient.cpp: - * DevGuideExamples/Multithreading/Reactive/run_test.pl: - * DevGuideExamples/ValueTypes/Messenger/MessengerServer.cpp: - * DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp: - * DevGuideExamples/ValueTypes/Messenger/run_test.pl: - * DevGuideExamples/ValueTypes/Bank/server.cpp: - * DevGuideExamples/ValueTypes/Bank/run_test.pl: - * DevGuideExamples/ValueTypes/Bank/client.cpp: - * DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp: - * DevGuideExamples/LocalObjects/ServantLocator/run_test.pl: - * DevGuideExamples/GettingStarted/MessengerServer.cpp: - * DevGuideExamples/GettingStarted/MessengerClient.cpp: - * DevGuideExamples/GettingStarted/run_test.pl: - * DevGuideExamples/PortableInterceptors/Auth/MessengerServer.cpp: - * DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp: - * DevGuideExamples/PortableInterceptors/Auth/run_test.pl: - * DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerServer.cpp: - * DevGuideExamples/PortableInterceptors/SimpleCodec/MessengerClient.cpp: - * DevGuideExamples/PortableInterceptors/SimpleCodec/run_test.pl: - * DevGuideExamples/PortableInterceptors/IOR/MessengerServer.cpp: - * DevGuideExamples/PortableInterceptors/IOR/MessengerClient.cpp: - * DevGuideExamples/PortableInterceptors/IOR/run_test.pl: - * DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp: - * DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp: - * DevGuideExamples/PortableInterceptors/PICurrent/run_test.pl: - * DevGuideExamples/RTCORBA/MessengerServer.cpp: - * DevGuideExamples/RTCORBA/run_test.pl: - * DevGuideExamples/Messaging/AMIcallback/MessengerServer.cpp: - * DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp: - * DevGuideExamples/Messaging/AMIcallback/run_test.pl: - * DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerServer.cpp: - * DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp: - * DevGuideExamples/Messaging/RelativeRoundtripTimeout/run_test.pl: - * tests/OBV/Supports/client.cpp: - * tests/OBV/Supports/server.cpp: - * tests/OBV/Supports/run_test.pl: - * tests/Bug_2683_Regression/run_test.pl: - * tests/Exposed_Policies/run_test.pl: - * bin/tao_other_tests.lst: - * bin/tao_orb_tests.lst: - * examples/PluggableUDP/tests/SimplePerformance/client.cpp: - * examples/PluggableUDP/tests/SimplePerformance/run_test_ipv6.pl: - * examples/PluggableUDP/tests/SimplePerformance/server.cpp: - * examples/PluggableUDP/tests/SimplePerformance/run_test.pl: - - Tests are converted to use new test framework and added to fuzz build. - -Mon Nov 16 15:52:21 UTC 2009 Vladimir Zykov - - * bin/tao_orb_tests.lst: - Bug 3755 marked as fixed. - - * tao/PI_Server/PI_Server_Loader.cpp: - * tao/PI_Server/PI_Server_Loader.h: - * tao/Messaging/Messaging_Loader.h: - * tao/Messaging/Messaging_Loader.cpp: - * tao/BiDir_GIOP/BiDirGIOP.cpp: - * tao/BiDir_GIOP/BiDirGIOP.h: - * tao/RTScheduling/RTScheduler_Loader.cpp: - * tao/RTScheduling/RTScheduler_Loader.h: - * tao/ZIOP/ZIOP.cpp: - * tao/ZIOP/ZIOP.h: - * tao/CSD_Framework/CSD_Framework_Loader.cpp: - * tao/CSD_Framework/CSD_Framework_Loader.h: - * tao/RTCORBA/RT_ORB_Loader.h: - * tao/RTCORBA/RT_ORB_Loader.cpp: - Fixed bug 3755. Now library initialization guard is moved - to a loader which does the initialization. Since the loader is - unique per gestalt then the initialization is executed once per - gestalt and not once per process. - -Mon Nov 16 15:44:30 UTC 2009 Vladimir Zykov - - * tests/Bug_3748_Regression/run_test.pl: - Extended the time for starting client even more. - -Fri Nov 13 19:49:54 UTC 2009 Jeff Parsons - - * TAO_IDL/be_include/be_interface.h: - * TAO_IDL/be/be_interface.cpp: - - Added 2 private methods, called from traverse_inheritance_graph(), - to enqueue base components or base homes. Making these steps - into method calls allows them to be done tail-recursively - rather than iteratively, so the chain of parents can be - enqueued in the correct order for generating copy constructors - and the like. - -Fri Nov 13 10:17:33 UTC 2009 Denis Budko - - * orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl: - - Warring in fuzz build was fixed. - -Fri Nov 13 09:18:57 UTC 2009 Denis Budko - - * orbsvcs/tests/Bug_3486_Regression/run_test.pl: - * orbsvcs/tests/FaultTolerance/IOGRManipulation/run_test.pl: - * orbsvcs/tests/Notify/Bug_3663_Regression/run_test.pl: - * orbsvcs/tests/Notify/Bug_3646d_Regression/run_test.pl: - * orbsvcs/tests/Bug_2137_Regression/run_test.pl: - * DevGuideExamples/LocalObjects/ServantLocator/MessengerServer.cpp: - * DevGuideExamples/LocalObjects/ServantLocator/MessengerClient.cpp: - * DevGuideExamples/LocalObjects/ServantLocator/run_test.pl: - * DevGuideExamples/RTCORBA/MessengerServer.cpp: - * DevGuideExamples/RTCORBA/MessengerClient.cpp: - * DevGuideExamples/RTCORBA/run_test.pl: - * tests/Stack_Recursion/run_test.pl: - * tests/Timed_Buffered_Oneways/run_test.pl: - * tests/Bug_2234_Regression/client.cpp: - * tests/Bug_2234_Regression/server.cpp: - * tests/Bug_2234_Regression/run_test.pl: - * tests/Bug_2768_Regression/server.cpp: - * tests/Bug_2768_Regression/run_test.pl: - * tests/Blocking_Sync_None/run_test.pl: - * tests/Crash_On_Write/run_test.pl: - * tests/Bug_3068_Regression/run_test.pl: - * tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl: - * tests/Bug_2683_Regression/server.cpp: - * tests/Bug_2683_Regression/run_test.pl: - * tests/RTScheduling/Scheduling_Interceptor/run_test.pl: - * tests/File_IO/run_test.pl: - * tests/Bug_1568_Regression/run_test.pl: - * tests/Reliable_Oneways/run_sync_with_transport.pl: - * tests/Reliable_Oneways/run_sync_none.pl: - * tests/Reliable_Oneways/run_sync_with_server.pl: - * tests/Reliable_Oneways/run_sync_with_target.pl: - * bin/tao_other_tests.lst: - * bin/tao_orb_tests.lst: - - Tests are converted to use new test framework and added to fuzz build. - -Fri Nov 13 00:33:49 UTC 2009 Yan Dai - - * orbsvcs/Notify_Service/Notify_Service.cpp: - - Added ACE_STATIC_SVC_REQUIRE for ACE_Logging_Stragey service - to fix loading issue in static builds. - -Thu Nov 12 20:39:18 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_interface.cpp: - - Fixed bug in the logic of operation table generation for - components and homes. - -Thu Nov 12 12:12:51 UTC 2009 Johnny Willemsen - - * tests/AMH_Exceptions/run_test.pl: - * tests/AMI_Timeouts/run_test.pl: - * tests/Portable_Interceptors/AdvSlot/run_test.pl: - * tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl: - * tests/Portable_Interceptors/Bug_2133/run_test.pl: - * tests/Portable_Interceptors/Bug_3080/run_test.pl: - * tests/Portable_Interceptors/Bug_3582/run_test.pl: - Fixed fuzz - -Thu Nov 12 08:24:00 UTC 2009 Denis Budko - - * tests/IORManipulation/filter/run_test.pl - * tests/Connection_Failure/run_test.pl - * orbsvcs/DevGuideExamples/NamingService/Naming_Server/run_test.pl - * orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl - * orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl - * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl - * orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl - * orbsvcs/tests/unit/Notify/MC/Control/run_test.pl - * orbsvcs/tests/unit/Trading/Interpreter/run_test.pl - * orbsvcs/tests/Bug_2074_Regression/run_test.pl - * tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl - * performance-tests/Latency/Collocation/run_test.pl - * performance-tests/POA/Object_Creation_And_Registration/run_test.pl - * orbsvcs/tests/Bug_2377_Regression/run_test.pl - * orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl - * orbsvcs/tests/unit/Notify/MC/MonitorManager/run_test.pl - Fixed fuzz errors and some time interval functions usage. - -Thu Nov 12 07:13:51 UTC 2009 Johnny Willemsen - - * tests/PortableInterceptors/AdvSlot/run_test.pl - * tests/PortableInterceptors/AdvSlotDblCpy/run_test.pl - * tests/PortableInterceptors/Bug_2133/run_test.pl - * tests/PortableInterceptors/Bug_2510_Regression/run_test.pl - * tests/PortableInterceptors/Bug_3080/run_test.pl - * tests/PortableInterceptors/Bug_3582/run_test.pl - * tests/PortableInterceptors/Dynamic/run_test.pl - * tests/PortableInterceptors/IORInterceptor/run_test.pl - * tests/PortableInterceptors/ORB_Shutdown/run_test.pl - * tests/PortableInterceptors/PICurrent/run_test.pl - Fixed fuzz errors - -Wed Nov 11 15:33:51 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: - - Removed ancestors from scope visitation for the LEM IDL - context classes. This closes [BUGID:3761]. - - * TAO_IDL/ast/ast_template_interface.cpp: - - Cosmetic changes. - -Tue Nov 10 20:14:12 UTC 2009 Yan Dai - - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h: - - Added TAO_HAS_MONITOR_FRAMEWORK==1 guard so it won't be compiled when - monitor framework is disabled. - -Tue Nov 10 19:07:43 UTC 2009 Jeff Parsons - - * TAO_IDL/include/idl_global.h: - * TAO_IDL/util/utl_global.cpp: - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - When adding uses multiple related constructs to the - AST, we now use the instantiating port name (if any) - as a prefix to the constructed type names. - - * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: - * TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp: - * TAO_IDL/be/be_visitor_component/servant_svh.cpp: - * TAO_IDL/be/be_visitor_component/executor_exh.cpp: - * TAO_IDL/be/be_visitor_component/context_svh.cpp: - * TAO_IDL/be/be_visitor_component/executor_exs.cpp: - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - * TAO_IDL/be/be_visitor_component/context_svs.cpp: - * TAO_IDL/be/be_visitor_component_scope.cpp: - * TAO_IDL/be_include/be_visitor_component_scope.h: - * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: - - Fixed bugs in the handling of the port name when - it is used in the construction of facet and - receptacle operation names. This fix closes [BUGID:3760]. - -Tue Nov 10 18:15:44 UTC 2009 Yan Dai - - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp: - - Added TAO_HAS_MONITOR_FRAMEWORK==1 guard so it won't be compiled when - monitor framework is disabled. - -Tue Nov 10 13:37:57 UTC 2009 Johnny Willemsen - - * tests/Param_Test/run_test.pl: - * tests/Abstract_Interface/run_test.pl: - Don't use hardcoded timeouts - -Tue Nov 10 12:36:57 UTC 2009 Denis Budko - - * tests/IORManipulation/filter/run_test.pl - * tests/Connection_Failure/run_test.pl - * orbsvcs/DevGuideExamples/NamingService/Naming_Server/run_test.pl - * orbsvcs/tests/unit/Notify/MC/Statistic/run_test.pl - * orbsvcs/tests/unit/Notify/MC/Statistic_Registry/run_test.pl - * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/run_test.pl - * orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl - * orbsvcs/tests/unit/Notify/MC/Control/run_test.pl - * orbsvcs/tests/unit/Trading/Interpreter/run_test.pl - * orbsvcs/tests/Bug_2074_Regression/run_test.pl - * tests/GIOP_Fragments/PMB_With_Fragments/run_test.pl - * tests/Optimized_Connection/run_test.pl - * performance-tests/Latency/Collocation/run_test.pl - * performance-tests/POA/Object_Creation_And_Registration/run_test.pl - * orbsvcs/tests/Bug_2137_Regression/run_test.pl - * orbsvcs/tests/Bug_2377_Regression/run_test.pl - * orbsvcs/tests/Bug_2377_Regression/run_test_ipv6.pl - - Simple porting to new test framework. - -Mon Nov 9 19:21:53 UTC 2009 Jeff Parsons - - * TAO_IDL/be_include/be_field.h: - * TAO_IDL/be/be_field.cpp: - - Added flag to check whether a provides or uses port's - name has already been prefixed with an extended port - or mirrorport name. - - * TAO_IDL/be/be_visitor_component\context_ex_idl.cpp: - - When visiting a component, changed the call to visit_scope() - to visit_component_scope() to take advantage of special - properties in the visitor base class. - - * TAO_IDL/be/be_visitor_component_scope.cpp: - - Fixed a bug in the prefixing of uses or provides port's - name with the extended port or mirror port's name. - - * TAO_IDL/be/be_interface.cpp: - - Disable code generation of release() and is_nil() overrides - for children of abstract interfaces if the child itself is - included from another IDL file, avoiding possible multiple - defintions of these methods. This item closes [BUGID:3759]. - -Mon Nov 9 14:58:34 UTC 2009 Jeff Parsons - - * TAO_IDL/driver/drv_preproc.cpp: - * TAO_IDL/driver/drv_args.cpp: - - Cosmetic changes. - - * TAO_IDL/tao_idl.cpp: - - Added the (optional) behavior of creating a new IDL file - containing #includes of the individual IDL files on the - command line, or in the directory tree specified by -r - on some backends. Processing this 'container' IDL file - results in significant performance improvement when - processing multiple IDL files, especially if they include - Components.idl, since all the middleware IDL is then - processed only once. - - * TAO_IDL/util/utl_global.cpp: - * TAO_IDL/include/idl_global.h: - - Added a flag to toggle the above behavior, set by a - backend (currently only idl_to_picml) that processes - multiple IDL files into one output. - -Mon Nov 9 12:41:31 UTC 2009 Johnny Willemsen - - * TAO_IDL/be/be_helper.cpp: - Removed empty line - - * TAO_IDL/be/be_visitor_component/executor_exh.cpp: - Generate doxygen grouping comments - -Mon Nov 9 03:29:31 UTC 2009 William R. Otte - - * TAO_IDL/be/be_interface.cpp: - - Added the process ID to the temporary file used for gperf, due - to a perhaps weak random number generator not being random - enough for parallel builds on OS X. - -Fri Nov 6 10:13:00 UTC 2009 Simon Massey - - * TAO_IDL/driver/drv_preproc.cpp: - * TAO_IDL/driver/drv_mcpp_preproc.cpp: - - Updated DRV_add_include_path() space within roots and - directory slash handling. (TAO782) It wasn't detecting - or handling spaced roots or trailing directory slashes - correctly. - - * TAO_IDL/util/utl_global.cpp: - - Allow for the gperf absolute directory path to contain spaces. - -Thu Nov 5 12:48:31 UTC 2009 Johnny Willemsen - - * TAO_IDL/be/be_codegen.cpp: - Don't generate an include for CIAO_common.h anymore - -Thu Nov 5 12:24:52 UTC 2009 Vladimir Zykov - - * tests/Bug_3748_Regression/run_test.pl: - Extended the time for running client. - -Thu Nov 5 10:48:07 UTC 2009 Vladimir Zykov - - * tests/Bug_3748_Regression/server.cpp: - Fixed warnings. - -Wed Nov 4 20:57:08 UTC 2009 Yan Dai - - * MPC/config/notify_monitor_control.mpb: - - Disable this feature on wince=1 build. - -Tue Nov 3 17:32:03 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/fe_init.cpp: - - Added IDL3+ keywords to the list used to check for clashes - and leading underscore retention. - - * TAO_IDL/fe/y.tab.cpp: - * TAO_IDL/fe/idl.yy: - - Added creation of uses multiple-specific struct and sequence - nodes in the AST when the uses multiple port - appears in an extended port declaration, identically to what - is now added for a standalone uses multiple port. - -Mon Nov 2 22:59:48 UTC 2009 Yan Dai - - * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h: - * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp: - - Made MonitorManager not start ORBTask if MC is not required. - This should resolve Notify tests failure on static builds. - - * orbsvcs/tests/Notify/MC/notify.conf: - - Removed this file as it'll be generated when running the test - and cause setup warning on scoreboard. - -Mon Nov 2 16:54:24 UTC 2009 Steven Stallion - - * tests/RTCORBA/Bug_3643_Regression/test_i.cpp: - - Dropped spurious use of NDEBUG; tests should not predicate debug - logging based on the (lack of) presence of NDEBUG. - -Fri Oct 30 16:25:53 UTC 2009 Vladimir Zykov - - * tests/Bug_3755_Regression/orb1_svc.conf: - * tests/Bug_3755_Regression/orb2_svc.conf: - * tests/Bug_3755_Regression/server.cpp: - * tests/Bug_3755_Regression/run_test.pl: - * tests/Bug_3755_Regression/Bug_3755_Regression.mpc: - * bin/tao_orb_tests.lst: - Added a test for bug#3755 and scheduled it for run. - -Fri Oct 30 14:50:00 UTC 2009 Simon Massey - - * TAO_IDL/driver/drv_preproc.cpp: - Improve the DRV_add_include_path() space within roots and - directory slash handling. (TAO782) - -Fri Oct 30 13:08:30 UTC 2009 Vladimir Zykov - - * tests/Bug_3748_Regression/client.cpp: - * tests/Bug_3748_Regression/Bug_3748_Regression.mpc: - * tests/Bug_3748_Regression/Server_ORBInitializer.h: - * tests/Bug_3748_Regression/Hello.cpp: - * tests/Bug_3748_Regression/Test.idl: - * tests/Bug_3748_Regression/server.cpp: - * tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp: - * tests/Bug_3748_Regression/Makefile.am: - * tests/Bug_3748_Regression/Hello.h: - * tests/Bug_3748_Regression/Test_Protocols_Hooks.h: - * tests/Bug_3748_Regression/README: - * tests/Bug_3748_Regression/run_test.pl: - * tests/Bug_3748_Regression/Server_ORBInitializer.cpp: - * bin/tao_orb_tests.lst: - Complitely rewrote the test for bug#3748 and changed configs - in which this test can run. - -Fri Oct 30 06:15:53 UTC 2009 Johnny Willemsen - - Merged changes from Jeff for port/porttype/mirrorport to head - - Thu Oct 29 12:50:35 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_visitor_connector.cpp: - * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: - * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: - * TAO_IDL/be_include/be_visitor_connector.h: - * TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h: - * TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h: - - New visitors, implementing (so far) part of the code - generation of connector executors. - - * TAO_IDL/be/be_codegen.cpp: - * TAO_IDL/be/be_visitor_component/component_exh.cpp: - * TAO_IDL/be/be_visitor_component/component_exs.cpp: - * TAO_IDL/be/be_global.cpp: - * TAO_IDL/be/be_visitor_component_scope.cpp: - * TAO_IDL/be_include/be_codegen.h: - * TAO_IDL/be_include/be_visitor_component_scope.h: - * TAO_IDL/be_include/be_global.h: - - - Factored out code for generating entrypoint declarations - and definitions. - - - Added mechanism to generate includes of DDS type - support files for the connector executor. - - Sun Oct 25 17:10:27 UTC 2009 Jeff Parsons - - * TAO_IDL/be_include/be_visitor_component_scope.h: - * TAO_IDL/be/be_visitor_component_scope.cpp: - - Moved these files from the be_visitor_component - subdirectory, so the visitor would be accessible - as a base class to be_visitor_ccm_pre_proc. Also - add override of base class (be_visitor_scope) - method pre_proces(), to extend the generated - names of provides and uses methods with a - prefix of the port or mirrorport name, if any. - - * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: - * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h: - - Made class be_visitor_component_scope the base class - of this visitor, thereby adding support for simple - ports, mirrorports and porttypes. - - * TAO_IDL/be_include/be_visitor_component.h: - * TAO_IDL/be/be_visitor_component.cpp: - - Removed relocated files from these file lists. - - Thu Oct 22 20:39:02 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_visitor_component/component_scope.cpp: - * TAO_IDL/be_include/be_visitor_component/component_scope.h: - - Added code generation for mirror ports. - - * TAO_IDL/be_include/be_visitor_component/facet_svh.h: - * TAO_IDL/be_include/be_visitor_component/facet_svs.h: - * TAO_IDL/be/be_visitor_component/facet_svh.cpp: - * TAO_IDL/be/be_visitor_component/facet_svs.cpp: - - Changed base class to be_visitor_component_scope to - pull in the mirror port support. - - Thu Oct 22 19:21:26 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_visitor_component/facet_exs.cpp: - * TAO_IDL/be/be_visitor_component/executor_exh.cpp: - * TAO_IDL/be/be_visitor_component/executor_exs.cpp: - * TAO_IDL/be/be_visitor_component/facet_exh.cpp: - * TAO_IDL/be_include/be_visitor_component/executor_exh.h: - * TAO_IDL/be_include/be_visitor_component/executor_exs.h: - * TAO_IDL/be_include/be_visitor_component/facet_exh.h: - * TAO_IDL/be_include/be_visitor_component/facet_exs.h: - - New files, containing new visitors that handle code - generation class-by-class in the executor implementation. - - * TAO_IDL/be/be_provides.cpp: - * TAO_IDL/be/be_attribute.cpp: - * TAO_IDL/be/be_consumes.cpp: - * TAO_IDL/be/be_field.cpp: - * TAO_IDL/be/be_publishes.cpp: - * TAO_IDL/be/be_uses.cpp: - * TAO_IDL/be/be_emits.cpp: - * TAO_IDL/be/be_sequence.cpp: - * TAO_IDL/be_include/be_field.h: - * TAO_IDL/be_include/be_publishes.h: - * TAO_IDL/be_include/be_component.h: - * TAO_IDL/be_include/be_uses.h: - * TAO_IDL/be_include/be_provides.h: - * TAO_IDL/be_include/be_attribute.h: - * TAO_IDL/be_include/be_emits.h: - * TAO_IDL/be_include/be_consumes.h: - * TAO_IDL/be_include/be_sequence.h: - - Add non-virtual override of frontend methods that - fetch the referenced provides, uses, publishes, emits, - consumes, field, or base type. This addition concentrates - the narrowing to the backend type so it need not be - done over and over in the visitors. - - * TAO_IDL/be/be_visitor_component.cpp: - * TAO_IDL/be_include/be_visitor_component.h: - - Added new visitor files. - - * TAO_IDL/be/be_interface.cpp: - * TAO_IDL/be_include/be_interface.h: - - Renamed static method facet_op_attr_decl_helper to - op_attr_decl_helper, since its use is now more general. - - * TAO_IDL/be_include/be_visitor_component/component_exh.h: - * TAO_IDL/be_include/be_visitor_component/component_exs.h: - * TAO_IDL/be/be_visitor_component/component_exh.cpp: - * TAO_IDL/be/be_visitor_component/component_exs.cpp: - - Split code out of these visitors and distributed it - among the new visitors. - - * TAO_IDL/be/be_visitor_operation/operation_exs.cpp: - * TAO_IDL/be/be_visitor_operation/operation_svs.cpp: - * TAO_IDL/be/be_visitor_interface/interface_svs.cpp: - * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: - * TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp: - * TAO_IDL/be/be_visitor_component/servant_svh.cpp: - * TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp: - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - * TAO_IDL/be/be_visitor_attribute.cpp: - * TAO_IDL/be/be_visitor_attribute/attribute.cpp: - * TAO_IDL/be_include/be_visitor_operation/operation_svs.h: - * TAO_IDL/be_include/be_visitor_component/component.h: - - Minor or cosmetic changes. - - Wed Oct 21 20:40:45 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_visitor_extended_port.cpp: - * TAO_IDL/be_include/be_visitor_extended_port.h: - - Removed these files, should have been removed in - - Wed Oct 21 14:10:35 UTC 2009 Jeff Parsons - - - * TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp: - * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp: - * TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp: - * TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h: - * TAO_IDL/be_include/be_visitor_component/context_ex_idl.h: - * TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h: - - New files, split executor IDL code generation into separate - visitors for the facet, context and executor classes. Also - added support for simple extended ports and porttypes. - - * TAO_IDL/be/be_visitor_component.cpp: - * TAO_IDL/be_include/be_visitor_component.h: - - Added new files to the include lists. - - * TAO_IDL/be/be_util.cpp: - * TAO_IDL/be_include/be_util.h: - - Moved utility methods to generate nested namespaces - to this class, so they can be visible to all visitors. - - * TAO_IDL/be/be_visitor_component/servant_svh.cpp: - * TAO_IDL/be/be_visitor_component/context_svh.cpp: - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - * TAO_IDL/be/be_visitor_component/context_svs.cpp: - * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp: - * TAO_IDL/be/be_visitor_component/component_scope.cpp: - * TAO_IDL/be_include/be_visitor_component/component_scope.h: - * TAO_IDL/be_include/be_visitor_component/servant_svh.h: - * TAO_IDL/be_include/be_visitor_component/context_svh.h: - * TAO_IDL/be_include/be_visitor_component/servant_svs.h: - * TAO_IDL/be_include/be_visitor_component/context_svs.h: - * TAO_IDL/be_include/be_visitor_component/component_ex_idl.h: - - Moved visit method overrides for extended port, mirror port - and porttype to the base class be_visitor_component_scope. - In every case so far, the extended port (and eventually the - mirror port) traversal just fetches the porttype reference - and visits its scope, calling back the port kind traversal - methods that happen to be overridden in the original - visitor, so there's no need to reimplement these methods - over and over. - - Wed Oct 21 14:10:35 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_visitor_extended_port/extended_port_svs.cpp: - * TAO_IDL/be/be_visitor_extended_port/extended_port.cpp: - * TAO_IDL/be/be_visitor_extended_port/extended_port_svh.cpp: - * TAO_IDL/be_include/be_visitor_extended_port/extended_port_svs.h: - * TAO_IDL/be_include/be_visitor_extended_port/extended_port.h: - * TAO_IDL/be_include/be_visitor_extended_port/extended_port_svh.h: - - Removed these visitors, better use of polymorphism can be made - by just implementing their methods in the appropriate - component visitor. - - * TAO_IDL/be/be_visitor_component/facet_svh.cpp: - * TAO_IDL/be/be_visitor_component/facet_svs.cpp: - * TAO_IDL/be_include/be_visitor_component/facet_svh.h: - * TAO_IDL/be_include/be_visitor_component/facet_svs.h: - - Copied code from removed visitor methods above, and - removed visit_component() method. - - * TAO_IDL/be/be_visitor_component/component_svh.cpp: - * TAO_IDL/be/be_visitor_component/component_svs.cpp: - - Spawned facet visitors above with visit_component_scope() - call, eliminating the extra step of calling visit_component(). - - - * TAO_IDL/be_include/be_extended_port.h: - * TAO_IDL/be/be_extended_port.cpp: - - Overloaded port_type() method to return backend-specific - type, to eliminate many narrowing calls. - - Tue Oct 20 22:55:25 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_visitor_component/component_scope.cpp: - * TAO_IDL/be_include/be_visitor_component/component_scope.h: - - New files containing a new base class visitor, encapsulating - a scope visitation method that recurses over the scopes of - a component's ancestors, if any. - - * TAO_IDL/be/be_visitor_component.cpp: - * TAO_IDL/be/be_component.cpp: - * TAO_IDL/be/be_visitor_component/servant_svh.cpp: - * TAO_IDL/be/be_visitor_component/facet_svh.cpp: - * TAO_IDL/be/be_visitor_component/context_svh.cpp: - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - * TAO_IDL/be/be_visitor_component/facet_svs.cpp: - * TAO_IDL/be/be_visitor_component/context_svs.cpp: - * TAO_IDL/be_include/be_component.h: - * TAO_IDL/be_include/be_visitor_component/servant_svh.h: - * TAO_IDL/be_include/be_visitor_component/facet_svh.h: - * TAO_IDL/be_include/be_visitor_component/context_svh.h: - * TAO_IDL/be_include/be_visitor_component/facet_svs.h: - * TAO_IDL/be_include/be_visitor_component/servant_svs.h: - * TAO_IDL/be_include/be_visitor_component/context_svs.h: - * TAO_IDL/be_include/be_visitor_component.h: - - Replaced all occurrences of recursive scope iteration - with new visitor classes derived from the abstract - visitor above. - - Mon Oct 19 23:26:07 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_visitor_component/servant_svs.cpp: - * TAO_IDL/be/be_visitor_component/facet_svs.cpp: - * TAO_IDL/be/be_visitor_component/context_svs.cpp: - * TAO_IDL/be_include/be_visitor_component/facet_svs.h: - * TAO_IDL/be_include/be_visitor_component/servant_svs.h: - * TAO_IDL/be_include/be_visitor_component/context_svs.h: - - New files containing new visitors with code factored out - of class be_visitor_component_svs - - * TAO_IDL/be/be_visitor_component.cpp: - * TAO_IDL/be/be_visitor_component/facet_svh.cpp: - * TAO_IDL/be/be_visitor_component/context_svh.cpp: - * TAO_IDL/be/be_visitor_component/component_svs.cpp: - * TAO_IDL/be/be_visitor_attribute/component_init.cpp: - * TAO_IDL/be_include/be_visitor_component/component_svs.h: - * TAO_IDL/be_include/be_visitor_component.h: - - Changes stemming from the new visitors above. - - Fri Oct 16 19:54:38 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_visitor_component/servant_svh.cpp: - * TAO_IDL/be/be_visitor_component/facet_svh.cpp: - * TAO_IDL/be/be_visitor_component/context_svh.cpp: - * TAO_IDL/be_include/be_visitor_component/servant_svh.h: - * TAO_IDL/be_include/be_visitor_component/facet_svh.h: - * TAO_IDL/be_include/be_visitor_component/context_svh.h: - - New files, new visitors that contain code moved from - private methods in class be_visitor_component_svh. - - * TAO_IDL/be/be_provides.cpp: - - Fixed bug in code generation. - - * TAO_IDL/be/be_visitor_component.cpp: - * TAO_IDL/be_include/be_visitor_component.h: - - Added new visitor files. - - * TAO_IDL/be/be_visitor_component/component_exh.cpp: - - Removed debugging output. - - * TAO_IDL/be/be_visitor_component/component_svh.cpp: - * TAO_IDL/be_include/be_visitor_component/component_svh.h: - - Moved code out to new visitor above. - -Thu Oct 29 16:36:53 UTC 2009 Yan Dai - - * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp: - - Fixed a compilation error on wchar build. - -Thu Oct 29 15:34:15 UTC 2009 Vladimir Zykov - - * bin/tao_orb_tests.lst: - Disabled running tests 3531, 3647, and 3683 in NO_MESSAGING and - CORBA_E_MICRO builds since those tests are not built in such - setups. - -Thu Oct 29 14:56:17 UTC 2009 Vladimir Zykov - - * tests/Bug_3748_Regression/client.cpp: - * tests/Bug_3748_Regression/server.cpp: - * tests/Bug_3748_Regression/run_test.pl: - Temporarily made the output a bit more verbose. - -Thu Oct 29 02:12:40 UTC 2009 Yan Dai - - * orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp: - * tao/Monitor/Monitor_Impl.cpp: - - Fixed bugs that did not initialize and set last in Numric data. - - * orbsvcs/tests/Notify/MC/test_monitor.cpp: - - Corrected some expected values. - -Wed Oct 28 23:27:02 UTC 2009 Yan Dai - - * MPC/config/negotiate_codesets.mpb: - * MPC/config/notify_monitor_control.mpb: - * MPC/config/tao_notify_service.mpb: - * docs/notification/monitor.html: - * interop-tests/wchar/Client.java: - * interop-tests/wchar/interop_wchar.mpc: - * interop-tests/wchar/server.cpp: - * orbsvcs/Notify_Service/Notify_Service.cpp: - * orbsvcs/Notify_Service/Notify_Service.mpc: - * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h: - * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp: - * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h: - * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp: - * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h: - * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp: - * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h: - * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp: - * orbsvcs/orbsvcs/Notify/Buffering_Strategy.h: - * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp: - * orbsvcs/orbsvcs/Notify/Builder.cpp: - * orbsvcs/orbsvcs/Notify/Consumer.h: - * orbsvcs/orbsvcs/Notify/Consumer.inl: - * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h: - * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp: - * orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.cpp: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.h: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxyPushSupplier.h: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSequenceProxyPushSupplier.h: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorStructuredProxyPushSupplier.h: - * orbsvcs/orbsvcs/Notify/MonitorControlExt/NotifyMonitoringExt.idl: - * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h: - * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp: - * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h: - * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp: - * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h: - * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp: - * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h: - * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp: - * orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.h: - * orbsvcs/tests/Notify/MC/Notify_Structured_Push_Consumer.cpp: - * orbsvcs/tests/Notify/MC/Structured_Consumer.cpp: - * orbsvcs/tests/Notify/MC/Structured_Supplier.cpp: - * orbsvcs/tests/Notify/MC/notify.conf: - * orbsvcs/tests/Notify/MC/run_test.pl: - * orbsvcs/tests/Notify/MC/test_monitor.cpp: - * orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h: - * orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp: - * orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp: - * tao/Monitor/Monitor_Types.pidl: - - Merged following changes from OCI made between 1.5a p15 and p16 releases. - - - Added consumer-level queueing statistics to the Notification Service MC. - - Added queue-overflow statistics to the Notification Service MC. - - Modified Notification Service MC to work in static builds. - - Corrected an error that caused Notification Service MC statistics to fail - when -AllocateTaskPerProxy is used. - - QueueDepth have been changed to measure the number of entries rather than - attempting unsuccessfully to estimate the amount of memory used by the queue. - - Added TAO_EXPLICIT_NEGOTIATE_CODESETS macro to improve the ease of including - optional codeset support to Notify_Service in static builds. - -Wed Oct 28 06:09:33 UTC 2009 Johnny Willemsen - - * bin/tao_other_tests.lst: - Enabled a few tests for ce/fuzz - - * orbsvcs/tests/Notify/Bug_2926_Regression/run_test.pl: - * orbsvcs/tests/Notify/Bug_3688b_Regression/run_test.pl: - * orbsvcs/tests/Notify/Bug_3252_Regression/run_test.pl: - * orbsvcs/tests/Notify/Bug_3646b_Regression/run_test.pl - Converted to the new test framework - -Tue Oct 27 16:58:33 UTC 2009 Vladimir Zykov - - * bin/tao_orb_tests.lst: - Enabled Bug_3748_Regression in all builds except for single - threaded. - -Mon Oct 26 10:52:01 UTC 2009 Vladimir Zykov - - * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp: - * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h: - * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp: - * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h: - * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp: - * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h: - Fixed several memory leaks. Changed HTIOP Acceptor to use - strategies implemented in HTIOP_Acceptor_Impl.*. This was - required for proper fix for bug#3748. - - * tao/Acceptor_Impl.cpp: - Uncommented code for a fix for bug#3748. - -Thu Oct 22 10:47:21 UTC 2009 Johnny Willemsen - - * TAO_IDL/TAO_IDL_ACE.mwc: - Only list mpc files here - - * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp: - Updated a few of the comments we generate - -Tue Oct 20 22:58:21 UTC 2009 Jeff Parsons - - * TAO_IDL/TAO_IDL_ACE.mwc: - - Updated in accordance with the changes of - - Thu Oct 15 07:20:38 UTC 2009 Johnny Willemsen - -Tue Oct 20 12:09:06 UTC 2009 Johnny Willemsen - - * orbsvcs/Concurrency_Service/Concurrency_Service.cpp: - * orbsvcs/Concurrency_Service/Concurrency_Service.mpc: - * orbsvcs/CosEvent_Service/CosEvent_Service.cpp: - * orbsvcs/Event_Service/Event_Service.cpp: - * orbsvcs/Event_Service/Event_Service.mpc: - * orbsvcs/Notify_Service/Notify_Service.cpp: - * orbsvcs/Notify_Service/Notify_Service.mpc: - * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp: - * MPC/config/tao_notify_service.mpb: - Handle -ORBDeamon in these services directly, this is a work around - until bugzilla 3335 gets resolved. This fixes bugzilla 3656 - -Mon Oct 19 12:18:06 UTC 2009 Johnny Willemsen - - * orbsvcs/orbsvcs/Makefile.am: - Add Daemon_Utilities - - * orbsvcs/Naming_Service/Naming_Service.cpp: - * orbsvcs/Naming_Service/Naming_Service.mpc: - Use Deamon_Utilities to handle -ORBDeamon in the naming service. This - is because -ORBDeamon doesn't work for these services due to bugzilla - 3335. This is related to bugzilla 3656 - -Mon Oct 19 12:13:06 UTC 2009 Johnny Willemsen - - * orbsvcs/IFR_Service/IFR_Service.mpc: - Use tao_idl_fe base project - - * orbsvcs/orbsvcs/Daemon_Utilities.cpp: - * orbsvcs/orbsvcs/Daemon_Utilities.h: - * orbsvcs/orbsvcs/Svc_Utils.mpc: - New helper class which checks for -ORBDeamon and when this is specified - it calls ACE::deamonize() - -Mon Oct 19 00:26:06 UTC 2009 Douglas C. Schmidt - - * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp: Another shot - at trying to fix the memory leaks in the servants. Thanks to - Johnny for reporting this. - -Fri Oct 16 02:09:47 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/mcpp_tao_yyinput.h: - - Fixed potential signed/unsigned mismatch in macro definition - for TAO_YY_INPUT. - -Thu Oct 15 21:44:22 UTC 2009 Jeff Parsons - - * TAO_IDL/fe/mcpp_tao_yyinput.h: - * TAO_IDL/fe/fe_extern.cpp: - - Made tao_preproc_buffer_pos an extern int, similar to - its neighbor tao_preproc_buffer_length, so it can be - reset to 0 for each new file processed in the same - location that tao_preproc_buffer_length is reset. The - failure to reset tao_preproc_buffer_pos was causing - an error in the CoSMIC-specific backend, which is the - only one currently processing multiple IDL files in - a single execution. When reading the first token from - the 2nd file, the lexer would not be at the top of - the buffer and would therefore read garbage. - -Thu Oct 15 17:02:54 UTC 2009 Douglas C. Schmidt - - * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp - (universal_time): Replaced TAO_UTO_var with CosTime::UTO_var to - fix a compile error. Thanks to Johnny for reporting this. - -Thu Oct 15 16:05:25 UTC 2009 Vladimir Zykov - - * bin/tao_other_tests.lst: - Disabled HTIOP tests on static builds since they need - dynamic loading for HTIOP library. - - * tao/Acceptor_Impl.cpp: - Temporarily commented out problematic code until - HTIOP is fixed. - -Thu Oct 15 14:01:38 UTC 2009 Johnny Willemsen - - * TAO_IDL/be/be_visitor_component/component_ch.cpp: - * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: - Fixed typo in comment - -Thu Oct 15 11:33:38 UTC 2009 Johnny Willemsen - - * docs/documentation.html: - Updated link to the TPG - -Thu Oct 15 07:20:38 UTC 2009 Johnny Willemsen - - * TAO_IDL/tao_idl.mpc - * TAO_IDL/tao_idl_be.mpc - * TAO_IDL/tao_idl_fe.mpc - Added seperate mpc files for the back end and the front end library - -Wed Oct 14 23:05:35 UTC 2009 William R. Otte - - * TAO_IDL/contrib/mcpp/support.cpp: - Now releases ownership of in-memory buffers when retrieved for - preprocessing. Fixes a crash when in-memory preprocessor - was used multiple times per process invocation. - -Wed Oct 14 18:31:38 UTC 2009 Johnny Willemsen - - * TAO_IDL/tao_idl.mpc: - Use the new tao_idl_fe base project - -Wed Oct 14 18:26:38 UTC 2009 Johnny Willemsen - - * MPC/config/tao_idl_fe.mpb: - New base project for tao_idl_fe - -Wed Oct 14 18:16:38 UTC 2009 Johnny Willemsen - - * TAO_IDL/contrib/mcpp/system.cpp: - Fixed argument not used warning - -Wed Oct 14 17:42:38 UTC 2009 Vladimir Zykov - - * tao/Acceptor_Impl.cpp: - Fixed bug#3748. It fixes a connection handler leak when - server accepts a connection but then fails to open a connection - handler. - -Wed Oct 14 16:53:09 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_provides.cpp: - - Fixed bug in facet servant class generation. - - * TAO_IDL/be/be_interface.cpp(traverse_inheritance_graph): - - Added "!= 0" to an IF state checking the return value - of a call to ACE_Unbounded_Queue, which returns an int. - -Wed Oct 14 13:51:03 UTC 2009 Douglas C. Schmidt - - * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp (universal_time): - Changed - - TAO_UTO *uto = 0; - - to - - TAO_UTO_Var uto; - - to avoid a memory leak. Thanks to Chris Shaw for reporting this. - -Tue Oct 13 15:54:44 UTC 2009 Vladimir Zykov - - * tests/Bug_3748_Regression/client.cpp: - * tests/Bug_3748_Regression/Bug_3748_Regression.mpc: - * tests/Bug_3748_Regression/Hello.cpp: - * tests/Bug_3748_Regression/Test.idl: - * tests/Bug_3748_Regression/server.cpp: - * tests/Bug_3748_Regression/Makefile.am: - * tests/Bug_3748_Regression/Hello.h: - * tests/Bug_3748_Regression/README: - * tests/Bug_3748_Regression/run_test.pl: - * bin/tao_orb_tests.lst: - Added a test for bug#3748. - -Tue Oct 13 15:36:48 UTC 2009 Jeff Parsons - - * TAO_IDL/be/be_visitor_extended_port/extended_port_svs.cpp: - * TAO_IDL/be_include/be_visitor_extended_port/extended_port_svs.h: - - New files, containing new visitor that generates the implementation - of the facet servant class. - - * TAO_IDL/be/be_provides.cpp: - * TAO_IDL/be/be_interface.cpp: - * TAO_IDL/be_include/be_interface.h: - * TAO_IDL/be_include/be_provides.h: - - Factored common code generation into the appropriate nodes. - - * TAO_IDL/narrow/narrow.cpp: - - Added port types to the group of types that can be - transformed from scope to decl and vice versa. - - * TAO_IDL/be/be_visitor_extended_port/extended_port.cpp: - * TAO_IDL/be/be_visitor_extended_port/extended_port_svh.cpp: - * TAO_IDL/be/be_visitor_component/component_svh.cpp: - * TAO_IDL/be/be_visitor_component/component_svs.cpp: - * TAO_IDL/be/be_visitor_extended_port.cpp: - * TAO_IDL/be_include/be_visitor_extended_port.h: - * TAO_IDL/be_include/be_visitor_extended_port/extended_port.h: - * TAO_IDL/be_include/be_visitor_extended_port/extended_port_svh.h: - - Added new files as includes, factored common visitor code into - base class, other minor changes. - -Mon Oct 12 14:03:48 CDT 2009 Johnny Willemsen - - * TAO version 1.7.4 released. - -Local Variables: -mode: change-log -add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) -indent-tabs-mode: nil -End: diff --git a/TAO/NEWS b/TAO/NEWS index a901801b5b0..8a416024980 100644 --- a/TAO/NEWS +++ b/TAO/NEWS @@ -1,6 +1,3 @@ -USER VISIBLE CHANGES BETWEEN TAO-1.7.7 and TAO-1.7.8 -==================================================== - USER VISIBLE CHANGES BETWEEN TAO-1.7.6 and TAO-1.7.7 ==================================================== diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index ac533ddff76..bc964869da8 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -3310,7 +3310,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void) // to tell which DDS vendor. this->gen_standard_include ( this->ciao_conn_header_, - "connectors/dds4ccm/impl/dds/DDS4CCM_Traits.h"); + "connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h"); // Placeholder for forthcoming real-world logic. bool dds_event_connector = true; @@ -3319,7 +3319,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void) { this->gen_standard_include ( this->ciao_conn_header_, - "connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h"); + "connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h"); } // Placeholder for forthcoming real-world logic. @@ -3329,7 +3329,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void) { this->gen_standard_include ( this->ciao_conn_header_, - "connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h"); + "connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h"); } for (size_t j = 0; j < idl_global->n_included_idl_files (); ++j) diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 1aad53134c1..d78d4e1ff44 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -200,14 +200,14 @@ ImR_Locator_i::run (void) "\tPing Interval : %dms\n" "\tStartup Timeout : %ds\n" "\tPersistence : %s\n" - "\tMulticast : %C\n", + "\tMulticast : %s\n", ping_interval_.msec (), startup_timeout_.sec (), repository_.repo_mode (), ior_multicast_.reactor () != 0 ? "Enabled" : "Disabled")); ACE_DEBUG ((LM_DEBUG, "\tDebug : %d\n" - "\tLocked : %C\n\n", + "\tLocked : %s\n\n", debug (), read_only_ ? "True" : "False")); } @@ -387,7 +387,7 @@ ImR_Locator_i::register_activator (const char* aname, ACE_UNUSED_ARG (err); if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Activator registered for %C.\n", aname)); + ACE_DEBUG ((LM_DEBUG, "ImR: Activator registered for %s.\n", aname)); return token; } @@ -403,19 +403,19 @@ ImR_Locator_i::unregister_activator (const char* aname, { if (info->token != token && this->debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, "ImR: Ignoring unregister activator:%C. Wrong token.\n", aname)); + ACE_DEBUG ((LM_DEBUG, "ImR: Ignoring unregister activator:%s. Wrong token.\n", aname)); return; } this->unregister_activator_i (aname); if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Activator %C unregistered.\n", aname)); + ACE_DEBUG ((LM_DEBUG, "ImR: Activator %s unregistered.\n", aname)); } else { if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Ignoring unregister activator: %C. Unknown activator.\n", aname)); + ACE_DEBUG ((LM_DEBUG, "ImR: Ignoring unregister activator:%s. Unknown activator.\n", aname)); } } @@ -433,7 +433,7 @@ ImR_Locator_i::notify_child_death (const char* name) ACE_ASSERT (name != 0); if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Server has died <%C>.\n", name)); + ACE_DEBUG ((LM_DEBUG, "ImR: Server has died <%s>.\n", name)); Server_Info_Ptr info = this->repository_.get_server (name); if (! info.null ()) @@ -457,9 +457,7 @@ void ImR_Locator_i::activate_server (const char* server) { if (debug_ > 1) - { - ACE_DEBUG ((LM_DEBUG, "ImR: Manually activating server <%C>\n", server)); - } + ACE_DEBUG ((LM_DEBUG, "ImR: Manually activating server <%s>\n", server)); // This is the version called by tao_imr to activate the server, manually // starting it if necessary. @@ -477,7 +475,7 @@ ImR_Locator_i::activate_server_by_name (const char* name, bool manual_start) Server_Info_Ptr info = this->repository_.get_server (name); if (info.null ()) { - ACE_ERROR ((LM_ERROR, "ImR: Cannot find info for server <%C>\n", name)); + ACE_ERROR ((LM_ERROR, "ImR: Cannot find info for server <%s>\n", name)); throw ImplementationRepository::NotFound (); } @@ -513,7 +511,7 @@ ImR_Locator_i::activate_server_i (Server_Info& info, bool manual_start) { if (debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, "ImR: Successfully activated <%C> at \n\t%C\n", + ACE_DEBUG ((LM_DEBUG, "ImR: Successfully activated <%s> at \n\t%s\n", info.name.c_str (), info.partial_ior.c_str ())); } info.start_count = 0; @@ -530,7 +528,7 @@ ImR_Locator_i::activate_server_i (Server_Info& info, bool manual_start) if (this->debug_ > 0) { ACE_DEBUG ((LM_DEBUG, - "ImR: Cannot Activate <%C>.\n", info.name.c_str ())); + "ImR: Cannot Activate <%s>.\n", info.name.c_str ())); } waiter_svt_.unblock_all (info.name.c_str ()); @@ -566,7 +564,7 @@ ImR_Locator_i::activate_perclient_server_i (Server_Info info, bool manual_start) { if (debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, "ImR: Successfully activated <%C> at \n\t%C\n", + ACE_DEBUG ((LM_DEBUG, "ImR: Successfully activated <%s> at \n\t%s\n", info.name.c_str (), info.partial_ior.c_str ())); } return CORBA::string_dup (info.partial_ior.c_str ()); @@ -578,7 +576,7 @@ ImR_Locator_i::activate_perclient_server_i (Server_Info info, bool manual_start) if (this->debug_ > 0) { ACE_DEBUG ((LM_DEBUG, - "ImR: Cannot Activate <%C>.\n", info.name.c_str ())); + "ImR: Cannot Activate <%s>.\n", info.name.c_str ())); } throw ImplementationRepository::CannotActivate( CORBA::string_dup ( @@ -592,7 +590,7 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, if (info.activation_mode == ImplementationRepository::MANUAL && ! manual_start) { if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%C>. ActivationMode=MANUAL\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%s>. ActivationMode=MANUAL\n", info.name.c_str ())); throw ImplementationRepository::CannotActivate( CORBA::string_dup ( "Cannot implicitly activate MANUAL server.")); @@ -600,7 +598,7 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, if (info.cmdline.length () == 0) { if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%C>." + ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%s>." " No command line.\n", info.name.c_str ())); throw ImplementationRepository::CannotActivate( CORBA::string_dup ( @@ -612,8 +610,8 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, if (ainfo.null () || CORBA::is_nil (ainfo->activator.in ())) { if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%C>. " - "Activator <%C> not found.\n", info.name.c_str (), info.activator.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Cannot start server <%s>. " + "Activator <%s> not found.\n", info.name.c_str (), info.activator.c_str ())); throw ImplementationRepository::CannotActivate( CORBA::string_dup ( "No activator registered for server.")); @@ -631,7 +629,7 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, ACE_ASSERT (info.start_count <= info.start_limit); if (this->debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, "ImR: Starting server <%C>. Attempt %d/%d.\n", + ACE_DEBUG ((LM_DEBUG, "ImR: Starting server <%s>. Attempt %d/%d.\n", info.name.c_str (), info.start_count, info.start_limit)); } ainfo->activator->start_server ( @@ -645,7 +643,7 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, { if (this->debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, "ImR: Waiting for <%C> to start...\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Waiting for <%s> to start...\n", info.name.c_str ())); } ImplementationRepository::StartupInfo_var si = @@ -660,7 +658,7 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, { if (this->debug_ > 0) { - ACE_DEBUG ((LM_DEBUG, "ImR: <%C> Skipping wait. Already started.\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: <%s> Skipping wait. Already started.\n", info.name.c_str ())); } --waiting_clients; info.starting = false; @@ -676,7 +674,7 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, if (info.partial_ior.length () == 0) { if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR : Timeout waiting for <%C> to start.\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR : Timeout waiting for <%s> to start.\n", info.name.c_str ())); info.reset (); } } @@ -686,14 +684,14 @@ ImR_Locator_i::start_server (Server_Info& info, bool manual_start, info.starting = false; info.reset (); if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Activator cannot start <%C>.\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Activator cannot start <%s>.\n", info.name.c_str ())); } catch (const CORBA::Exception& ex) { --waiting_clients; info.starting = false; if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Unexpected exception while starting <%C>.\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Unexpected exception while starting <%s>.\n", info.name.c_str ())); if (debug_ > 1) ex._tao_print_exception (""); info.reset (); @@ -768,7 +766,7 @@ ImR_Locator_i::add_or_update_server (const char* server, if (this->read_only_) { - ACE_DEBUG ((LM_DEBUG, "ImR: Cannot add/update server <%C> due to locked database.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Cannot add/update server <%s> due to locked database.\n", server)); throw CORBA::NO_PERMISSION ( CORBA::SystemException::_tao_minor_code ( TAO_IMPLREPO_MINOR_CODE, @@ -777,7 +775,7 @@ ImR_Locator_i::add_or_update_server (const char* server, } if (debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Add/Update server <%C>.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Add/Update server <%s>.\n", server)); int limit = options.start_limit; if (limit < 0) @@ -793,7 +791,7 @@ ImR_Locator_i::add_or_update_server (const char* server, if (info.null ()) { if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Adding server <%C>.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Adding server <%s>.\n", server)); this->repository_.add_server ("", server, @@ -807,7 +805,7 @@ ImR_Locator_i::add_or_update_server (const char* server, else { if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Updating server <%C>.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Updating server <%s>.\n", server)); info->activator = options.activator.in (); info->cmdline = options.command_line.in (); @@ -871,7 +869,7 @@ ImR_Locator_i::remove_server (const char* name) if (this->repository_.remove_server (name) == 0) { if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Removing Server <%C>...\n", name)); + ACE_DEBUG ((LM_DEBUG, "ImR: Removing Server <%s>...\n", name)); PortableServer::POA_var poa = findPOA (name); if (! CORBA::is_nil (poa.in ())) @@ -881,7 +879,7 @@ ImR_Locator_i::remove_server (const char* name) poa->destroy (etherealize, wait); } if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Removed Server <%C>.\n", name)); + ACE_DEBUG ((LM_DEBUG, "ImR: Removed Server <%s>.\n", name)); } } else @@ -912,13 +910,13 @@ ImR_Locator_i::shutdown_server (const char* server) ACE_ASSERT (server != 0); if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Shutting down server <%C>.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Shutting down server <%s>.\n", server)); Server_Info_Ptr info = this->repository_.get_server (server); if (info.null ()) { ACE_ERROR ((LM_ERROR, - "ImR: shutdown_server () Cannot find info for server <%C>\n", server)); + "ImR: shutdown_server () Cannot find info for server <%s>\n", server)); throw ImplementationRepository::NotFound (); } @@ -927,7 +925,7 @@ ImR_Locator_i::shutdown_server (const char* server) if (CORBA::is_nil (info->server.in ())) { ACE_ERROR ((LM_ERROR, - "ImR: shutdown_server () Cannot connect to server <%C>\n", server)); + "ImR: shutdown_server () Cannot connect to server <%s>\n", server)); throw ImplementationRepository::NotFound (); } @@ -948,7 +946,7 @@ ImR_Locator_i::shutdown_server (const char* server) // the server to finish shutting down. if (this->debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, "ImR: Timeout while waiting for <%C> shutdown.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Timeout while waiting for <%s> shutdown.\n", server)); } throw; } @@ -956,7 +954,7 @@ ImR_Locator_i::shutdown_server (const char* server) { if (this->debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, "ImR: Exception ignored while shutting down <%C>\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Exception ignored while shutting down <%s>\n", server)); } } @@ -994,14 +992,14 @@ ImR_Locator_i::server_is_running (const char* id, } if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Server %C is running at %C.\n", + ACE_DEBUG ((LM_DEBUG, "ImR: Server %s is running at %s.\n", name.c_str (), partial_ior)); CORBA::String_var ior = orb_->object_to_string (server); if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Server %C callback at %C.\n", + ACE_DEBUG ((LM_DEBUG, "ImR: Server %s callback at %s.\n", name.c_str (), ior.in ())); if (this->unregister_if_address_reused_) @@ -1011,7 +1009,7 @@ ImR_Locator_i::server_is_running (const char* id, if (info.null ()) { if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Auto adding NORMAL server <%C>.\n", name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Auto adding NORMAL server <%s>.\n", name.c_str ())); ImplementationRepository::EnvironmentList env (0); this->repository_.add_server (server_id, @@ -1033,8 +1031,8 @@ ImR_Locator_i::server_is_running (const char* id, { if (! info->server_id.empty()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("ImR - WARNING: server \"%C\" changed server id from ") - ACE_TEXT ("\"%C\" to \"%C\" waiting PER_CLIENT clients.\n"), + ACE_TEXT ("ImR - WARNING: server \"%s\" changed server id from ") + ACE_TEXT ("\"%s\" to \"%s\" waiting PER_CLIENT clients.\n"), name.c_str (), info->server_id.c_str (), server_id.c_str ())); info->server_id = server_id; } @@ -1043,7 +1041,7 @@ ImR_Locator_i::server_is_running (const char* id, info->ior = ior.in (); info->partial_ior = partial_ior; info->server = ImplementationRepository::ServerObject::_nil (); // Will connect at first access - + int err = this->repository_.update_server (*info); ACE_ASSERT (err == 0); ACE_UNUSED_ARG (err); @@ -1076,13 +1074,13 @@ ImR_Locator_i::server_is_shutting_down (const char* server) if (this->debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR_Locator_i::server_is_shutting_down: Unknown server:%C\n", server)); + "ImR_Locator_i::server_is_shutting_down: Unknown server:%s\n", server)); } return; } if (this->debug_ > 0) - ACE_DEBUG ((LM_DEBUG, "ImR: Server <%C> is shutting down.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Server <%s> is shutting down.\n", server)); info->reset (); @@ -1103,14 +1101,14 @@ ImR_Locator_i::find (const char* server, imr_info = info->createImRServerInfo (); if (this->debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Found server %C.\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Found server %s.\n", server)); } else { ACE_NEW_THROW_EX (imr_info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ()); if (debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Cannot find server <%C>\n", server)); + ACE_DEBUG ((LM_DEBUG, "ImR: Cannot find server <%s>\n", server)); } } @@ -1226,7 +1224,7 @@ ImR_Locator_i::connect_activator (Activator_Info& info) } if (debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Connected to activator <%C>\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Connected to activator <%s>\n", info.name.c_str ())); } catch (const CORBA::Exception&) { @@ -1265,7 +1263,7 @@ ImR_Locator_i::auto_start_servers (void) if (this->debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: AUTO_START Could not activate <%C>\n", + "ImR: AUTO_START Could not activate <%s>\n", server_entry->ext_id_.c_str ())); ex._tao_print_exception ("AUTO_START"); } @@ -1310,7 +1308,7 @@ ImR_Locator_i::connect_server (Server_Info& info) } if (debug_ > 1) - ACE_DEBUG ((LM_DEBUG, "ImR: Connected to server <%C>\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: Connected to server <%s>\n", info.name.c_str ())); } catch (const CORBA::Exception&) { @@ -1355,7 +1353,7 @@ ImR_Locator_i::is_alive (Server_Info& info) if (debug_ > 0) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Ping retry count exceeded. alive=maybe.\n", info.name.c_str ())); + "ImR: <%s> Ping retry count exceeded. alive=maybe.\n", info.name.c_str ())); } // We return true here, because the server *might* be alive, it's just not starting in a timely // manner. We can't return false, because then we'll just try to start another instance, and the @@ -1374,7 +1372,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> not running. alive=false.\n", info.name.c_str ())); + "ImR: <%s> not running. alive=false.\n", info.name.c_str ())); } info.last_ping = ACE_Time_Value::zero; return 0; @@ -1385,7 +1383,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Ping verification disabled. alive=true.\n", info.name.c_str ())); + "ImR: <%s> Ping verification disabled. alive=true.\n", info.name.c_str ())); } return 1; } @@ -1395,7 +1393,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> within ping interval. alive=true.\n", info.name.c_str ())); + "ImR: <%s> within ping interval. alive=true.\n", info.name.c_str ())); } return 1; } @@ -1408,7 +1406,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: Ping verification skipped. <%C> not startable.\n", info.name.c_str ())); + "ImR: Ping verification skipped. <%s> not startable.\n", info.name.c_str ())); } return 1; } @@ -1420,7 +1418,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Could not connect. alive=false.\n", info.name.c_str ())); + "ImR: <%s> Could not connect. alive=false.\n", info.name.c_str ())); } return 0; } @@ -1436,7 +1434,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Ping successful. alive=true\n", info.name.c_str ())); + "ImR: <%s> Ping successful. alive=true\n", info.name.c_str ())); } info.last_ping = ACE_OS::gettimeofday (); } @@ -1450,7 +1448,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Local TRANSIENT. alive=false.\n", info.name.c_str ())); + "ImR: <%s> Local TRANSIENT. alive=false.\n", info.name.c_str ())); } } info.last_ping = ACE_Time_Value::zero; @@ -1461,7 +1459,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Remote TRANSIENT. alive=maybe.\n", info.name.c_str ())); + "ImR: <%s> Remote TRANSIENT. alive=maybe.\n", info.name.c_str ())); } } return -1; // We keep trying to ping, because returning 1 now, would just lead @@ -1472,7 +1470,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> TRANSIENT exception. alive=false.\n", info.name.c_str ())); + "ImR: <%s> TRANSIENT exception. alive=false.\n", info.name.c_str ())); } info.last_ping = ACE_Time_Value::zero; } @@ -1484,7 +1482,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) if (debug_ > 1) { ACE_DEBUG ((LM_DEBUG, - "ImR: <%C> Ping timed out. alive=true.\n", info.name.c_str ())); + "ImR: <%s> Ping timed out. alive=true.\n", info.name.c_str ())); } return 1; // This is "alive" as far as we're concerned. Presumably the client // will have a less stringent timeout policy, or will want to know @@ -1495,7 +1493,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info) { if (debug_ > 1) { - ACE_DEBUG ((LM_DEBUG, "ImR: <%C> Unexpected Ping exception. alive=false\n", info.name.c_str ())); + ACE_DEBUG ((LM_DEBUG, "ImR: <%s> Unexpected Ping exception. alive=false\n", info.name.c_str ())); ex._tao_print_exception ("\n"); } info.last_ping = ACE_Time_Value::zero; diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp index 776e1f32475..1d22c7e5228 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp @@ -412,7 +412,7 @@ TAO_Notify_Service_Driver::fini (void) naming->to_name (this->notify_factory_name_.c_str ()); naming->unbind (name.in ()); - + naming = CosNaming::NamingContextExt::_nil (); } @@ -421,12 +421,12 @@ TAO_Notify_Service_Driver::fini (void) poa->destroy (true, true); poa = PortableServer::POA::_nil (); } - + if (this->shutdown_dispatching_orb_ && !CORBA::is_nil (dispatching_orb_.in ())) { dispatching_orb->shutdown (); } - + // shutdown the ORB. if (this->shutdown_orb_ && !CORBA::is_nil (orb.in ())) { @@ -449,11 +449,11 @@ TAO_Notify_Service_Driver::fini (void) orb->destroy (); } - dispatching_orb_ = CORBA::ORB::_nil (); + dispatching_orb_ = CORBA::ORB::_nil (); worker_.orb (CORBA::ORB::_nil ()); - - orb = CORBA::ORB::_nil (); + + orb = CORBA::ORB::_nil (); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h index 7365fa103e7..9e5ba0f03b8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h @@ -52,6 +52,7 @@ public: int argc, ACE_TCHAR *argv[]); + protected: /// Instance of the TAO_Naming_Server TAO_Naming_Server naming_server_; diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h index 047a405a5fa..44a4638aaf5 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h @@ -8,6 +8,11 @@ #include "TestS.h" +#if defined (_MSC_VER) +# pragma warning(push) +# pragma warning (disable:4250) +#endif /* _MSC_VER */ + /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello @@ -29,5 +34,9 @@ private: CORBA::ORB_var orb_; }; +#if defined(_MSC_VER) +# pragma warning(pop) +#endif /* _MSC_VER */ + #include /**/ "ace/post.h" #endif /* HELLO_H */ diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp index f026595737b..87808753c90 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp @@ -69,6 +69,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Check this isn't generating transients for any other reason hello->ping (); + + try { hello->throw_location_forward (); diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index ed1132b8958..b23dc8ee50d 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp @@ -173,9 +173,11 @@ int TAO_AnyTypeCode_Adapter_Impl::Initializer (void) { return ACE_Service_Config::process_directive ( - ace_svc_desc_TAO_AnyTypeCode_Adapter_Impl); + ace_svc_desc_TAO_AnyTypeCode_Adapter_Impl + ); } + ACE_STATIC_SVC_DEFINE ( TAO_AnyTypeCode_Adapter_Impl, ACE_TEXT ("AnyTypeCode_Adapter"), diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h index 7edcea6ff12..341ca0f7906 100644 --- a/TAO/tao/PI/PI.h +++ b/TAO/tao/PI/PI.h @@ -41,7 +41,8 @@ public: // only do this for static builds, it causes a circular // dependency for dynamic builds. static int -TAO_Requires_PI_Initializer = TAO_PI_Init::Initializer (); +TAO_Requires_PI_Initializer = + TAO_PI_Init::Initializer (); #endif /* TAO_AS_STATIC_LIBS */ TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h index fd48212b719..706e6215e5e 100644 --- a/TAO/tao/VarOut_T.h +++ b/TAO/tao/VarOut_T.h @@ -153,7 +153,7 @@ public: private: T *& ptr_; - /// Assignment from T_var not allowed. + // Assignment from T_var not allowed. void operator= (const T_var &); }; diff --git a/TAO/tests/Bug_3766_Regression/server.cpp b/TAO/tests/Bug_3766_Regression/server.cpp index f724fa9bcf3..6ec659f344c 100644 --- a/TAO/tests/Bug_3766_Regression/server.cpp +++ b/TAO/tests/Bug_3766_Regression/server.cpp @@ -82,6 +82,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_OS::fprintf(file, "%s", ior.in ()); ACE_OS::fclose(file); + poa_manager->activate (); orb->run (); diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp index b3197966ef7..d92d9d97899 100644 --- a/TAO/tests/OBV/Any/client.cpp +++ b/TAO/tests/OBV/Any/client.cpp @@ -136,7 +136,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (test.in ())) { - ACE_ERROR_RETURN ((LM_DEBUG, + ACE_ERROR_RETURN ((LM_DEBUG, "Nil OBV_AnyTest::Test reference <%s>\n", ior), 1); -- cgit v1.2.1