diff options
Diffstat (limited to 'TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index c00025a6778..740bc4ecc00 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -48,10 +48,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) ACE_TRY_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); - ACE_TRY_CHECK; - + this->orb_->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), @@ -74,14 +71,14 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) "Execution parameters:\n" " consumers = <%d>\n" " suppliers = <%d>\n" - " type start = <%d>\n" + " type_start = <%d>\n" " type count = <%d>\n" " pid file name = <%s>\n", this->n_consumers_, this->n_suppliers_, this->type_start_, - this->type_count_, + this->type_start_, this->pid_file_name_?this->pid_file_name_:"nil") ); } @@ -121,10 +118,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) } CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references ("NameService", - ACE_TRY_ENV); - ACE_TRY_CHECK; - + this->orb_->resolve_initial_references ("NameService"); if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to get the Naming Service.\n"), @@ -175,7 +169,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "running the test\n")); for (;;) { - ACE_Time_Value tv (1, 0); + ACE_Time_Value tv (0, 10000); this->orb_->perform_work (tv, ACE_TRY_ENV); ACE_TRY_CHECK; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1); @@ -194,12 +188,6 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) channel->destroy (ACE_TRY_ENV); ACE_TRY_CHECK; } - - root_poa->destroy (1, 1, ACE_TRY_ENV); - ACE_TRY_CHECK; - - this->orb_->destroy (ACE_TRY_ENV); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sys_ex) { @@ -281,9 +269,6 @@ ECT_Consumer_Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV) { this->consumers_[i]->disconnect (ACE_TRY_ENV); ACE_CHECK; - - delete this->consumers_[i]; - this->consumers_[i] = 0; } } |