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 | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index 912c35b0ddf..79854c466af 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -27,7 +27,6 @@ ECT_Consumer_Driver::ECT_Consumer_Driver (void) n_suppliers_ (1), type_start_ (ACE_ES_EVENT_UNDEFINED), type_count_ (1), - shutdown_event_channel_ (1), pid_file_name_ (0), active_count_ (0) { @@ -171,11 +170,8 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) this->disconnect_consumers (TAO_TRY_ENV); TAO_CHECK_ENV; - if (this->shutdown_event_channel_ != 0) - { - channel->destroy (TAO_TRY_ENV); - TAO_CHECK_ENV; - } + channel->destroy (TAO_TRY_ENV); + TAO_CHECK_ENV; } TAO_CATCH (CORBA::SystemException, sys_ex) { @@ -238,20 +234,14 @@ ECT_Consumer_Driver::connect_consumers void ECT_Consumer_Driver::dump_results (void) { - ECT_Driver::Throughput_Stats throughput; - ECT_Driver::Latency_Stats latency; for (int i = 0; i < this->n_consumers_; ++i) { char buf[BUFSIZ]; ACE_OS::sprintf (buf, "consumer_%02.2d", i); this->consumers_[i]->dump_results (buf); - this->consumers_[i]->accumulate (throughput); - this->consumers_[i]->accumulate (latency); } - throughput.dump_results ("ECT_Consumer", "accumulated"); - latency.dump_results ("ECT_Consumer", "accumulated"); - // this->dump_latency_results ("Latency"); + this->dump_latency_results ("Latency"); } void @@ -267,17 +257,13 @@ ECT_Consumer_Driver::disconnect_consumers (CORBA::Environment &TAO_IN_ENV) int ECT_Consumer_Driver::parse_args (int argc, char *argv []) { - ACE_Get_Opt get_opt (argc, argv, "xdc:s:h:p:"); + ACE_Get_Opt get_opt (argc, argv, "dc:s:h:p:"); int opt; while ((opt = get_opt ()) != EOF) { switch (opt) { - case 'x': - this->shutdown_event_channel_ = 0; - break; - case 'c': this->n_consumers_ = ACE_OS::atoi (get_opt.optarg); break; @@ -306,7 +292,6 @@ ECT_Consumer_Driver::parse_args (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "Usage: %s " "[ORB options] " - "-d -x " "-c <n_consumers> " "-s <n_suppliers> " "-h <type_start,type_count> " @@ -329,7 +314,7 @@ ECT_Consumer_Driver::parse_args (int argc, char *argv []) if (this->n_consumers_ <= 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_DEBUG, "%s: number of consumers or " "suppliers out of range\n", argv[0]), -1); } @@ -337,7 +322,7 @@ ECT_Consumer_Driver::parse_args (int argc, char *argv []) if (this->type_count_ <= 0) { this->type_count_ = 1; - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_DEBUG, "%s: number of event types " "suppliers out of range, reset to default (1)\n", argv[0]), -1); |