diff options
Diffstat (limited to 'TAO/performance-tests/POA')
18 files changed, 54 insertions, 130 deletions
diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp index 356f3c6ecbb..4257f6b4993 100644 --- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp +++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp @@ -106,14 +106,12 @@ object_creation_test (PortableServer::POA_ptr poa, poa->create_reference_with_id (oid.in (), "IDL:Test/Simple:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { object = poa->create_reference ("IDL:Test/Simple:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -140,12 +138,10 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -155,14 +151,11 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -172,32 +165,26 @@ main (int argc, char *argv[]) policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var child_poa = root_poa->create_POA ("TestPOA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; gsf = ACE_High_Res_Timer::global_scale_factor (); object_creation_test (root_poa.in (), 0 // POA::create_reference ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; object_creation_test (child_poa.in (), 1 // POA::create_reference_with_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp index 9a013dadf0b..d1c1b3866e6 100644 --- a/TAO/performance-tests/POA/Demux/client.cpp +++ b/TAO/performance-tests/POA/Demux/client.cpp @@ -35,12 +35,10 @@ main (int argc, char *argv []) { int r = demux_test_client.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (r == -1) return -1; - demux_test_client.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + demux_test_client.run (); } ACE_CATCH (CORBA::SystemException, sysex) { diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp index c8a5bcd7a4b..62eb0bcd746 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp @@ -68,7 +68,6 @@ Demux_Test_Client::init (int argc, char *argv [] ACE_RE_THROW_EX (GET_ORB); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); // now parse the rest of the arguments to determine the POA depth, the number // of objects with each POA and other info @@ -130,7 +129,6 @@ Demux_Test_Client::init (int argc, char *argv [] ACE_RE_THROW_EX (IOR); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); } // j and i loop ACE_OS::fclose (this->ior_fp_); @@ -255,7 +253,7 @@ Demux_Test_Client::parse_args (void) // The main program for Demux_Test int -Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL) +Demux_Test_Client::run (void) { // open a temporary results file if ((this->result_fp_ = ACE_OS::fopen ("results.dat", "w")) == 0) @@ -270,19 +268,19 @@ Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL) switch (this->is_) { case Demux_Test_Client::LINEAR: - (void) this->run_linear_test (ACE_ENV_SINGLE_ARG_PARAMETER); + (void) this->run_linear_test (); ACE_TRY_CHECK_EX (RUN); break; case Demux_Test_Client::RANDOM: - (void) this->run_random_test (ACE_ENV_SINGLE_ARG_PARAMETER); + (void) this->run_random_test (); ACE_TRY_CHECK_EX (RUN); break; case Demux_Test_Client::BEST: - (void) this->run_best_test (ACE_ENV_SINGLE_ARG_PARAMETER); + (void) this->run_best_test (); ACE_TRY_CHECK_EX (RUN); break; case Demux_Test_Client::WORST: - (void) this->run_worst_test (ACE_ENV_SINGLE_ARG_PARAMETER); + (void) this->run_worst_test (); ACE_TRY_CHECK_EX (RUN); break; } @@ -297,14 +295,13 @@ Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL) ACE_RE_THROW_EX (RUN); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); ACE_OS::fclose (this->result_fp_); ACE_TRY_EX (SHUTDOWN) { // call the shutdown method one the first object - this->demux_test_[0][0]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); + this->demux_test_[0][0]->shutdown (); ACE_TRY_CHECK_EX (SHUTDOWN); } ACE_CATCHANY @@ -317,7 +314,6 @@ Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL) ACE_RE_THROW_EX (SHUTDOWN) ; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); // now print the results if (this->print_results () == -1) @@ -332,7 +328,7 @@ Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL) } int -Demux_Test_Client::run_linear_test (ACE_ENV_SINGLE_ARG_DECL) +Demux_Test_Client::run_linear_test (void) { CORBA::ULong j, k, l, m; ACE_hrtime_t start, end; @@ -362,7 +358,7 @@ Demux_Test_Client::run_linear_test (ACE_ENV_SINGLE_ARG_DECL) } int -Demux_Test_Client::run_random_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Demux_Test_Client::run_random_test (void) { ACE_DEBUG ((LM_DEBUG, "ERROR : Random test\n")); @@ -370,7 +366,7 @@ Demux_Test_Client::run_random_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } int -Demux_Test_Client::run_best_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Demux_Test_Client::run_best_test (void) { ACE_DEBUG ((LM_DEBUG, "ERROR : Best Test\n")); @@ -378,7 +374,7 @@ Demux_Test_Client::run_best_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } int -Demux_Test_Client::run_worst_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Demux_Test_Client::run_worst_test (void) { ACE_DEBUG ((LM_DEBUG, "ERROR : Worst test\n")); diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.h b/TAO/performance-tests/POA/Demux/demux_test_client.h index 7b0a3714f32..23645d7c95d 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.h +++ b/TAO/performance-tests/POA/Demux/demux_test_client.h @@ -54,7 +54,7 @@ public: int init (int argc, char *argv [] ACE_ENV_ARG_DECL_WITH_DEFAULTS); // initialize the client test bed - int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int run (void); // run the tests private: @@ -65,16 +65,16 @@ private: int init_operation_db (void); // initialize the operation database - int run_linear_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int run_linear_test (void); // run linear strategy - int run_random_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int run_random_test (void); // run random strategy - int run_best_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int run_best_test (void); // run best strategy (w.r.t to linear) - int run_worst_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int run_worst_test (void); // run worst strategy (w.r.t to linear) int print_results (void); diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.inl b/TAO/performance-tests/POA/Demux/demux_test_client.inl index 0d2081ee78c..3661e2ecafb 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.inl +++ b/TAO/performance-tests/POA/Demux/demux_test_client.inl @@ -2,13 +2,13 @@ static void M302 (Demux_Test_ptr objref ACE_ENV_ARG_DECL) { - objref->M302 (ACE_ENV_SINGLE_ARG_PARAMETER); + objref->M302 (); } static void shutdown (Demux_Test_ptr objref ACE_ENV_ARG_DECL) { - objref->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); + objref->shutdown (); } int Demux_Test_Client::init_operation_db (void) diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp index c8810c36650..0d0a304bf28 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_i.cpp @@ -12,12 +12,12 @@ Demux_Test_i::Demux_Test_i (void) Demux_Test_i::~Demux_Test_i (void) {} -void Demux_Test_i::M302 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +void Demux_Test_i::M302 (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } -void Demux_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +void Demux_Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ORB_Core_instance ()->orb ()->shutdown (); diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.h b/TAO/performance-tests/POA/Demux/demux_test_i.h index 6d302340364..f82ed896160 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_i.h +++ b/TAO/performance-tests/POA/Demux/demux_test_i.h @@ -29,10 +29,10 @@ public: return PortableServer::POA::_duplicate (this->poa_.in ()); }; - virtual void M302 (ACE_ENV_SINGLE_ARG_DECL) + virtual void M302 (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp index 308a59127c6..a75df48a556 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp @@ -69,7 +69,6 @@ Demux_Test_Server::init (int argc, char *argv [] ACE_RE_THROW_EX (GET_ORB); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); // Grab the ROOT POA ACE_TRY_EX (GET_ROOT_POA) @@ -99,14 +98,13 @@ Demux_Test_Server::init (int argc, char *argv [] ACE_RE_THROW_EX (GET_ROOT_POA); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); // grab the POA Manager ACE_TRY_EX (GET_POA_MGR) { this->poa_mgr_ = - this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (); ACE_TRY_CHECK_EX (GET_POA_MGR); } ACE_CATCHANY @@ -116,7 +114,6 @@ Demux_Test_Server::init (int argc, char *argv [] ACE_RE_THROW_EX (GET_POA_MGR); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); // now parse the rest of the arguments to determine the POA depth, the number // of objects with each POA and other info @@ -194,7 +191,6 @@ Demux_Test_Server::init (int argc, char *argv [] ACE_RE_THROW_EX (POLICY); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); // now create a POA hierarchy of the desired depth and populate each POA with // the specified number of objects. Finally, activate these objects. @@ -243,7 +239,6 @@ Demux_Test_Server::init (int argc, char *argv [] ACE_RE_THROW_EX (CREATE_POA); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); for (j = 0; j < this->num_objs_; j++) { @@ -271,7 +266,6 @@ Demux_Test_Server::init (int argc, char *argv [] ACE_RE_THROW_EX (ACTIVATE_OBJ); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); // Get the IOR and output it to the file ACE_TRY_EX (IOR) @@ -294,7 +288,6 @@ Demux_Test_Server::init (int argc, char *argv [] ACE_RE_THROW_EX (IOR); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); } else { @@ -323,17 +316,14 @@ Demux_Test_Server::init (int argc, char *argv [] this->child_poa_[i]->activate_object_with_id (oid.in (), demux_test_i_ptr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get Object reference for demux_test_i impl object. - CORBA::Object_var demux_var = demux_test_i_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var demux_var = demux_test_i_ptr->_this (); - ACE_TRY_CHECK; CORBA::String_var ior = this->orb_->object_to_string (demux_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_OS::fprintf (this->ior_fp_, "%s\n", ior.in ()); @@ -345,7 +335,6 @@ Demux_Test_Server::init (int argc, char *argv [] ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); }// end of if (!use_user_id_) @@ -362,7 +351,7 @@ Demux_Test_Server::init (int argc, char *argv [] ACE_TRY_EX (ACTIVATE) { - this->poa_mgr_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); + this->poa_mgr_->activate (); ACE_TRY_CHECK_EX (ACTIVATE); } @@ -373,7 +362,6 @@ Demux_Test_Server::init (int argc, char *argv [] ACE_RE_THROW_EX (ACTIVATE); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); // success return 0; @@ -471,12 +459,11 @@ Demux_Test_Server::init_naming_service (void) // The main program for Demux_Test int -Demux_Test_Server::run (ACE_ENV_SINGLE_ARG_DECL) +Demux_Test_Server::run (void) { ACE_TRY { - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->run (); } ACE_CATCHANY { diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h index e26ce828e0c..63408010b76 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.h +++ b/TAO/performance-tests/POA/Demux/demux_test_server.h @@ -39,7 +39,7 @@ public: ~Demux_Test_Server (void); // dtor - int run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + int run (void); // Execute client code. int init (int argc, char **argv ACE_ENV_ARG_DECL_NOT_USED); diff --git a/TAO/performance-tests/POA/Demux/server.cpp b/TAO/performance-tests/POA/Demux/server.cpp index 629bb31cf5f..3cbd4a9d955 100644 --- a/TAO/performance-tests/POA/Demux/server.cpp +++ b/TAO/performance-tests/POA/Demux/server.cpp @@ -35,13 +35,11 @@ int main (int argc, char *argv []) { int r = demux_test_server.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (r == -1) return -1; - demux_test_server.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + demux_test_server.run (); } ACE_CATCH (CORBA::SystemException, sysex) { diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp index 048928657c2..912ddc367da 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp @@ -12,22 +12,21 @@ Factory::Factory (CORBA::ORB_ptr orb) } Test::Simple_ptr -Factory::create_simple_object (ACE_ENV_SINGLE_ARG_DECL) +Factory::create_simple_object (void) ACE_THROW_SPEC ((CORBA::SystemException)) { Simple *simple_impl; ACE_NEW_THROW_EX (simple_impl, Simple, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (Test::Simple::_nil ()); PortableServer::ServantBase_var owner_transfer(simple_impl); - return simple_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return simple_impl->_this (); } void -Factory::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Factory::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.h b/TAO/performance-tests/POA/Implicit_Activation/Factory.h index d7bc357d313..9d9432a65f2 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/Factory.h +++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.h @@ -23,10 +23,10 @@ public: // = The skeleton methods - virtual Test::Simple_ptr create_simple_object (ACE_ENV_SINGLE_ARG_DECL) + virtual Test::Simple_ptr create_simple_object (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp index f15b8b826ff..0df22e219be 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp @@ -10,16 +10,13 @@ Simple::Simple (void) } void -Simple::destroy (ACE_ENV_SINGLE_ARG_DECL) +Simple::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var oid = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.h b/TAO/performance-tests/POA/Implicit_Activation/Simple.h index 7257648e605..5aa5063f182 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/Simple.h +++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.h @@ -23,7 +23,7 @@ public: // = The skeleton methods - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp index d3b7ab3d1e0..6f305fc0da8 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp @@ -82,18 +82,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Factory_var factory = Test::Factory::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (factory.in ())) { @@ -118,8 +115,7 @@ main (int argc, char *argv[]) ACE_hrtime_t start = ACE_OS::gethrtime (); references[i] = - factory->create_simple_object (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + factory->create_simple_object (); ACE_hrtime_t now = ACE_OS::gethrtime (); activation.sample (now - start); @@ -142,8 +138,7 @@ main (int argc, char *argv[]) { ACE_hrtime_t start = ACE_OS::gethrtime (); - references[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + references[j]->destroy (); ACE_hrtime_t now = ACE_OS::gethrtime (); destruction.sample (now - start); @@ -161,8 +156,7 @@ main (int argc, char *argv[]) if (do_shutdown) { - factory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + factory->shutdown (); } } ACE_CATCHANY diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp index 562e77540ef..36c5f2d252d 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp @@ -74,11 +74,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -87,14 +85,11 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (parse_args (argc, argv) != 0) return 1; @@ -120,8 +115,7 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(simple_impl); references[i] = - simple_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + simple_impl->_this (); ACE_hrtime_t now = ACE_OS::gethrtime (); activation.sample (now - start); @@ -144,8 +138,7 @@ main (int argc, char *argv[]) { ACE_hrtime_t start = ACE_OS::gethrtime (); - references[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + references[j]->destroy (); ACE_hrtime_t now = ACE_OS::gethrtime (); destruction.sample (now - start); @@ -162,10 +155,8 @@ main (int argc, char *argv[]) destruction_stats.dump_results ("Destruction", gsf); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp index 9f3699650df..9ec930be5a7 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp @@ -65,11 +65,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -78,11 +76,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -94,12 +90,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(factory_impl); Test::Factory_var factory = - factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + factory_impl->_this (); CORBA::String_var ior = orb->object_to_string (factory.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -111,19 +105,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp index c3a276474ba..30ea9a7c75e 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp @@ -253,7 +253,6 @@ child_poa_testing (PortableServer::POA_ptr root_poa policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Create the child POA under the RootPOA. PortableServer::POA_var child_poa = @@ -261,7 +260,6 @@ child_poa_testing (PortableServer::POA_ptr root_poa PortableServer::POAManager::_nil (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Create an array of servants test_i *servants = @@ -300,7 +298,6 @@ child_poa_testing (PortableServer::POA_ptr root_poa child_poa->create_reference_with_id (object_ids[i].in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -315,7 +312,6 @@ child_poa_testing (PortableServer::POA_ptr root_poa child_poa->activate_object_with_id (object_ids[i].in (), &servants[i] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -329,7 +325,6 @@ child_poa_testing (PortableServer::POA_ptr root_poa { child_poa->deactivate_object (object_ids[i].in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -351,7 +346,6 @@ main (int argc, char **argv) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; int result = parse_args (argc, argv); if (result != 0) @@ -360,13 +354,11 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create an array of servants test_i *servants = @@ -395,8 +387,7 @@ main (int argc, char **argv) for (i = 0; i < iterations; i++) { - objects[i] = servants[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + objects[i] = servants[i]._this (); } } @@ -409,20 +400,17 @@ main (int argc, char **argv) { object_ids[i] = root_poa->servant_to_id (&servants[i] ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } // Create the child POA. child_poa_testing (root_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Destroy RootPOA. root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Cleanup delete[] object_ids; @@ -435,7 +423,6 @@ main (int argc, char **argv) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } |