summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-11-30 12:28:15 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-11-30 12:28:15 +0000
commit7496d43e70535c12ee1e37c98700c240cff85e74 (patch)
treef690b304e81dfab2deaca9ddab614e39d97325b5
parenta19b1510a2a333f084f242e7233484353ff840c4 (diff)
downloadATCD-7496d43e70535c12ee1e37c98700c240cff85e74.tar.gz
Mon Nov 30 12:27:37 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* 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
-rw-r--r--CIAO/ChangeLog11
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h6
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp142
-rw-r--r--CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h71
4 files changed, 226 insertions, 4 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 47450616829..614960df127 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Mon Nov 30 12:27:37 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * 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 <mhengstmengel@remedy.nl>
* connectors/dds4ccm/tests/CSLDeadline:
@@ -24,7 +33,7 @@ Mon Nov 30 11:32:37 UTC 2009 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* 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:
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h
index d1cb42d02b0..cbf1f7acb80 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h
@@ -5,8 +5,8 @@
*
* Wrapper facade for NDDS.
*/
-#ifndef CONNECTOR_T_H_
-#define CONNECTOR_T_H_
+#ifndef DDS_EVENT_CONNECTOR_T_H_
+#define DDS_EVENT_CONNECTOR_T_H_
#include "dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h"
@@ -79,4 +79,4 @@ private:
#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp"
-#endif /* CONNECTOR_T_H_ */
+#endif /* DDS_EVENT_CONNECTOR_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..b833c64b4d4
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp
@@ -0,0 +1,142 @@
+// -*- 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/Updater_T.h"
+#include "dds4ccm/impl/ndds/Getter_T.h"
+#include "dds4ccm/impl/ndds/Reader_T.h"
+#include "dds4ccm/impl/ndds/DataListenerControl.h"
+
+#include "ciao/Logger/Log_Macros.h"
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::DDS_State_Connector_T (void) :
+ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>()
+{
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::~DDS_State_Connector_T (void)
+{
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+typename CCM_TYPE::updater_type::_ptr_type
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_observable_data (void)
+{
+ return 0;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+::DDS::CCM_DataWriter_ptr
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_observable_dds_entity (void)
+{
+ return 0;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+typename CCM_TYPE::reader_type::_ptr_type
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_passive_observer_data (void)
+{
+ return 0;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+::DDS::CCM_DataReader_ptr
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_passive_observer_dds_entity (void)
+{
+ return 0;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+typename CCM_TYPE::reader_type::_ptr_type
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_pull_observer_data (void)
+{
+ return 0;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+typename CCM_TYPE::getter_type::_ptr_type
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_pull_observer_fresh_data (void)
+{
+ return 0;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+::DDS::CCM_DataReader_ptr
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_pull_observer_dds_entity (void)
+{
+ return 0;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+typename CCM_TYPE::reader_type::_ptr_type
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_observer_data (void)
+{
+ return 0;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+::CCM_DDS::CCM_DataListenerControl_ptr
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_observer_data_control (void)
+{
+ return 0;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+::DDS::CCM_DataReader_ptr
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_observer_dds_entity (void)
+{
+ return 0;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+typename CCM_TYPE::reader_type::_ptr_type
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_state_observer_data (void)
+{
+ return 0;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+::CCM_DDS::CCM_StateListenerControl_ptr
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_state_observer_data_control (void)
+{
+ return 0;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+::DDS::CCM_DataReader_ptr
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_state_observer_dds_entity (void)
+{
+ return 0;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+void
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete (void)
+{
+ DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete ();
+// this->configure_port_dds_listen ();
+// this->configure_port_dds_write ();
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+void
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate (void)
+{
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+void
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate (void)
+{
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+void
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_remove (void)
+{
+ DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::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..5515ecf9e5c
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h
@@ -0,0 +1,71 @@
+/**
+ * @author Johnny Willemsen <jwillemsen@remedy.nl>
+ *
+ * $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"
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+class DDS_State_Connector_T
+ : public virtual DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>
+{
+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:
+};
+
+#include "dds4ccm/impl/ndds/DDS_State_Connector_T.cpp"
+
+#endif /* DDS_STATE_CONNECTOR_T_H_ */