Mon Nov 8 19:25:53 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        Major refactoring of the dds4ccm library and the rti wrapping code

        * connectors/dds4ccm/idl/ccm_dds.idl:

        * connectors/dds4ccm/impl/CCM_DataReader.h:
        * connectors/dds4ccm/impl/CCM_DataReader.cpp:
        * connectors/dds4ccm/impl/CCM_DataWriter.h:
        * connectors/dds4ccm/impl/CCM_DataWriter.cpp:
        * connectors/dds4ccm/impl/ConditionManager_T.h:
        * connectors/dds4ccm/impl/ConditionManager_T.cpp:
        * connectors/dds4ccm/impl/ContentFilterSetting.h:
        * connectors/dds4ccm/impl/ContentFilterSetting.cpp:
        * connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h:
        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h:
        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
        * connectors/dds4ccm/impl/DDS_Update_T.h:
        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
        * connectors/dds4ccm/impl/DDS_Write_T.h:
        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
        * connectors/dds4ccm/impl/DataReaderListener_T.h:
        * connectors/dds4ccm/impl/DataReaderListener_T.cpp:
        * connectors/dds4ccm/impl/DataReaderStateListener_T.h:
        * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp:
        * connectors/dds4ccm/impl/Getter_T.h:
        * connectors/dds4ccm/impl/Getter_T.cpp:
        * connectors/dds4ccm/impl/InstanceHandleManager_T.h:
        * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp:
        * connectors/dds4ccm/impl/Reader_T.h:
        * connectors/dds4ccm/impl/Reader_T.cpp:
        * connectors/dds4ccm/impl/TopicListener_T.cpp:

        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h:
        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp:
        * connectors/dds4ccm/impl/ndds/DataReader.h:
        * connectors/dds4ccm/impl/ndds/DataReader.cpp:
        * connectors/dds4ccm/impl/ndds/DataReaderListener.h:
        * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp:
        * connectors/dds4ccm/impl/ndds/DataReader_T.h:
        * connectors/dds4ccm/impl/ndds/DataReader_T.cpp:
        * connectors/dds4ccm/impl/ndds/DataWriter.h:
        * connectors/dds4ccm/impl/ndds/DataWriter.cpp:
        * connectors/dds4ccm/impl/ndds/DataWriterListener.h:
        * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp:
        * connectors/dds4ccm/impl/ndds/DataWriter_T.h:
        * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp:
        * connectors/dds4ccm/impl/ndds/DomainParticipant.h:
        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h:
        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h:
        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp:
        * connectors/dds4ccm/impl/ndds/DomainParticipantManager.h:
        * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp:
        * connectors/dds4ccm/impl/ndds/Publisher.h:
        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
        * connectors/dds4ccm/impl/ndds/PublisherListener.h:
        * connectors/dds4ccm/impl/ndds/PublisherListener.cpp:
        * connectors/dds4ccm/impl/ndds/QueryCondition.h:
        * connectors/dds4ccm/impl/ndds/QueryCondition.cpp:
        * connectors/dds4ccm/impl/ndds/ReadCondition.h:
        * connectors/dds4ccm/impl/ndds/ReadCondition.cpp:
        * connectors/dds4ccm/impl/ndds/StatusCondition.h:
        * connectors/dds4ccm/impl/ndds/StatusCondition.cpp:
        * connectors/dds4ccm/impl/ndds/Subscriber.h:
        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
        * connectors/dds4ccm/impl/ndds/SubscriberListener.h:
        * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp:
        * connectors/dds4ccm/impl/ndds/Topic.h:
        * connectors/dds4ccm/impl/ndds/Topic.cpp:
        * connectors/dds4ccm/impl/ndds/TopicDescription.h:
        * connectors/dds4ccm/impl/ndds/TopicDescription.cpp:
        * connectors/dds4ccm/impl/ndds/TopicListener.h:
        * connectors/dds4ccm/impl/ndds/TopicListener.cpp:
        * connectors/dds4ccm/impl/ndds/ndds.mpc:

        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic_T.h:
        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic_T.cpp:
        * connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.h:
        * connectors/dds4ccm/impl/ndds/DDSDataReaderListener_T.cpp:
        * connectors/dds4ccm/impl/ndds/DDSDataWriterListener_T.h:
        * connectors/dds4ccm/impl/ndds/DDSDataWriterListener_T.cpp:
        * connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.h:
        * connectors/dds4ccm/impl/ndds/DDSDomainParticipantListener.cpp:
        * connectors/dds4ccm/impl/ndds/DDSPublisherListener_T.h:
        * connectors/dds4ccm/impl/ndds/DDSPublisherListener_T.cpp:
        * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.h:
        * connectors/dds4ccm/impl/ndds/DDSSubscriberListener_T.cpp:
        * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.h:
        * connectors/dds4ccm/impl/ndds/DDSTopicListener_T.cpp:
        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.h:
        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory_T.cpp:
        * connectors/dds4ccm/impl/ndds/DomainParticipant_T.h:
        * connectors/dds4ccm/impl/ndds/DomainParticipant_T.cpp:
        * connectors/dds4ccm/impl/ndds/Publisher_T.h:
        * connectors/dds4ccm/impl/ndds/Publisher_T.cpp:
        * connectors/dds4ccm/impl/ndds/QueryCondition_T.h:
        * connectors/dds4ccm/impl/ndds/QueryCondition_T.cpp:
        * connectors/dds4ccm/impl/ndds/ReadCondition_T.h:
        * connectors/dds4ccm/impl/ndds/ReadCondition_T.cpp:
        * connectors/dds4ccm/impl/ndds/Subscriber_T.h:
        * connectors/dds4ccm/impl/ndds/Subscriber_T.cpp:
        * connectors/dds4ccm/impl/ndds/TopicDescription_T.h:
        * connectors/dds4ccm/impl/ndds/TopicDescription_T.cpp:
        * connectors/dds4ccm/impl/ndds/Topic_T.h:
        * connectors/dds4ccm/impl/ndds/Topic_T.cpp:

