*** empty log message ***

25 files changed, 59 insertions, 1083 deletions

diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index ec7d5f71e75..5c6b2ffc431 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -18,7 +18,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   ACE_Argv_Type_Converter convert (argc, argv);
 
   RND_Driver driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -53,7 +53,7 @@ RND_Driver::run (int argc, char *argv[])
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index 8c2c427ff0f..794eed8a11b 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -19,7 +19,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_Argv_Type_Converter convert (argc, argv);
 
   EC_BCast driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -33,7 +33,7 @@ EC_BCast::EC_BCast (void)
 int
 EC_BCast::parse_args (int& argc, char **argv)
 {
-  if (this->EC_Driver::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
+  if (this->EC_Driver::parse_args (argc, argv) != 0)
     return -1;
 
   ACE_TArg_Shifter< char > arg_shifter (argc, argv);
@@ -88,7 +88,7 @@ EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   // Obtain UDP address in the string format for Gateway initialization.
-  char address_server_arg [256];
+  ACE_TCHAR address_server_arg [256];
   ACE_INET_Addr udp_addr;
   if (udp_addr.set (this->bcast_port_, this->bcast_address_) == -1
       || udp_addr.addr_to_string (address_server_arg, 256) == -1)
@@ -106,7 +106,7 @@ EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL)
 
   TAO_ECG_Mcast_Gateway gateway;
   if (gateway.init (sub,
-                    address_server_arg,
+                    ACE_TEXT_TO_CHAR_IN(address_server_arg),
                     lAttributes)
       == -1)
     return;
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index f95448af454..8cbcfa4c368 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -36,7 +36,7 @@ public:
 
   // = The EC_Driver methods
   /// add some command line args to enable/disable bcastions
-  virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
+  virtual int parse_args (int& argc, char* argv[]);
   virtual void print_args (void) const;
   virtual void print_usage (void);
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index 21431441673..ce99d63f092 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -9,6 +9,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests,
            Control,
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index 0f8a05fbc14..8f7708cefec 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -7,6 +7,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests,
            Disconnect,
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index b7e977c3640..79c8420c310 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -8,6 +8,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests,
            MT_Disconnect,
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index a20a0fcb21d..ee0756b5de7 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -20,7 +20,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   TAO_EC_Default_Factory::init_svcs ();
   EC_Master master;
-  return master.run (argc, argv);
+  return master.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -56,7 +56,7 @@ EC_Master::run (int argc, char* argv[])
       this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (this->parse_args (convert.get_argc(), convert.get_ASCII_argv()))
+      if (this->parse_args (argc, argv))
         return 1;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -164,11 +164,11 @@ EC_Master::run (int argc, char* argv[])
 }
 
 void
