More of Daves ACE_USES_WCHAR fixes

4 files changed, 1053 insertions, 6 deletions

diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 17a7430c38b..06dec476c97 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -1,3 +1,4 @@
+<<<<<<< Driver.cpp
 // $Id$
 
 #include "Driver.h"
@@ -1026,3 +1027,1033 @@ 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/ace/OS_NS_stdlib.inl b/ace/OS_NS_stdlib.inl
index bdf1ac2faf0..23801969a72 100644
--- a/ace/OS_NS_stdlib.inl
+++ b/ace/OS_NS_stdlib.inl
@@ -8,7 +8,7 @@
 #include "ace/os_include/os_errno.h"
 #include "ace/os_include/os_search.h"
 #include "ace/os_include/os_limits.h"
-#include "ace/TSS_T.h"
+//#include "ace/TSS_T.h"
 
 #if defined(ACE_WCHAR_IN_STD_NAMESPACE)
 # define ACE_WCHAR_STD_NAMESPACE std
@@ -150,12 +150,20 @@ ACE_OS::getenv (const wchar_t *symbol)
 #elif defined (ACE_WIN32)
   ACE_OSCALL_RETURN (::_wgetenv (symbol), wchar_t *, 0);
 #else
+// Including ACE_TSS_T.h causes error!
+/*
   wchar_t* init = 0;
   static ACE_TSS< wchar_t* > wvalue (&init);
   ACE::String_Conversion::Allocator_malloc<wchar_t>().free(*wvalue);
   *wvalue.ts_object() = ACE_TEXT_TO_MALLOC_WCHAR_OUT (
                 ACE_OS::getenv (ACE_TEXT_TO_CHAR_IN (symbol)));
   return *wvalue;
+*/
+  static wchar_t* wvalue = 0;
+  ACE::String_Conversion::Allocator_malloc<wchar_t>().free(wvalue);
+  wvalue = ACE_TEXT_TO_MALLOC_WCHAR_OUT (
+                ACE_OS::getenv (ACE_TEXT_TO_CHAR_IN (symbol)));
+  return wvalue;
 #endif /* ACE_LACKS_ENV */
 }
 
diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl
index 881fb3dd60c..b9243532d15 100644
--- a/ace/OS_NS_time.inl
+++ b/ace/OS_NS_time.inl
@@ -6,7 +6,7 @@
 #include "ace/Time_Value.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_time.h"
-#include "ace/TSS_T.h"
+//#include "ace/TSS_T.h"
 
 ACE_INLINE char *
 ACE_OS::asctime (const struct tm *t)
@@ -118,15 +118,22 @@ ACE_OS::ctime (const time_t *t)
   ACE_OSCALL (::ctime (t), char *, 0, narrow_time);
   if (narrow_time == 0)
     return 0;
-  // ACE_TEXT_TO_WCHAR_OUT allocates (via malloc) a wchar_t[]. If
+  // ACE_TEXT_TO_MALLOC_WCHAR_OUT allocates (via malloc) a wchar_t[]. If
   // we've done this before, free the previous one. Yes, this leaves a
   // small memory leak (26 characters) but there's no way around this
   // that I know of. (Steve Huston, 12-Feb-2003).
+// Including ACE_TSS_T.h causes error!
+/*
   wchar_t* init = 0;
   static ACE_TSS< wchar_t* > wide_time (&init);
   ACE::String_Conversion::Allocator_malloc<wchar_t>().free(*wide_time);
   *wide_time.ts_object() = ACE_TEXT_TO_MALLOC_WCHAR_OUT (narrow_time);
   return *wide_time;
+*/
+  static wchar_t* wide_time = 0;
+  ACE::String_Conversion::Allocator_malloc<wchar_t>().free(wide_time);
+  wide_time = ACE_TEXT_TO_MALLOC_WCHAR_OUT (narrow_time);
+  return wide_time;
 #  else
   ACE_OSCALL_RETURN (::ctime (t), char *, 0);
 #  endif // ACE_USES_WCHAR
@@ -554,3 +561,4 @@ ACE_OS::tzset (void)
   errno = ENOTSUP;
 # endif /* ACE_HAS_WINCE && !VXWORKS && !ACE_PSOS && !__rtems__ && !ACE_HAS_DINKUM_STL */
 }
+
diff --git a/ace/String_Conversion_T.h b/ace/String_Conversion_T.h
index 48f988ab6fc..e8b32c884bc 100644
--- a/ace/String_Conversion_T.h
+++ b/ace/String_Conversion_T.h
@@ -195,8 +195,8 @@ class Convert_InOut
 public:
   //template < typename SrcT >
   explicit Convert_InOut( SrcT* src, size_t size, size_t encode_factor = 3 )
-  : len_((size-1)*encode_factor)
-  , encode_factor_(encode_factor)
+  : len_( size == calc_len ? calc_len : (size - 1) * encode_factor )
+  , encode_factor_( size == calc_len ? 1 : encode_factor )
   , str_(0)
   , orig_(src)
   , ownstr_( duplicate<DestT, SrcT, Allocator_cpp<DestT> >(src, &len_))
@@ -217,7 +217,7 @@ public:
   // where src and dest are the same type
   //template <>
   explicit Convert_InOut( DestT* src, size_t size = calc_len )
-  : len_(size==calc_len ? calc_len : size-1)
+  : len_( size == calc_len ? calc_len : size - 1 )
   , encode_factor_(1)
   , str_(src)
   , orig_(0)