diff options
Diffstat (limited to 'TAO/tests/Smart_Proxies/Benchmark')
| -rw-r--r-- | TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp | 5 | ||||
| -rw-r--r-- | TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h | 2 | ||||
| -rw-r--r-- | TAO/tests/Smart_Proxies/Benchmark/client.cpp | 18 | ||||
| -rw-r--r-- | TAO/tests/Smart_Proxies/Benchmark/server.cpp | 25 |
4 files changed, 15 insertions, 35 deletions
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp index 949c299e773..766e16bd8bd 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp @@ -28,13 +28,12 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) } CORBA::Short -Smart_Test_Proxy::box_prices (ACE_ENV_SINGLE_ARG_DECL) +Smart_Test_Proxy::box_prices (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->price_ == 0) { - this->price_ = TAO_Test_Smart_Proxy_Base::box_prices (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->price_ = TAO_Test_Smart_Proxy_Base::box_prices (); } return this->price_; } diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h index b3ac7e0c5d9..a9702e0cc56 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h @@ -17,7 +17,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base public: Smart_Test_Proxy (Test_ptr proxy); - virtual CORBA::Short box_prices(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short box_prices(void) ACE_THROW_SPEC ((CORBA::SystemException)); // "Smartify" the method call! diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp index 34732cdac90..6a61bacafdb 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp @@ -124,7 +124,6 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -132,7 +131,6 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (register_smart_proxy == 1) { // To use the smart proxy it is necessary to allocate the @@ -154,7 +152,6 @@ main (int argc, char *argv[]) Test_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -177,8 +174,7 @@ main (int argc, char *argv[]) // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - price = server->box_prices (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + price = server->box_prices (); if (price < 300) cost = server->tickets (5); @@ -190,21 +186,18 @@ main (int argc, char *argv[]) marker.sample (now - throughput_base, now - latency_base); - ACE_TRY_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); } marker.dump_stats ("buying tickets ", gsf); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); /* Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server1.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -227,8 +220,7 @@ main (int argc, char *argv[]) // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - price1 = server1->box_prices (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + price1 = server1->box_prices (); if (price1 < 300) cost = server1->tickets (5); @@ -240,15 +232,13 @@ main (int argc, char *argv[]) marker.sample (now - throughput_base1, now - latency_base); - ACE_TRY_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); } marker1.dump_stats ("buying tickets using a default proxy ", gsf1); - server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server1->shutdown (); */ } ACE_CATCHANY diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp index ca2acbcbec2..e16d114222e 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp @@ -29,14 +29,14 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - CORBA::Short box_prices (ACE_ENV_SINGLE_ARG_DECL) + CORBA::Short box_prices (void) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long tickets (CORBA::Short number ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -50,7 +50,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } CORBA::Short -Test_i::box_prices (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_i::box_prices (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 125; @@ -65,7 +65,7 @@ Test_i::tickets (CORBA::Short number } void -Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); @@ -112,34 +112,28 @@ main (int argc, char *argv[]) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_i servant (orb.in ()); // Obtain RootPOA. CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); Test_var Test_object = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (Test_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -159,11 +153,9 @@ main (int argc, char *argv[]) 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, "event loop finished\n")); @@ -171,7 +163,6 @@ main (int argc, char *argv[]) root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { |