ChangeLogTag: Fri Feb 20 17:57:04 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

8 files changed, 74 insertions, 185 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 75304ab2fcf..d8a2063da33 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Fri Feb 20 17:57:04 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/LWFT/AppSideReg.cpp:
+        
+          Removed an empty try block.       
+ 
+        * orbsvcs/orbsvcs/LWFT/StateSynchronizationAgent_i.h:
+        * orbsvcs/orbsvcs/LWFT/DDSStateUpdate_T.cpp:
+        * orbsvcs/orbsvcs/LWFT/DDSStateReaderListener_T.h:
+        * orbsvcs/orbsvcs/LWFT/StateSynchronizationAgent_i_T.cpp:
+        * orbsvcs/orbsvcs/LWFT/DDSStateReaderListener_T.cpp:
+        * orbsvcs/orbsvcs/LWFT/DDSStateUpdate_T.h:
+        
+          Removed all but one of the DDS-related template parameters,
+          since we are now generating typedefs in DDS datatype
+          structs that can be used as traits.
+
 Thu Feb 19 19:59:05 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * MPC/config/lwft_server.mpb:
diff --git a/TAO/orbsvcs/orbsvcs/LWFT/AppSideReg.cpp b/TAO/orbsvcs/orbsvcs/LWFT/AppSideReg.cpp
index 163f956eb9d..e9be785bc62 100644
--- a/TAO/orbsvcs/orbsvcs/LWFT/AppSideReg.cpp
+++ b/TAO/orbsvcs/orbsvcs/LWFT/AppSideReg.cpp
@@ -91,18 +91,6 @@ AppSideReg::register_process (void)
 
       internal_thread_barrier.wait ();
       
-      /// Waiting for the AppSideMonitor_Thread to finish its socket stuff.
-      try
-        {
-         // hmvar_->dump ();
-        }
-      catch (CORBA::Exception &)
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      "AppSideReg: exception from dump.\n"));
-          throw;
-        }
-
       //ACE_DEBUG ((LM_TRACE, "AppSideReg::svc before registering process.\n"));
 
       try
