diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
commit | 63165b00e2d667e39e15cf084128d94a563d484e (patch) | |
tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp | |
parent | 6579bccb3a3f22f882ef908ad5f7e1a65b00b133 (diff) | |
download | ATCD-63165b00e2d667e39e15cf084128d94a563d484e.tar.gz |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp')
-rw-r--r-- | TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp index 41ac5aa08cf..d83acef5ae8 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp @@ -36,8 +36,8 @@ ECFS_Coordinator::~ECFS_Coordinator (void) } void -ECFS_Coordinator::join (Control::Peer_ptr peer, - CORBA::Environment &ACE_TRY_ENV) +ECFS_Coordinator::join (Control::Peer_ptr peer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { { @@ -59,14 +59,14 @@ ECFS_Coordinator::join (Control::Peer_ptr peer, for (i = 0; i != this->peers_count_; ++i) { RtecEventChannelAdmin::EventChannel_var channel = - this->peers_[i]->channel (ACE_TRY_ENV); + this->peers_[i]->channel (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (size_t j = 0; j != this->peers_count_; ++j) { if (i != j) { - this->peers_[j]->connect (channel.in (), ACE_TRY_ENV); + this->peers_[j]->connect (channel.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -88,8 +88,8 @@ ECFS_Coordinator::join (Control::Peer_ptr peer, if (j != i) { loopbacks[lcount++] = - this->peers_[j]->setup_loopback (experiment_id, - ACE_TRY_ENV); + this->peers_[j]->setup_loopback (experiment_id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -105,8 +105,8 @@ ECFS_Coordinator::join (Control::Peer_ptr peer, this->peers_[i]->run_experiment (c, experiment_id, this->iterations_, - gsf, - ACE_TRY_ENV); + gsf + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_Sample_History history (samples->length ()); @@ -128,8 +128,7 @@ ECFS_Coordinator::join (Control::Peer_ptr peer, for (CORBA::ULong k = 0; k != samples->length (); ++k) { history.sample (samples[k]); - ACE_OS::fprintf (output_file, - "HISTO: %d " ACE_UINT64_FORMAT_SPECIFIER "\n", + ACE_OS::fprintf (output_file, "HISTO: %d %lld\n", k, samples[k] / gsf); } ACE_OS::fclose (output_file); @@ -147,7 +146,7 @@ ECFS_Coordinator::join (Control::Peer_ptr peer, for (j = 0; j != lcount; ++j) { - loopbacks[j]->destroy (ACE_TRY_ENV); + loopbacks[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -156,10 +155,10 @@ ECFS_Coordinator::join (Control::Peer_ptr peer, for (i = 0; i != this->peers_count_; ++i) { - this->peers_[i]->shutdown (ACE_TRY_ENV); + this->peers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; } |