2 files changed, 194 insertions, 0 deletions

diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml
index 43d7538106a..4048473bf72 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml
@@ -26,6 +26,199 @@ RTI Data Distribution Service user manual.
              A QoS profile groups a set of related QoS.
         -->
     <qos_profile name="Hello_Profile" is_default_qos="true">
+            <participant_qos>
+                <participant_name>
+                    <name>RTI Hello World Example</name>
+                </participant_name>
+
+    <!-- increase total property string max length -->
+    <resource_limits>
+        <participant_property_string_max_length>
+          2048
+        </participant_property_string_max_length>
+    </resource_limits>
+
+                <property>
+                    <value>
+
+      <!-- ================= -->
+      <!-- enable monitoring -->
+      <!-- ================= -->
+
+                        <element>
+                            <name>rti.monitor.library</name>
+          <!-- must match the library type for the DDS
+                                 application -->
+          <!--
+                            <value>rtimonitoring</value>
+                            <value>rtimonitoringd</value>
+          -->
+                            <value>rtimonitoring</value>
+          <propagate>false</propagate>
+                        </element>
+
+                        <element>
+                            <name>rti.monitor.create_function</name>
+                            <value>RTIDefaultMonitor_create</value>
+          <propagate>false</propagate>
+                        </element>
+
+      <!-- ========================= -->
+      <!-- monitoring configurations -->
+      <!-- ========================= -->
+
+      <!-- how often to sample and publish monitoirng
+                             topics in seconds, default 5 -->
+      <!--
+                        <element>
+                            <name>rti.monitor.config.publish_period</name>
+                            <value>5</value>
+          <propagate>false</propagate>
+                        </element>
+      -->
+
+      <!-- monitoring topics that are sent out,
+           default * (no filter) -->
+      <!--
+                        <element>
+                            <name>rti.monitor.config.topics</name>
+                            <value>*</value>
+          <propagate>false</propagate>
+                        </element>
+      -->
+
+      <!-- user topic filter, default * (no filter) -->
+      <!--
+                        <element>
+                            <name>rti.monitor.config.usertopics</name>
+                            <value>*</value>
+          <propagate>false</propagate>
+                        </element>
+      -->
+
+      <!-- Uncomment this if you want statistics to be
+           published by a new separate particpant,
+           with the specified domain ID. Default:
+           not specified (use user participant for
+           publishing monitoring data) -->
+      <!--
+                        <element>
+                            <name>rti.monitor.config.new_participant_domain_id</name>
+                            <value>10</value>
+          <propagate>false</propagate>
+                        </element>
+      -->
+
+      <!-- Uncomment this if you want to use specific
+           QoS profile for entities created by
+           monitoring. Default: not specified
+           (use internal QoS values) -->
+      <!--
+                        <element>
+                            <name>rti.monitor.config.qos_library</name>
+                            <value>RTIMonitoringQosLibrary</value>
+          <propagate>false</propagate>
+                        </element>
+                        <element>
+                            <name>rti.monitor.config.qos_profile</name>
+                            <value>RTIMonitoringPublishingQosProfile</value>
+          <propagate>false</propagate>
+                        </element>
+      -->
+
+      <!-- Uncomment this if you want to control the
+           property of the thread that sample and publish
+           monitoring data -->
+      <!-- default -2 for windows, -999999 for linux -->
+      <!--
+                        <element>
+                            <name>rti.monitor.config.publish_thread_priority</name>
+                            <value>-2</value>
+          <propagate>false</propagate>
+                        </element>
+      -->
+      <!-- default 0 for windows, -1 for linux -->
+      <!--
+                        <element>
+                            <name>rti.monitor.config.publish_thread_stacksize</name>
+                            <value>0</value>
+          <propagate>false</propagate>
+                        </element>
+      -->
+      <!-- default FLOATING_POINT | STDIO -->
+      <!--
+                        <element>
+                            <name>rti.monitor.config.publish_thread_options</name>
+                            <value></value>
+          <propagate>false</propagate>
+                        </element>
+      -->
+
+      <!-- do we want to montior memory and CPU usage,
+           default true -->
+      <!--
+                        <element>
+                            <name>rti.monitor.config.get_process_statistics</name>
+                            <value>true</value>
+          <propagate>false</propagate>
+                        </element>
+      -->
+
+      <!-- Do we want to skip monitoring internal entitities
+           and not include them in entity counts,
+           default true -->
+      <!--
+                        <element>
+                            <name>rti.monitor.config.skip_monitor_entities</name>
+                            <value>true</value>
+          <propagate>false</propagate>
+                        </element>
+      -->
+
+      <!-- do you want monitoring library to reset
+           status change count after access, default false -->
+      <!--
+                        <element>
+                            <name>rti.monitor.config.reset_status_change_counts</name>
+                            <value>false</value>
+          <propagate>false</propagate>
+                        </element>
+      -->
+
+      <!-- monitoring library verbosity for internal
+           debugging purpose, default 1 -->
+      <!--
+                        <element>
+                            <name>rti.monitor.config.verbosity</name>
+                            <value>1</value>
+          <propagate>false</propagate>
+                        </element>
+      -->
+
+      <!-- maximum size of the preallocated buffer.
+           If sample serialized size is
+           larger than this value (unless the value is -1),
+           dynamic memory allocation will be used.
+           Default -1 (preallocated buffer is set
+           according to max size serialized of the data
+           type, no dynamic memory allocation) -->
+      <!--
+                        <element>
+                            <name>rti.monitor.config.writer_pool_buffer_max_size</name>
+                            <value>-1</value>
+          <propagate>false</propagate>
+                        </element>
+      -->
+
+                    </value>
+                </property>
+
+          <!-- monitoring types can have large data -->
+                <receiver_pool>
+                    <buffer_size>65530</buffer_size>
+                </receiver_pool>
+
+            </participant_qos>
       <!-- QoS used to configure the data writer created in the example code -->
       <datawriter_qos>
         <reliability>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
index c72b3a0d9ab..2b5396ba915 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
@@ -11,6 +11,7 @@ use PerlACE::TestTarget;
 $CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
 $TAO_ROOT = "$ENV{'TAO_ROOT'}";
 $DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
+$DDS4CCM_TRACE_ENABLE = "$ENV{'DDS4CCM_TRACE_ENABLE'}";
 
 $daemons_running = 0;
 $em_running = 0;