diff --git a/TAO/orbsvcs/orbsvcs/LWFT/DDSStateReaderListener_T.cpp b/TAO/orbsvcs/orbsvcs/LWFT/DDSStateReaderListener_T.cpp
index cb0d476a2ba..1e3587dbd3a 100644
--- a/TAO/orbsvcs/orbsvcs/LWFT/DDSStateReaderListener_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/LWFT/DDSStateReaderListener_T.cpp
@@ -13,12 +13,8 @@
 #ifndef _DDS_STATE_READER_LISTENER_T_CPP_
 #define _DDS_STATE_READER_LISTENER_T_CPP_
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_DATA_READER, 
-          typename TOPIC_SEQUENCE>
-DDSStateReaderListener_T<TOPIC_TYPE, 
-			                   TOPIC_DATA_READER, 
-                         TOPIC_SEQUENCE>::DDSStateReaderListener_T (
+template <typename DATA_TYPE>
+DDSStateReaderListener_T<DATA_TYPE>::DDSStateReaderListener_T (
   const std::string & id,							    
   ReplicatedApplication_ptr application)
   : id_ (id),
@@ -26,22 +22,14 @@ DDSStateReaderListener_T<TOPIC_TYPE,
 {
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_DATA_READER, 
-          typename TOPIC_SEQUENCE>
-DDSStateReaderListener_T<TOPIC_TYPE, 
-			                   TOPIC_DATA_READER, 
-                         TOPIC_SEQUENCE>::~DDSStateReaderListener_T (void)
+template <typename DATA_TYPE>
+DDSStateReaderListener_T<DATA_TYPE>::~DDSStateReaderListener_T (void)
 {
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_DATA_READER, 
-          typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 void
-DDSStateReaderListener_T<TOPIC_TYPE, 
-			                   TOPIC_DATA_READER, 
-                         TOPIC_SEQUENCE>::on_requested_deadline_missed (
+DDSStateReaderListener_T<DATA_TYPE>::on_requested_deadline_missed (
     DDS::DataReader_ptr,
     const DDS::RequestedDeadlineMissedStatus &)
   throw (CORBA::SystemException)
@@ -51,13 +39,9 @@ DDSStateReaderListener_T<TOPIC_TYPE,
 	            ACE_TEXT ("on_requested_deadline_missed ()\n")));
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_DATA_READER, 
-          typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 void
-DDSStateReaderListener_T<TOPIC_TYPE, 
-			                   TOPIC_DATA_READER, 
-                         TOPIC_SEQUENCE>::on_requested_incompatible_qos (
+DDSStateReaderListener_T<DATA_TYPE>::on_requested_incompatible_qos (
     DDS::DataReader_ptr,
     const DDS::RequestedIncompatibleQosStatus &status)
   throw (CORBA::SystemException)
@@ -70,39 +54,27 @@ DDSStateReaderListener_T<TOPIC_TYPE,
 	            status.last_policy_id));
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_DATA_READER, 
-          typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 void
-DDSStateReaderListener_T<TOPIC_TYPE, 
-			                   TOPIC_DATA_READER, 
-                         TOPIC_SEQUENCE>::on_liveliness_changed (
+DDSStateReaderListener_T<DATA_TYPE>::on_liveliness_changed (
     DDS::DataReader_ptr,
     const DDS::LivelinessChangedStatus &)
   throw (CORBA::SystemException)
 {
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_DATA_READER, 
-          typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 void
-DDSStateReaderListener_T<TOPIC_TYPE, 
-			                   TOPIC_DATA_READER, 
-                         TOPIC_SEQUENCE>::on_subscription_matched (
+DDSStateReaderListener_T<DATA_TYPE>::on_subscription_matched (
     DDS::DataReader_ptr,
     const DDS::SubscriptionMatchedStatus &)
   throw (CORBA::SystemException)
 {
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_DATA_READER, 
-          typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 void
-DDSStateReaderListener_T<TOPIC_TYPE, 
-			                   TOPIC_DATA_READER, 
-                         TOPIC_SEQUENCE>::on_sample_rejected (
+DDSStateReaderListener_T<DATA_TYPE>::on_sample_rejected (
     DDS::DataReader_ptr,
     const DDS::SampleRejectedStatus &)
   throw (CORBA::SystemException)
@@ -112,18 +84,14 @@ DDSStateReaderListener_T<TOPIC_TYPE,
 	            ACE_TEXT ("on_sample_rejected ()\n")));
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_DATA_READER, 
-          typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 void
-DDSStateReaderListener_T<TOPIC_TYPE, 
-			                   TOPIC_DATA_READER, 
-                         TOPIC_SEQUENCE>::on_data_available (
+DDSStateReaderListener_T<DATA_TYPE>::on_data_available (
     DDS::DataReader_ptr reader)
   throw (CORBA::SystemException)
 {
-  typename TOPIC_DATA_READER::_var_type state_dr = 
-    TOPIC_DATA_READER::_narrow (reader);
+  typename DATA_TYPE::_data_reader_type::_var_type state_dr = 
+    DATA_TYPE::_data_reader_type::_narrow (reader);
   
   if (CORBA::is_nil (state_dr.in ()))
     {
@@ -132,7 +100,7 @@ DDSStateReaderListener_T<TOPIC_TYPE,
                   ACE_TEXT ("DDSStateReaderListener_T::_narrow() failed.\n")));
     }
     
-  TOPIC_SEQUENCE state_samples;
+  DATA_TYPE::_seq_type state_samples;
   DDS::SampleInfoSeq sis;
   
   DDS::ReturnCode_t status =
@@ -147,7 +115,7 @@ DDSStateReaderListener_T<TOPIC_TYPE,
     {
       if (state_samples.length () > 0)
         {
-          TOPIC_TYPE state_sample = state_samples[0];
+          DATA_TYPE state_sample = state_samples[0];
           DDS::SampleInfo si = sis[0];
 /*
           ACE_DEBUG ((LM_TRACE,
@@ -197,13 +165,9 @@ DDSStateReaderListener_T<TOPIC_TYPE,
     }
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_DATA_READER, 
-          typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 void
-DDSStateReaderListener_T<TOPIC_TYPE, 
-		                     TOPIC_DATA_READER, 
-                         TOPIC_SEQUENCE>::on_sample_lost (
+DDSStateReaderListener_T<DATA_TYPE>::on_sample_lost (
     DDS::DataReader_ptr,
     const DDS::SampleLostStatus &)
   throw (CORBA::SystemException)
diff --git a/TAO/orbsvcs/orbsvcs/LWFT/DDSStateReaderListener_T.h b/TAO/orbsvcs/orbsvcs/LWFT/DDSStateReaderListener_T.h
index 00d86032ea7..18e8b0f5470 100644
--- a/TAO/orbsvcs/orbsvcs/LWFT/DDSStateReaderListener_T.h
+++ b/TAO/orbsvcs/orbsvcs/LWFT/DDSStateReaderListener_T.h
@@ -22,9 +22,7 @@
  * @brief this listener receives data from DDS and posts it to the replicated
  *        application.
  */
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_DATA_READER,
-	        typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 class DDSStateReaderListener_T : public DDS::DataReaderListener
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/LWFT/DDSStateUpdate_T.cpp b/TAO/orbsvcs/orbsvcs/LWFT/DDSStateUpdate_T.cpp
index 60359995a5d..ccc4564893e 100644
--- a/TAO/orbsvcs/orbsvcs/LWFT/DDSStateUpdate_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/LWFT/DDSStateUpdate_T.cpp
@@ -17,16 +17,8 @@
 #include "DDSStateReaderListener_T.h"
 #include "DDSFailure.h"
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_TYPE_SUPPORT,
-	        typename TOPIC_DATA_WRITER,
-          typename TOPIC_DATA_READER,
-          typename TOPIC_SEQUENCE>
-DDSStateUpdate_T<TOPIC_TYPE,
-		             TOPIC_TYPE_SUPPORT,
-		             TOPIC_DATA_WRITER,
-		             TOPIC_DATA_READER,
-                 TOPIC_SEQUENCE>::DDSStateUpdate_T (
+template <typename DATA_TYPE>
+DDSStateUpdate_T<DATA_TYPE>::DDSStateUpdate_T (
   const std::string & topic_name,
   const std::string & id,
   DDS::DomainParticipant_ptr participant,
@@ -39,41 +31,23 @@ DDSStateUpdate_T<TOPIC_TYPE,
     pub_ (DDS::Publisher::_duplicate (publisher)),
     sub_ (DDS::Subscriber::_duplicate (subscriber)),
     topic_ (DDS::Topic::_nil ()),
-    datawriter_ (TOPIC_DATA_WRITER::_nil ()),
-    datareader_ (TOPIC_DATA_READER::_nil ()),
-    listener_ (new DDSStateReaderListener_T <TOPIC_TYPE,
-	                                           TOPIC_DATA_READER,
-                                             TOPIC_SEQUENCE> (id, application))    
+    datawriter_ (DATA_TYPE::_data_writer_type::_nil ()),
+    datareader_ (DATA_TYPE::_data_reader_type::_nil ()),
+    listener_ (new DDSStateReaderListener_T <DATA_TYPE> (id, application))   
 {
   id_ = id.c_str ();
   this->init ();
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_TYPE_SUPPORT,
-	        typename TOPIC_DATA_WRITER,
-          typename TOPIC_DATA_READER,
-          typename TOPIC_SEQUENCE>
-DDSStateUpdate_T<TOPIC_TYPE,
-		             TOPIC_TYPE_SUPPORT,
-		             TOPIC_DATA_WRITER,
-		             TOPIC_DATA_READER,
-                 TOPIC_SEQUENCE>::~DDSStateUpdate_T (void)
+template <typename DATA_TYPE>
+DDSStateUpdate_T<DATA_TYPE>::~DDSStateUpdate_T (void)
 {
   this->fini ();
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_TYPE_SUPPORT,
-	        typename TOPIC_DATA_WRITER,
-          typename TOPIC_DATA_READER,
-          typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 bool
-DDSStateUpdate_T<TOPIC_TYPE,
-		             TOPIC_TYPE_SUPPORT,
-		             TOPIC_DATA_WRITER,
-		             TOPIC_DATA_READER,
-                 TOPIC_SEQUENCE>::init (void)
+DDSStateUpdate_T<DATA_TYPE>::init (void)
 {
   if (!this->create_topic ())
     {
@@ -93,17 +67,9 @@ DDSStateUpdate_T<TOPIC_TYPE,
   return true;
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_TYPE_SUPPORT,
-	        typename TOPIC_DATA_WRITER,
-          typename TOPIC_DATA_READER,
-          typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 bool
-DDSStateUpdate_T<TOPIC_TYPE,
-		             TOPIC_TYPE_SUPPORT,
-		             TOPIC_DATA_WRITER,
-		             TOPIC_DATA_READER,
-                 TOPIC_SEQUENCE>::fini ()
+DDSStateUpdate_T<DATA_TYPE>::fini (void)
 {
   DDS::ReturnCode_t status =
     this->pub_->delete_datawriter (this->datawriter_.in ());
@@ -123,21 +89,13 @@ DDSStateUpdate_T<TOPIC_TYPE,
   return true;
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_TYPE_SUPPORT,
-	        typename TOPIC_DATA_WRITER,
-          typename TOPIC_DATA_READER,
-          typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 void
-DDSStateUpdate_T<TOPIC_TYPE,
-		             TOPIC_TYPE_SUPPORT,
-		             TOPIC_DATA_WRITER,
-		             TOPIC_DATA_READER,
-                 TOPIC_SEQUENCE>::set_state (
+DDSStateUpdate_T<DATA_TYPE>::set_state (
   const CORBA::Any & state_value)
 {
   // Extract value from any.
-  const TOPIC_TYPE * value = 0;
+  const DATA_TYPE * value = 0;
 
   // Update value on state topic sample, but make sure to
   // set the 'id' field with our unique string, since the
@@ -176,19 +134,11 @@ DDSStateUpdate_T<TOPIC_TYPE,
 
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_TYPE_SUPPORT,
-	        typename TOPIC_DATA_WRITER,
-          typename TOPIC_DATA_READER,
-          typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 bool
-DDSStateUpdate_T<TOPIC_TYPE,
-		             TOPIC_TYPE_SUPPORT,
-		             TOPIC_DATA_WRITER,
-		             TOPIC_DATA_READER,
-                 TOPIC_SEQUENCE>::create_topic ()
+DDSStateUpdate_T<DATA_TYPE>::create_topic (void)
 {
-  DDS::TypeSupport_var ts = new TOPIC_TYPE_SUPPORT ();
+  DDS::TypeSupport_var ts = new DATA_TYPE::_type_support_type ();
   CORBA::String_var data_type_name = ts->get_type_name ();
   
   DDS::ReturnCode_t status =
@@ -224,17 +174,9 @@ DDSStateUpdate_T<TOPIC_TYPE,
   return true;
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_TYPE_SUPPORT,
-	        typename TOPIC_DATA_WRITER,
-          typename TOPIC_DATA_READER,
-          typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 bool
-DDSStateUpdate_T<TOPIC_TYPE,
-		             TOPIC_TYPE_SUPPORT,
-		             TOPIC_DATA_WRITER,
-		             TOPIC_DATA_READER,
-                 TOPIC_SEQUENCE>::create_datawriter ()
+DDSStateUpdate_T<DATA_TYPE>::create_datawriter (void)
 {
   DDS::DataWriterQos dw_qos;
   DDS::ReturnCode_t status =
@@ -260,7 +202,7 @@ DDSStateUpdate_T<TOPIC_TYPE,
     }
   
   datawriter_ =
-    TOPIC_DATA_WRITER::_narrow (datawriter_base.in ());
+    DATA_TYPE::_data_writer_type::_narrow (datawriter_base.in ());
   
   if (CORBA::is_nil (datawriter_.in ()))
     {
@@ -275,17 +217,9 @@ DDSStateUpdate_T<TOPIC_TYPE,
   return true;
 }
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_TYPE_SUPPORT,
-	        typename TOPIC_DATA_WRITER,
-          typename TOPIC_DATA_READER,
-          typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 bool
-DDSStateUpdate_T<TOPIC_TYPE,
-		             TOPIC_TYPE_SUPPORT,
-		             TOPIC_DATA_WRITER,
-		             TOPIC_DATA_READER,
-                 TOPIC_SEQUENCE>::create_datareader ()
+DDSStateUpdate_T<DATA_TYPE>::create_datareader (void)
 {
   DDS::DataReaderQos dr_qos;
   DDS::ReturnCode_t status =
@@ -311,7 +245,7 @@ DDSStateUpdate_T<TOPIC_TYPE,
     }
   
   datareader_ =
-    TOPIC_DATA_READER::_narrow (datareader_base.in ());
+    DATA_TYPE::_data_reader_type::_narrow (datareader_base.in ());
   
   if (CORBA::is_nil (datareader_.in ()))
     {
diff --git a/TAO/orbsvcs/orbsvcs/LWFT/DDSStateUpdate_T.h b/TAO/orbsvcs/orbsvcs/LWFT/DDSStateUpdate_T.h
index 42c6eb163df..b437fcba06a 100644
--- a/TAO/orbsvcs/orbsvcs/LWFT/DDSStateUpdate_T.h
+++ b/TAO/orbsvcs/orbsvcs/LWFT/DDSStateUpdate_T.h
@@ -24,11 +24,11 @@
  * @brief Implementation of the StatefulObject interface that uses
  *        DDS to disseminate state information to replicas
  */
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_TYPE_SUPPORT,
-	        typename TOPIC_DATA_WRITER,
-          typename TOPIC_DATA_READER,
-	        typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>//, 
+//	        typename DATA_TYPE_SUPPORT,
+//	        typename DATA_WRITER,
+//          typename DATA_READER,
+//	        typename DATA_TYPE_SEQUENCE>
 class DDSStateUpdate_T : public StatefulObject
 {
 public:
@@ -51,7 +51,7 @@ public:
 
 protected:
   /// contains the value sent most recently
-  TOPIC_TYPE state_;
+  DATA_TYPE state_;
 
 private:
   // Helper methods for DDS initialization.
@@ -72,8 +72,8 @@ private:
   DDS::Subscriber_var sub_;
   DDS::Topic_var topic_;
   DDS::InstanceHandle_t instance_handle_;
-  typename TOPIC_DATA_WRITER::_var_type datawriter_;
-  typename TOPIC_DATA_READER::_var_type datareader_;
+  typename DATA_TYPE::_data_writer_type::_var_type datawriter_;
+  typename DATA_TYPE::_data_reader_type::_var_type datareader_;
   DDS::DataReaderListener_var listener_;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/LWFT/StateSynchronizationAgent_i.h b/TAO/orbsvcs/orbsvcs/LWFT/StateSynchronizationAgent_i.h
index f6a5936a1f1..792d1b71b89 100644
--- a/TAO/orbsvcs/orbsvcs/LWFT/StateSynchronizationAgent_i.h
+++ b/TAO/orbsvcs/orbsvcs/LWFT/StateSynchronizationAgent_i.h
@@ -53,11 +53,7 @@ class SSA_Export StateSynchronizationAgent_i
 
 #ifdef FLARE_USES_DDS
   /// Registers application for state synchronization with DDS
-  template <typename TOPIC_TYPE, 
-            typename TOPIC_TYPE_SUPPORT,
-            typename TOPIC_DATA_WRITER,
-            typename TOPIC_DATA_READER,
-            typename TOPIC_SEQUENCE>
+  template <typename DATA_TYPE>
   void register_application_with_dds (const char * object_id,
                                       ReplicatedApplication_ptr app);
 #endif /* FLARE_USES_DDS */
diff --git a/TAO/orbsvcs/orbsvcs/LWFT/StateSynchronizationAgent_i_T.cpp b/TAO/orbsvcs/orbsvcs/LWFT/StateSynchronizationAgent_i_T.cpp
index 9c046df2555..5e088554a3d 100644
--- a/TAO/orbsvcs/orbsvcs/LWFT/StateSynchronizationAgent_i_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/LWFT/StateSynchronizationAgent_i_T.cpp
@@ -17,11 +17,7 @@
 
 #include "DDSStateUpdate_T.h"
 
-template <typename TOPIC_TYPE, 
-	        typename TOPIC_TYPE_SUPPORT,
-	        typename TOPIC_DATA_WRITER,
-          typename TOPIC_DATA_READER,
-	        typename TOPIC_SEQUENCE>
+template <typename DATA_TYPE>
 void
 StateSynchronizationAgent_i::register_application_with_dds (
   const char * object_id,
@@ -61,11 +57,7 @@ StateSynchronizationAgent_i::register_application_with_dds (
           // register a DDS participant for this application
           replica_group.replicas.push_back (
             typename StateSynchronizationAgent_i::STATEFUL_OBJECT_PTR (
-               new DDSStateUpdate_T <TOPIC_TYPE,
-                                     TOPIC_TYPE_SUPPORT,
-                                     TOPIC_DATA_WRITER,
-                                     TOPIC_DATA_READER,
-                                     TOPIC_SEQUENCE> (
+               new DDSStateUpdate_T <DATA_TYPE> (
                  oid.c_str (),
                  this->get_unique_id (oid.c_str ()),
                  domain_participant_.in (),