-EC_Master::initialize_orb_and_poa (int &argc, ACE_TCHAR* argv[]
+EC_Master::initialize_orb_and_poa (int &argc, char* argv[]
                                    ACE_ENV_ARG_DECL)
 {
   this->orb_ =
-    CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
+    CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var poa_object =
@@ -260,9 +260,9 @@ EC_Observer::initialize_orb_and_poa (int&, char*[]
 }
 
 int
-EC_Observer::parse_args (int& argc, ACE_TCHAR* argv[])
+EC_Observer::parse_args (int& argc, char* argv[])
 {
-  return this->EC_Driver::parse_args (convert.get_argc(), convert.get_ASCII_argv());
+  return this->EC_Driver::parse_args (argc, argv);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
index d029b5a3817..738c8f8d257 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h
@@ -38,7 +38,7 @@ public:
   virtual ~EC_Master (void);
 
   /// Execute the test.
-  virtual int run (int argc, ACE_TCHAR* argv[]);
+  virtual int run (int argc, char* argv[]);
 
   /// Obtain the orb and the poa pointers
   virtual void initialize_orb_and_poa (int& argc, char* argv[]
@@ -49,7 +49,7 @@ public:
   EC_Observer* channel (int i) const;
 
 private:
-  int parse_args (int &argc, ACE_TCHAR *argv[]);
+  int parse_args (int &argc, char *argv[]);
 
 private:
   /// The seed
@@ -89,7 +89,7 @@ public:
   /// add some command line args to enable/disable observerions
   virtual void initialize_orb_and_poa (int& argc, char* argv[]
                                        ACE_ENV_ARG_DECL);
-  virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
+  virtual int parse_args (int& argc, char* argv[]);
   virtual void print_args (void) const;
   virtual void print_usage (void);
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index a0ffea18c74..471ea0ab073 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -20,7 +20,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   ACE_Argv_Type_Converter convert (argc, argv);
 
   RND_Driver driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -60,7 +60,7 @@ RND_Driver::run (int argc, char *argv[])
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 54f72265323..a00e851f14e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -18,7 +18,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_Argv_Type_Converter convert (argc, argv);
 
   EC_Reconnect driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -33,7 +33,7 @@ EC_Reconnect::EC_Reconnect (void)
 int
 EC_Reconnect::parse_args (int& argc, char* argv[])
 {
-  if (this->EC_Driver::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
+  if (this->EC_Driver::parse_args (argc, argv) != 0)
     return -1;
 
   ACE_Get_Arg_Opt<char> get_opt (argc, argv, "scd:");
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
index 7cb730a3301..3ae199c24c0 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -3,6 +3,7 @@
 #include "Shutdown.h"
 #include "Consumer.h"
 #include "Supplier.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(EC_Tests_Basic, Shutdown, "$Id$")
 
@@ -12,7 +13,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_Argv_Type_Converter convert (argc, argv);
 
   EC_Shutdown driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index 2517e97aaf6..5cad1a265c6 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -19,7 +19,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_Argv_Type_Converter convert (argc, argv);
 
   EC_Connect driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -36,9 +36,9 @@ EC_Connect::execute_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 int
-EC_Connect::parse_args (int& argc, ACE_TCHAR* argv[])
+EC_Connect::parse_args (int& argc, char* argv[])
 {
-  if (this->EC_Driver::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
+  if (this->EC_Driver::parse_args (argc, argv) != 0)
     return -1;
 
   ACE_TArg_Shifter< char > arg_shifter (argc, argv);
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h
index e3a311e8f95..caaf08b425a 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h
@@ -47,7 +47,7 @@ public:
   // Constructor
 
   // = The EC_Driver methods
-  virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
+  virtual int parse_args (int& argc, char* argv[]);
   virtual void print_usage (void);
   virtual void print_args (void) const;
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index 2af3d306bdb..faccac7ef74 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -19,7 +19,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_Argv_Type_Converter convert (argc, argv);
 
   EC_Inversion driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -50,7 +50,7 @@ EC_Inversion::parse_args (int &argc, char *argv[])
         }
     }
 
-  int r = this->EC_Driver::parse_args (convert.get_argc(), convert.get_ASCII_argv());
+  int r = this->EC_Driver::parse_args (argc, argv);
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG,
                 "EC_Inversion (%P|%t) "
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 442b885dda4..16e4ce2faa1 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -227,7 +227,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf));
       if (do_dump_history)
         {
-          history.dump_samples ("HISTORY", gsf);
+          history.dump_samples (ACE_TEXT("HISTORY"), gsf);
         }
 
       ACE_Basic_Stats stats;
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index 29734c4722c..9a1336b4d3f 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -17,7 +17,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_Argv_Type_Converter convert (argc, argv);
 
   EC_Throughput driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -27,9 +27,9 @@ EC_Throughput::EC_Throughput (void)
 }
 
 int
-EC_Throughput::parse_args (int& argc, ACE_TCHAR* argv[])
+EC_Throughput::parse_args (int& argc, char* argv[])
 {
-  if (this->EC_Driver::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
+  if (this->EC_Driver::parse_args (argc, argv) != 0)
     return -1;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
index a54170272d4..f3d5ee6cc04 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
@@ -36,7 +36,7 @@ public:
   // Constructor
 
   // = The EC_Driver methods
-  virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
+  virtual int parse_args (int& argc, char* argv[]);
   virtual void print_args (void) const;
   virtual void print_usage (void);
   // add some command line args to enable/disable throughputions
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 06dec476c97..3bf1845cb11 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -1,4 +1,3 @@
-<<<<<<< Driver.cpp
 // $Id$
 
 #include "Driver.h"
@@ -99,7 +98,7 @@ EC_Driver::run_init (int &argc, char* argv[]
   this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  if (this->parse_args (convert.get_argc(), convert.get_ASCII_argv()))
+  if (this->parse_args (argc, argv))
     ACE_THROW (CORBA::INTERNAL (TAO::VMCID,
                                 CORBA::COMPLETED_NO));
 
@@ -1027,1033 +1026,3 @@ EC_Driver::supplier_disconnect (void*
                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
-=======
-// $Id$
-
-#include "Driver.h"
-#include "Consumer.h"
-#include "Supplier.h"
-
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-
-#include "tao/ORB_Constants.h"
-
-#include "ace/Sched_Params.h"
-#include "ace/Arg_Shifter.h"
-#include "ace/Argv_Type_Converter.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Stats.h"
-#include "ace/OS_NS_errno.h"
-#include "ace/OS_NS_unistd.h"
-
-#if !defined(EC_DISABLE_OLD_EC)
-#include "EC_Scheduler_Info.h"
-#endif
-
-#if !defined (__ACE_INLINE__)
-#include "Driver.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(EC_Tests, EC_Driver, "$Id$")
-
-EC_Driver::EC_Driver (void)
-  :  n_consumers_ (1),
-     consumers_ (0),
-     n_suppliers_ (1),
-     suppliers_ (0),
-     tasks_ (0),
-     burst_count_  (100),
-     burst_size_   (100),
-     payload_size_ (0),
-     burst_pause_  (10000),
-     consumer_type_start_ (ACE_ES_EVENT_UNDEFINED),
-     consumer_type_count_ (1),
-     consumer_type_shift_ (2),
-     supplier_type_start_ (ACE_ES_EVENT_UNDEFINED),
-     supplier_type_count_ (1),
-     supplier_type_shift_ (2),
-     pid_file_name_ (0),
-     verbose_ (0),
-     thr_create_flags_ (THR_NEW_LWP|THR_BOUND|THR_SCHED_FIFO),
-     use_remote_ec_ (0),
-     event_service_name_ ("EventService"),
-     ec_impl_ (0)
-{
-  TAO_EC_Default_Factory::init_svcs ();
-}
-
-EC_Driver::~EC_Driver (void)
-{
-}
-
-int
-EC_Driver::run (int argc, char* argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      // Calibrate the high resolution timer *before* starting the
-      // test.
-      ACE_High_Res_Timer::calibrate ();
-
-      this->run_init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->dump_results ();
-
-      this->run_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC_Driver::run");
-    }
-  ACE_CATCHALL
-    {
-      ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) non-corba exception raised\n"));
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void
-EC_Driver::run_init (int &argc, char* argv[]
-                     ACE_ENV_ARG_DECL)
-{
-  this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (this->parse_args (convert.get_argc(), convert.get_ASCII_argv()))
-    ACE_THROW (CORBA::INTERNAL (TAO::VMCID,
-                                CORBA::COMPLETED_NO));
-
-  if (this->verbose ())
-    this->print_args ();
-
-  if (this->pid_file_name_ != 0)
-    {
-      FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w"));
-      if (pid != 0)
-        {
-          ACE_OS::fprintf (pid, "%ld\n",
-                           static_cast<long> (ACE_OS::getpid ()));
-          ACE_OS::fclose (pid);
-        }
-    }
-
-  if (this->move_to_rt_class () == -1)
-    ACE_THROW (CORBA::INTERNAL (TAO::VMCID,
-                                CORBA::COMPLETED_NO));
-
-  this->initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (this->allocate_consumers () == -1)
-    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                 CORBA::COMPLETED_NO));
-
-  if (this->allocate_suppliers () == -1)
-    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                 CORBA::COMPLETED_NO));
-
-  this->connect_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-EC_Driver::run_cleanup (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->disconnect_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->shutdown_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) channel destroyed\n"));
-
-  this->deactivate_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) channel deactivated\n"));
-
-  this->cleanup_tasks ();
-  this->cleanup_suppliers ();
-  this->cleanup_consumers ();
-  this->cleanup_ec ();
-
-  this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->root_poa_ = PortableServer::POA::_nil ();
-
-  this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->orb_ = CORBA::ORB::_nil ();
-}
-
-void
-EC_Driver::initialize_orb_and_poa (int &argc, char* argv[]
-                                   ACE_ENV_ARG_DECL)
-{
-  this->orb_ =
-    CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (poa_object.in ()))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "EC_Driver (%P|%t) Unable to initialize the POA.\n"));
-      return;
-    }
-
-  this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-EC_Driver::print_args (void) const
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Execution parameters:\n"
-              "  consumers = <%d>\n"
-              "  suppliers = <%d>\n"
-              "  burst count = <%d>\n"
-              "  burst size = <%d>\n"
-              "  event size = <%d>\n"
-              "  burst pause = <%d>\n"
-              "  consumer type start = <%d>\n"
-              "  consumer type count = <%d>\n"
-              "  consumer type shift = <%d>\n"
-              "  supplier type start = <%d>\n"
-              "  supplier type count = <%d>\n"
-              "  supplier type shift = <%d>\n"
-              "  pid file name = <%s>\n",
-
-              this->n_consumers_,
-              this->n_suppliers_,
-              this->burst_count_,
-              this->burst_size_,
-              this->payload_size_,
-              this->burst_pause_,
-
-              this->consumer_type_start_,
-              this->consumer_type_count_,
-              this->consumer_type_shift_,
-              this->supplier_type_start_,
-              this->supplier_type_count_,
-              this->supplier_type_shift_,
-
-              this->pid_file_name_?this->pid_file_name_:"nil"
-              ) );
-}
-
-int
-EC_Driver::move_to_rt_class (void)
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "EC_Driver (%P|%t): user is not superuser, "
-                      "so remain in time-sharing class\n"));
-          this->thr_create_flags_ = THR_NEW_LWP;
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "EC_Driver (%P|%t): sched_params failed\n"));
-    }
-
-  if (ACE_OS::thr_setprio (priority) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) main thr_setprio failed,"
-                  "no real-time features\n"));
-    }
-  return 0;
-}
-
-void
-EC_Driver::initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL)
-{
-#if !defined(EC_DISABLE_REMOTE_EC)
-  if (this->use_remote_ec_ == 1)
-    {
-      this->obtain_remote_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      return;
-    }
-#endif
-
-  this->initialize_new_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-#if !defined(EC_DISABLE_REMOTE_EC)
-void
-EC_Driver::obtain_remote_ec (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CosNaming::NamingContext_var naming_context =
-    this->get_naming_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CosNaming::Name channel_name (1);
-  channel_name.length (1);
-  channel_name[0].id = CORBA::string_dup (this->event_service_name_);
-
-  CORBA::Object_var tmp =
-    naming_context->resolve (channel_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->event_channel_ =
-    RtecEventChannelAdmin::EventChannel::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CosNaming::NamingContext_ptr
-EC_Driver::get_naming_context (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
-
-  if (CORBA::is_nil (naming_obj.in ()))
-    ACE_ERROR ((LM_ERROR,
-                "EC_Driver (%P|%t) Unable to obtain the "
-                "Naming Service.\n"));
-
-  return CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-}
-#endif
-
-void
-EC_Driver::initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_EC_Event_Channel_Attributes attr (this->root_poa_.in (),
-                                        this->root_poa_.in ());
-
-  this->modify_attributes (attr);
-
-  TAO_EC_Event_Channel *ec =
-    new TAO_EC_Event_Channel (attr);
-  this->ec_impl_ = ec;
-
-  ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->event_channel_ =
-    this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-EC_Driver::deactivate_ec (ACE_ENV_SINGLE_ARG_DECL)
-{
-#if !defined(EC_DISABLE_REMOTE_EC)
-  if (this->use_remote_ec_ == 1)
-    return;
-#endif
-
-  {
-    // Deactivate the EC
-    PortableServer::POA_var poa =
-      this->ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-    PortableServer::ObjectId_var id =
-      poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-    poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) EC deactivated\n"));
-
-}
-
-void
-EC_Driver::destroy_ec (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->event_channel_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-int
-EC_Driver::allocate_consumers (void)
-{
-  ACE_NEW_RETURN (this->consumers_,
-                  EC_Consumer*[this->n_consumers_],
-                  -1);
-  for (int i = 0; i < this->n_consumers_; ++i)
-    this->consumers_[i] =
-      this->allocate_consumer (i);
-  return 0;
-}
-
-int
-EC_Driver::allocate_suppliers (void)
-{
-  ACE_NEW_RETURN (this->suppliers_,
-                  EC_Supplier*[this->n_suppliers_],
-                  -1);
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    this->suppliers_[i] =
-      this->allocate_supplier (i);
-  return 0;
-}
-
-EC_Consumer*
-EC_Driver::allocate_consumer (int i)
-{
-  return new EC_Consumer (this,
-                          this->consumers_ + i);
-}
-
-EC_Supplier*
-EC_Driver::allocate_supplier (int i)
-{
-  return new EC_Supplier (this,
-                          this->suppliers_ + i);
-}
-
-void
-EC_Driver::connect_clients (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-EC_Driver::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-EC_Driver::shutdown_clients (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->shutdown_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->shutdown_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-EC_Driver::connect_consumers (ACE_ENV_SINGLE_ARG_DECL)
-{
-  RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  for (int i = 0; i < this->n_consumers_; ++i)
-    {
-      this->connect_consumer (consumer_admin.in (), i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) connected consumer(s)\n"));
-}
-
-void
-EC_Driver::connect_consumer (
-    RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i
-    ACE_ENV_ARG_DECL)
-{
-  RtecEventChannelAdmin::ConsumerQOS qos;
-  int shutdown_event_type;
-  this->build_consumer_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->consumers_[i]->connect (consumer_admin,
-                                qos,
-                                shutdown_event_type
-                                ACE_ENV_ARG_PARAMETER);
-}
-
-void
-EC_Driver::build_consumer_qos (
-  int i,
-  RtecEventChannelAdmin::ConsumerQOS& qos,
-  int& shutdown_event_type
-  ACE_ENV_ARG_DECL_NOT_USED)
-{
-  RtecBase::handle_t rt_info = 0;
-
-  int type_start =
-    this->consumer_type_start_
-    + i * this->consumer_type_shift_;
-
-  shutdown_event_type = type_start + this->consumer_type_count_;
-
-  ACE_ConsumerQOS_Factory qos_factory;
-  qos_factory.start_disjunction_group (1 + this->consumer_type_count_);
-  qos_factory.insert_type (shutdown_event_type, rt_info);
-
-  for (int j = 0; j != this->consumer_type_count_; ++j)
-    qos_factory.insert_type (type_start + j, rt_info);
-
-  qos = qos_factory.get_ConsumerQOS ();
-}
-
-void
-EC_Driver::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
-{
-  RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    {
-      this->connect_supplier (supplier_admin.in (), i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) connected supplier(s)\n"));
-}
-
-void
-EC_Driver::connect_supplier (
-    RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i
-    ACE_ENV_ARG_DECL)
-{
-  RtecEventChannelAdmin::SupplierQOS qos;
-  int shutdown_event_type;
-  this->build_supplier_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->suppliers_[i]->connect (supplier_admin,
-                                qos,
-                                shutdown_event_type
-                                ACE_ENV_ARG_PARAMETER);
-}
-
-void
-EC_Driver::build_supplier_qos (
-      int i,
-      RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type
-      ACE_ENV_ARG_DECL_NOT_USED)
-{
-  int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_;
-  int supplier_id = i + 1;
-  shutdown_event_type = type_start + this->supplier_type_count_;
-
-  RtecBase::handle_t rt_info = 0;
-
-  ACE_SupplierQOS_Factory qos_factory;
-  for (int j = 0; j != this->supplier_type_count_; ++j)
-    qos_factory.insert (supplier_id,
-                        type_start + j,
-                        rt_info, 1);
-
-  qos_factory.insert (supplier_id,
-                      shutdown_event_type,
-                      rt_info, 1);
-
-  qos = qos_factory.get_SupplierQOS ();
-}
-
-void
-EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->allocate_tasks () == -1)
-    return;
-
-  this->activate_tasks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers are active\n"));
-
-  // Wait for the supplier threads...
-  if (ACE_Thread_Manager::instance ()->wait () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) Thread_Manager wait failed\n"));
-    }
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers finished\n"));
-}
-
-int
-EC_Driver::allocate_tasks (void)
-{
-  if (this->tasks_ != 0)
-    return 0;
-
-  ACE_NEW_RETURN (this->tasks_,
-                  ACE_Task_Base*[this->n_suppliers_],
-                  -1);
-
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    this->tasks_[i] =
-      this->allocate_task (i);
-  return 0;
-}
-
-ACE_Task_Base*
-EC_Driver::allocate_task (int i)
-{
-  int start = this->supplier_type_start_ + i*this->supplier_type_shift_;
-  return new EC_Supplier_Task (this->suppliers_[i],
-                               this,
-                               this->suppliers_ + i,
-                               this->burst_count_,
-                               this->burst_size_,
-                               this->burst_pause_,
-                               this->payload_size_,
-                               start + this->supplier_type_count_);
-}
-
-void
-EC_Driver::activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-
-  if (ACE_BIT_DISABLED (this->thr_create_flags_, THR_SCHED_FIFO))
-    {
-      priority =
-        ACE_Sched_Params::priority_min (ACE_SCHED_OTHER);
-    }
-
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    {
-      if (this->tasks_[i]->activate (this->thr_create_flags_,
-                                     1, 0, priority) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "EC_Driver (%P|%t) Cannot activate thread "
-                      "for supplier %d\n%p\n",
-                      i, "EC_Driver - OS error is:"));
-        }
-    }
-}
-
-void
-EC_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->suppliers_ == 0)
-    return;
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    {
-      this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers disconnected\n"));
-}
-
-void
-EC_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->consumers_ == 0)
-    return;
-  for (int i = 0; i < this->n_consumers_; ++i)
-    {
-      this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) consumers disconnected\n"));
-}
-
-void
-EC_Driver::shutdown_suppliers (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->suppliers_ == 0)
-    return;
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    {
-      this->suppliers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers deactivated\n"));
-}
-
-void
-EC_Driver::shutdown_consumers (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->consumers_ == 0)
-    return;
-  for (int i = 0; i < this->n_consumers_; ++i)
-    {
-      this->consumers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) consumers deactivated\n"));
-}
-
-void
-EC_Driver::dump_results (void)
-{
-  ACE_Throughput_Stats throughput;
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-  char buf[BUFSIZ];
-  for (int j = 0; j < this->n_consumers_; ++j)
-    {
-      ACE_OS::sprintf (buf, "Consumer [%02d]", j);
-
-      this->consumers_[j]->dump_results (buf, gsf);
-      this->consumers_[j]->accumulate (throughput);
-    }
-  ACE_DEBUG ((LM_DEBUG, "\n"));
-
-  ACE_Throughput_Stats suppliers;
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    {
-      ACE_OS::sprintf (buf, "Supplier [%02d]", i);
-
-      this->suppliers_[i]->dump_results (buf, gsf);
-      this->suppliers_[i]->accumulate (suppliers);
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "\nTotals:\n"));
-  throughput.dump_results ("EC_Consumer/totals", gsf);
-
-  ACE_DEBUG ((LM_DEBUG, "\n"));
-  suppliers.dump_results ("EC_Supplier/totals", gsf);
-}
-
-int
-EC_Driver::parse_args (int &argc, char *argv[])
-{
-  ACE_TArg_Shifter< char > arg_shifter (argc, argv);
-
-  while (arg_shifter.is_anything_left ())
-    {
-      const char *arg = arg_shifter.get_current ();
-
-      if (ACE_OS::strcmp (arg, "-verbose") == 0)
-        {
-          arg_shifter.consume_arg ();
-          this->verbose_ = 1;
-        }
-
-      else if (ACE_OS::strcmp (arg, "-remote") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          this->use_remote_ec_ = 1;
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->event_service_name_ = arg_shifter.get_current ();
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-suppliers") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->n_suppliers_ = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-consumers") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->n_consumers_ = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-burstcount") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->burst_count_ = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-burstsize") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->burst_size_ = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-payloadsize") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->payload_size_ = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-burstpause") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->burst_pause_ = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-consumer_tstart") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->consumer_type_start_ =
-                ACE_ES_EVENT_UNDEFINED
-                + ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-consumer_tcount") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->consumer_type_count_ =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-consumer_tshift") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->consumer_type_shift_ =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-supplier_tstart") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->supplier_type_start_ =
-                ACE_ES_EVENT_UNDEFINED
-                + ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-supplier_tcount") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->supplier_type_count_ =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-supplier_tshift") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->supplier_type_shift_ =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else
-        {
-          arg_shifter.ignore_arg ();
-        }
-
-    }
-  return 0;
-}
-
-void
-EC_Driver::print_usage (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "EC_Driver Usage:\n"
-              "  -verbose\n"
-              "  -remote <ec_name>\n"
-              "  -old_reactive\n"
-              "  -old_threaded\n"
-              "  -suppliers <nsuppliers>\n"
-              "  -consumers <nsuppliers>\n"
-              "  -burstcount <bursts>\n"
-              "  -burstsize <size>\n"
-              "  -payloadsize <size>\n"
-              "  -burstpause <usecs>\n"
-              "  -consumer_tstart <type>\n"
-              "  -consumer_tcount <count>\n"
-              "  -consumer_tshift <shift>\n"
-              "  -supplier_tstart <type>\n"
-              "  -supplier_tcount <count>\n"
-              "  -supplier_tshift <shift>\n"
-              ));
-}
-
-void
-EC_Driver::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
-{
-   ACE_UNUSED_ARG(attr);
-
-   // This method can be overruled by derived tests to set the event channel
-   // attributes
-}
-
-void
-EC_Driver::cleanup_tasks (void)
-{
-  if (this->tasks_ != 0)
-    {
-      for (int i = 0; i != this->n_suppliers_; ++i)
-        {
-          delete this->tasks_[i];
-          this->tasks_[i] = 0;
-        }
-      delete[] this->tasks_;
-      this->tasks_ = 0;
-    }
-}
-
-void
-EC_Driver::cleanup_suppliers (void)
-{
-  if (this->suppliers_ != 0)
-    {
-      for (int i = 0; i != this->n_suppliers_; ++i)
-        {
-          delete this->suppliers_[i];
-          this->suppliers_[i] = 0;
-        }
-      delete[] this->suppliers_;
-      this->suppliers_ = 0;
-    }
-}
-
-void
-EC_Driver::cleanup_consumers (void)
-{
-  if (this->consumers_ != 0)
-    {
-      for (int i = 0; i != this->n_consumers_; ++i)
-        {
-          delete this->consumers_[i];
-          this->consumers_[i] = 0;
-        }
-      delete[] this->consumers_;
-      this->consumers_ = 0;
-    }
-}
-
-void
-EC_Driver::cleanup_ec (void)
-{
-  delete this->ec_impl_;
-#if !defined(EC_DISABLE_OLD_EC)
-  delete this->module_factory_;
-#endif
-}
-
-int
-EC_Driver::decode_consumer_cookie (void* cookie) const
-{
-  return static_cast<EC_Consumer**> (cookie) - this->consumers_;
-}
-
-int
-EC_Driver::decode_supplier_cookie (void* cookie) const
-{
-  return static_cast<EC_Supplier**> (cookie) - this->suppliers_;
-}
-
-void
-EC_Driver::consumer_push (void*,
-                          const RtecEventComm::EventSet&
-                          ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-EC_Driver::consumer_shutdown (void*
-                              ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-EC_Driver::consumer_disconnect (void*
-                                ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-void
-EC_Driver::supplier_disconnect (void*
-                                ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
->>>>>>> 1.36.12.4
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index c14b3bbfb88..b4022839e36 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -75,7 +75,7 @@ public:
                   char *argv[]) ;
 
   int init (int argc,
-            ACE_TCHAR *argv[]
+            char *argv[]
             ACE_ENV_ARG_DECL);
   // initialization.
 
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
index cd14bb71ac9..c37bda7f2a9 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
@@ -76,8 +76,8 @@ Notify_Structured_Push_Consumer::push_structured_event (
   {
     this->client_.consumer_done (this);
     ACE_ERROR ((LM_ERROR,
-      ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too "
-      "many events received (%d).\n"), this->count_));
+      ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too ")
+      ACE_TEXT ("many events received (%d).\n"), this->count_));
   }
 
   ACE_ASSERT(ACE_OS::strcmp(event.header.variable_header[0].name.in(), "Id") == 0);
diff --git a/TAO/orbsvcs/tests/Notify/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
index f618a8efedc..6e50d7653df 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
@@ -2,6 +2,7 @@
 
 #include "../lib/Driver.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
 ACE_TMAIN (int argc, char *argv[])
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index da91f87afda..f6d6d099d85 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -7,6 +7,7 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_stdio.h"
 #include "tao/AnyTypeCode/Any.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify_Tests, Consumer_Main, "$Id$")
 
@@ -1880,7 +1881,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Consumer_Main app;
   ACE_TRY_NEW_ENV
   {
-    result = app.init(argc, argv ACE_ENV_ARG_PARAMETER);
+    result = app.init(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK
 
     if (result == 0)
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index 816222bd243..e50702d68b7 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -7,6 +7,7 @@
 #include "tao/TimeBaseC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify_Tests, Supplier_Main, "$Id$")
 
@@ -220,7 +221,7 @@ Supplier_Main::Supplier_Main ()
   , use_naming_service_ (true)
   , serial_number_ (0)
   , disconnect_on_exit_ (false)
-  , id_file_ (ACE_TEXT ("supplier.ids"))
+  , id_file_ ("supplier.ids")
   , pause_ (0)
   , ec_id_ (0)
   , sa_id_(0)
@@ -276,47 +277,47 @@ int
 Supplier_Main::parse_single_arg (int argc, char *argv[])
 {
   int consumed = 0;
-  if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-v")) == 0)
+  if (ACE_OS::strcasecmp (argv[0], "-v") == 0)
   {
     this->verbose_ = true;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-any")) == 0)
+  else if (ACE_OS::strcasecmp (argv[0], "-any") == 0)
   {
     this->mode_ = MODE_ANY;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-structured")) == 0)
+  else if (ACE_OS::strcasecmp (argv[0], "-structured") == 0)
   {
     this->mode_ = MODE_STRUCTURED;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-sequence")) == 0)
+  else if (ACE_OS::strcasecmp (argv[0], "-sequence") == 0)
   {
     this->mode_ = MODE_SEQUENCE;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-channel")) == 0)
+  else if (ACE_OS::strcasecmp (argv[0], "-channel") == 0)
   {
     this->channel_file_= argv[1];
     consumed = 2;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-send")) == 0 && argc > 1)
+  else if (ACE_OS::strcasecmp (argv[0], "-send") == 0 && argc > 1)
   {
     this->send_ = ACE_OS::atoi (argv[1]);
     consumed = 2;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-pause")) == 0 && argc > 1)
+  else if (ACE_OS::strcasecmp (argv[0], "-pause") == 0 && argc > 1)
   {
     this->pause_ = ACE_OS::atoi (argv[1]);
     consumed = 2;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-serial_number")) == 0)
+  else if (ACE_OS::strcasecmp (argv[0], "-serial_number") == 0)
   {
     this->serial_number_= ACE_OS::atoi (argv[1]);
     consumed = 2;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-nonamesvc")) == 0)
+  else if (ACE_OS::strcasecmp (argv[0], "-nonamesvc") == 0)
   {
     this->use_naming_service_ = false;
     consumed = 1;
@@ -1349,7 +1350,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Supplier_Main app;
   ACE_TRY_NEW_ENV
   {
-    result = app.init(argc, argv ACE_ENV_ARG_PARAMETER);
+    result = app.init(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK
 
     if (result == 0)
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
index 81ad459a1fe..2eb56f40573 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -109,8 +109,8 @@ Notify_Sequence_Push_Consumer::push_structured_events (
     {
       this->client_.consumer_done (this);
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too "
-                            "many events received.\n")));
+                  ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too ")
+                  ACE_TEXT ("many events received.\n")));
       ACE_THROW (CORBA::INTERNAL ());
     }
   else if (this->count_ == this->low_)
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
index c376bd3114f..9ea168ea6e1 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -117,8 +117,8 @@ Notify_Sequence_Push_Consumer::push_structured_events(
     {
       this->client_.consumer_done (this);
       ACE_ERROR((LM_ERROR,
-                 ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too "
-                           "many events received.\n")));
+                 ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too ")
+                 ACE_TEXT ("many events received.\n")));
     }
   else if (this->count_ == this->low_)
     {