Update to use distributed condition

Author: sonndinh

dds/DCPS/Recorder.h

@@ -72,30 +72,30 @@ class OpenDDS_Dcps_Export Recorder
   /**
    *  Find the bit key for a given repo id.
    */
-  virtual DDS::ReturnCode_t repoid_to_bit_key(const DCPS::GUID_t&     id,
+  virtual DDS::ReturnCode_t repoid_to_bit_key(const DCPS::GUID_t& id,
                                               DDS::BuiltinTopicKey_t& key) = 0;
 #endif
 
   /**
    * Set the Quality of Service settings for the Recorder.
    *
    */
-  virtual DDS::ReturnCode_t set_qos (const DDS::SubscriberQos & subscriber_qos,
-                                     const DDS::DataReaderQos & datareader_qos)=0;
+  virtual DDS::ReturnCode_t set_qos(const DDS::SubscriberQos& subscriber_qos,
+                                    const DDS::DataReaderQos& datareader_qos) = 0;
 
   /**
    * Get the Quality of Service settings for the Recorder.
    *
    */
-  virtual DDS::ReturnCode_t get_qos (DDS::SubscriberQos & subscriber_qos,
-                                     DDS::DataReaderQos & datareader_qos)=0;
+  virtual DDS::ReturnCode_t get_qos(DDS::SubscriberQos& subscriber_qos,
+                                    DDS::DataReaderQos& datareader_qos) = 0;
 
   /**
    * Change the listener for this Recorder.
    *
    */
-  virtual DDS::ReturnCode_t set_listener (const RecorderListener_rch & a_listener,
-                                          DDS::StatusMask              mask = DEFAULT_STATUS_MASK )=0;
+  virtual DDS::ReturnCode_t set_listener(const RecorderListener_rch& a_listener,
+                                         DDS::StatusMask mask = DEFAULT_STATUS_MASK) = 0;
 
   /**
    * Get the listener for this Recorder.

tests/DCPS/RecorderReplayer/Args.h

@@ -1,6 +1,4 @@
 /*
- *
- *
  * Distributed under the OpenDDS License.
  * See: http://www.opendds.org/license.html
  */
@@ -9,7 +7,6 @@
 #define MESSENGER_TEST_ARGS_H
 
 #include <dds/DCPS/transport/framework/TransportRegistry.h>
-
 #include <dds/DCPS/transport/framework/TransportConfig.h>
 #include <dds/DCPS/transport/framework/TransportInst.h>
 
@@ -18,6 +15,17 @@
 #include <ace/Log_Msg.h>
 #include <ace/OS_NS_stdlib.h>
 
+const char* ACTOR_PUBLISHER = "Publisher";
+const char* ACTOR_RECORDER = "Recorder";
+const char* ACTOR_REPLAYER = "Replayer";
+const char* ACTOR_SUBSCRIBER = "Subscriber";
+
+const char* EVENT_RECORDER_JOINED = "RecorderJoined";
+const char* EVENT_RECEIVED_ALL_SAMPLES = "ReceivedAllSamples";
+const char* EVENT_SUBSCRIBER_JOINED = "SubscriberJoined";
+
+const int NUM_SAMPLES = 10;
+
 inline int
 parse_args(int argc, ACE_TCHAR *argv[])
 {
@@ -29,18 +37,13 @@ parse_args(int argc, ACE_TCHAR *argv[])
   while ((c = get_opts()) != -1) {
     switch (c) {
     case 't':
-
       if (ACE_OS::strcmp(get_opts.opt_arg(), ACE_TEXT("udp")) == 0) {
         transport_type = "udp";
-
       } else if (ACE_OS::strcmp(get_opts.opt_arg(), ACE_TEXT("multicast")) == 0) {
         transport_type = "multicast";
-
       } else if (ACE_OS::strcmp(get_opts.opt_arg(), ACE_TEXT("tcp")) == 0) {
         transport_type = "tcp";
-
       }
-
       break;
     case 'p':
       thread_per_connection = true;
@@ -49,7 +52,7 @@ parse_args(int argc, ACE_TCHAR *argv[])
     default:
       ACE_ERROR_RETURN((LM_ERROR,
                         ACE_TEXT("usage: %s [-t transport]\n"), argv[0]),
-                       -1);
+                        -1);
     }
   }
 
@@ -61,19 +64,16 @@ parse_args(int argc, ACE_TCHAR *argv[])
   }
 
   if (thread_per_connection) {
-    OpenDDS::DCPS::TransportConfig_rch config =
-      TheTransportRegistry->fix_empty_default();
+    OpenDDS::DCPS::TransportConfig_rch config = TheTransportRegistry->fix_empty_default();
     if (config.in() == 0) {
       ACE_ERROR_RETURN((LM_ERROR,
                         ACE_TEXT("no default config\n"), argv[0]),
-                       -1);
-    }
-    else if (config->instances_.size() < 1) {
+                        -1);
+    } else if (config->instances_.size() < 1) {
       ACE_ERROR_RETURN((LM_ERROR,
                         ACE_TEXT("no instances on default config\n"), argv[0]),
-                       -1);
-    }
-    else if (config->instances_.size() > 1) {
+                        -1);
+    } else if (config->instances_.size() > 1) {
       ACE_ERROR((LM_ERROR,
                  ACE_TEXT("too many instances on default config, using first\n"), argv[0]));
     }
@@ -84,5 +84,4 @@ parse_args(int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
-
 #endif