diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-24 15:39:09 +0000 |
commit | c801f87e59c00f72bdeb5ce7bd0d276674665bac (patch) | |
tree | 70bff03d1cf156ecf05ee4c5c338d8ce423e64ee /TAO/performance-tests/Cubit | |
parent | 98c0b37d4714ff774fc3ada8c9ee893c719af714 (diff) | |
download | ATCD-c801f87e59c00f72bdeb5ce7bd0d276674665bac.tar.gz |
Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/performance-tests/Cubit')
15 files changed, 53 insertions, 204 deletions
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp index a5db0ce0523..1dd797d6eac 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp @@ -203,7 +203,6 @@ DII_Cubit_Client::init (int argc, char **argv) this->argv_, "internet" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse command line and verify parameters. if (this->parse_args () == -1) @@ -216,13 +215,11 @@ DII_Cubit_Client::init (int argc, char **argv) this->factory_var_ = this->orb_var_->string_to_object (this->factory_IOR_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Get a Cubit object with a DII request on the Cubit factory. CORBA::Request_var mc_req (this->factory_var_->_request ("make_cubit" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; // make_cubit takes a char* arg that it doesn't use, but we must // still include it in the request. @@ -234,8 +231,7 @@ DII_Cubit_Client::init (int argc, char **argv) // Invoke the <make_cubit> operation to ask the Cubit factory // for a Cubit object. - mc_req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + mc_req->invoke (); // Extract the returned object reference from the request. mc_req->return_value () >>= CORBA::Any::to_object (this->obj_var_.out ()); @@ -342,17 +338,6 @@ DII_Cubit_Client::print_stats (const char *call_name, if (this->call_count_ > 0 && this->error_count_ == 0) { -#if defined (ACE_LACKS_FLOATING_POINT) - // elapsed_time.real_time is in units of microseconds. - const u_int calls_per_sec = - this->call_count_ * 1000000u / elapsed_time.real_time; - - ACE_DEBUG ((LM_DEBUG, - "\treal_time\t= %u ms,\n" - "\t%u calls/second\n", - elapsed_time.real_time / 1000u, - calls_per_sec)); -#else /* ! ACE_LACKS_FLOATING_POINT */ // elapsed_time.real_time is in units of seconds. double calls_per_sec = this->call_count_ / elapsed_time.real_time; @@ -369,7 +354,6 @@ DII_Cubit_Client::print_stats (const char *call_name, elapsed_time.system_time < 0.0 ? 0.0 : elapsed_time.system_time * ACE_ONE_SECOND_IN_MSECS, calls_per_sec < 0.0 ? 0.0 : calls_per_sec)); -#endif /* ! ACE_LACKS_FLOATING_POINT */ } else ACE_ERROR ((LM_ERROR, @@ -391,7 +375,6 @@ DII_Cubit_Client::cube_short_dii (void) CORBA::Request_var req (this->obj_var_->_request ("cube_short" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; CORBA::Short ret_short = 0; CORBA::Short arg_short = -3; @@ -403,8 +386,7 @@ DII_Cubit_Client::cube_short_dii (void) this->call_count_++; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + req->invoke (); req->return_value () >>= ret_short; @@ -435,7 +417,6 @@ DII_Cubit_Client::cube_long_dii (void) CORBA::Request_var req (this->obj_var_->_request ("cube_long" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; CORBA::Long ret_long = 0; CORBA::Long arg_long = -7; @@ -447,9 +428,8 @@ DII_Cubit_Client::cube_long_dii (void) this->call_count_++; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); + req->invoke (); - ACE_TRY_CHECK; req->return_value () >>= ret_long; @@ -480,7 +460,6 @@ DII_Cubit_Client::cube_octet_dii (void) CORBA::Request_var req (this->obj_var_->_request ("cube_octet" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; CORBA::Octet ret_octet = 0; CORBA::Octet arg_octet = 5; @@ -494,9 +473,8 @@ DII_Cubit_Client::cube_octet_dii (void) // Invoke, check for an exception and verify the result. this->call_count_++; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); + req->invoke (); - ACE_TRY_CHECK; CORBA::Any::to_octet to_ret_octet (ret_octet); req->return_value () >>= to_ret_octet; @@ -528,7 +506,6 @@ DII_Cubit_Client::cube_union_dii (void) CORBA::Request_var req (this->obj_var_->_request ("cube_union" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; Cubit::oneof arg_union; @@ -546,9 +523,8 @@ DII_Cubit_Client::cube_union_dii (void) this->call_count_++; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); + req->invoke (); - ACE_TRY_CHECK; // Extract the result and check validity. Cubit::oneof* ret_ptr; @@ -583,7 +559,6 @@ DII_Cubit_Client::cube_struct_dii (void) CORBA::Request_var req (this->obj_var_->_request ("cube_struct" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; Cubit::Many arg_struct, *ret_struct_ptr; @@ -600,9 +575,8 @@ DII_Cubit_Client::cube_struct_dii (void) this->call_count_++; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); + req->invoke (); - ACE_TRY_CHECK; req->return_value () >>= ret_struct_ptr; @@ -635,7 +609,6 @@ DII_Cubit_Client::cube_octet_seq_dii (int length) CORBA::Request_var req (this->obj_var_->_request ("cube_octet_sequence" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; // Same length as in IDL_Cubit tests so timings can be compared. // Return value holder is set to a different length to test resizing. @@ -653,9 +626,8 @@ DII_Cubit_Client::cube_octet_seq_dii (int length) this->call_count_++; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); + req->invoke (); - ACE_TRY_CHECK; req->return_value () >>= ret_octet_seq_ptr; @@ -696,7 +668,6 @@ DII_Cubit_Client::cube_long_seq_dii (int length) CORBA::Request_var req (this->obj_var_->_request ("cube_long_sequence" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; // Same length as in IDL_Cubit tests so timings can be compared. // Return value holder is set to a different length to test @@ -715,9 +686,8 @@ DII_Cubit_Client::cube_long_seq_dii (int length) this->call_count_++; - req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); + req->invoke (); - ACE_TRY_CHECK; req->return_value () >>= ret_long_seq_ptr; @@ -825,12 +795,10 @@ DII_Cubit_Client::run (void) CORBA::Request_var req (this->obj_var_->_request ("shutdown" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; // Cubit::shutdown () is a oneway operation. - req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); + req->send_oneway (); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\n\t Shutting down IDL_Cubit server \n\n")); diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp index a1cb973c59d..19148189795 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp @@ -389,7 +389,7 @@ Cubit_Client::check_enabled (u_int mask) const // Exercise the union. Cube a union. void -Cubit_Client::cube_union (ACE_ENV_SINGLE_ARG_DECL) +Cubit_Client::cube_union (void) { ACE_TRY { @@ -408,7 +408,6 @@ Cubit_Client::cube_union (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); } - ACE_TRY_CHECK; if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, "cube union ...")); @@ -436,7 +435,6 @@ Cubit_Client::cube_union (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); } - ACE_TRY_CHECK; if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, "cube union ...")); @@ -459,7 +457,6 @@ Cubit_Client::cube_union (ACE_ENV_SINGLE_ARG_DECL) this->error_count_++; } ACE_ENDTRY; - ACE_CHECK; } // Cube a short. @@ -481,7 +478,6 @@ Cubit_Client::cube_short (int i ACE_ENV_ARG_PARAMETER); } - ACE_TRY_CHECK; this->call_count_++; @@ -510,7 +506,6 @@ Cubit_Client::cube_short (int i this->error_count_++; } ACE_ENDTRY; - ACE_CHECK; } // Oneway test. @@ -522,8 +517,7 @@ Cubit_Client::cube_oneway (int ACE_TRY { ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ONEWAY_START); - this->cubit_->cube_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->cubit_->cube_oneway (); this->call_count_++; } ACE_CATCHANY @@ -533,7 +527,6 @@ Cubit_Client::cube_oneway (int this->error_count_++; } ACE_ENDTRY; - ACE_CHECK; } void @@ -543,8 +536,7 @@ Cubit_Client::cube_void (int ACE_TRY { ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_VOID_START); - this->cubit_->cube_void (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->cubit_->cube_void (); this->call_count_++; } ACE_CATCHANY @@ -554,7 +546,6 @@ Cubit_Client::cube_void (int this->error_count_++; } ACE_ENDTRY; - ACE_CHECK; } // Cube an octet @@ -576,7 +567,6 @@ Cubit_Client::cube_octet (int i ACE_ENV_ARG_PARAMETER); } - ACE_TRY_CHECK; this->call_count_++; @@ -606,7 +596,6 @@ Cubit_Client::cube_octet (int i this->error_count_++; } ACE_ENDTRY; - ACE_CHECK; } // calculate the cube from a long @@ -628,7 +617,6 @@ Cubit_Client::cube_long (int i ACE_ENV_ARG_PARAMETER); } - ACE_TRY_CHECK; this->call_count_++; @@ -661,7 +649,6 @@ Cubit_Client::cube_long (int i this->error_count_++; } ACE_ENDTRY; - ACE_CHECK; } // Cube the numbers in a struct @@ -689,7 +676,6 @@ Cubit_Client::cube_struct (int i ACE_ENV_ARG_PARAMETER); } - ACE_TRY_CHECK; if (TAO_debug_level > 2) { @@ -717,7 +703,6 @@ Cubit_Client::cube_struct (int i this->error_count_++; } ACE_ENDTRY; - ACE_CHECK; } // Cube the numbers in a sequence @@ -756,7 +741,6 @@ Cubit_Client::cube_long_sequence (int, ACE_ENV_ARG_PARAMETER); } - ACE_TRY_CHECK; if (output->length () != input.length ()) { @@ -792,7 +776,6 @@ Cubit_Client::cube_long_sequence (int, this->error_count_++; } ACE_ENDTRY; - ACE_CHECK; } void @@ -846,7 +829,6 @@ Cubit_Client::cube_octet_sequence (int, ACE_ENV_ARG_PARAMETER); } - ACE_TRY_CHECK; if (output->length () != input.length ()) { @@ -881,7 +863,6 @@ Cubit_Client::cube_octet_sequence (int, this->error_count_++; } ACE_ENDTRY; - ACE_CHECK; } // Cube the many in a sequence @@ -928,7 +909,6 @@ Cubit_Client::cube_many_sequence (int, ACE_ENV_ARG_PARAMETER); } - ACE_TRY_CHECK; if (output->length () != input.length ()) { @@ -967,7 +947,6 @@ Cubit_Client::cube_many_sequence (int, this->error_count_++; } ACE_ENDTRY; - ACE_CHECK; } void @@ -1048,7 +1027,6 @@ Cubit_Client::cube_rti_data (int, ACE_ENV_ARG_PARAMETER); } - ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -1069,7 +1047,6 @@ Cubit_Client::cube_rti_data (int, this->error_count_++; } ACE_ENDTRY; - ACE_CHECK; } @@ -1094,7 +1071,6 @@ Cubit_Client::cube_any (int i ret_any = this->cubit_->cube_any (arg_any ACE_ENV_ARG_PARAMETER); } - ACE_TRY_CHECK; *ret_any >>= ret_long; @@ -1129,7 +1105,6 @@ Cubit_Client::cube_any (int i this->error_count_++; } ACE_ENDTRY; - ACE_CHECK; } @@ -1159,7 +1134,6 @@ Cubit_Client::cube_any_struct (int i ret_any = this->cubit_->cube_any_struct (arg_any ACE_ENV_ARG_PARAMETER); } - ACE_TRY_CHECK; *ret_any >>= ret_struct; @@ -1192,7 +1166,6 @@ Cubit_Client::cube_any_struct (int i this->error_count_++; } ACE_ENDTRY; - ACE_CHECK; } @@ -1213,17 +1186,6 @@ Cubit_Client::print_stats (const char *call_name, { if (this->call_count_ > 0 && this->error_count_ == 0) { -#if defined (ACE_LACKS_FLOATING_POINT) - // elapsed_time.real_time is in units of microseconds. - const u_int calls_per_sec = - this->call_count_ * 1000000u / elapsed_time.real_time; - - ACE_DEBUG ((LM_DEBUG, - "\treal_time\t= %u ms,\n" - "\t%u calls/second\n", - elapsed_time.real_time / 1000u, - calls_per_sec)); -#else /* ! ACE_LACKS_FLOATING_POINT */ // elapsed_time.real_time is in units of seconds. double calls_per_sec = this->call_count_ / elapsed_time.real_time; @@ -1240,7 +1202,6 @@ Cubit_Client::print_stats (const char *call_name, elapsed_time.system_time < 0.0 ? 0.0 : elapsed_time.system_time * ACE_ONE_SECOND_IN_MSECS, calls_per_sec < 0.0 ? 0.0 : calls_per_sec)); -#endif /* ! ACE_LACKS_FLOATING_POINT */ } else { @@ -1283,7 +1244,6 @@ Cubit_Client::run () { this->cube_void (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1304,7 +1264,6 @@ Cubit_Client::run () { this->cube_short (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1325,7 +1284,6 @@ Cubit_Client::run () { this->cube_octet (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1346,7 +1304,6 @@ Cubit_Client::run () { this->cube_long (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1366,7 +1323,6 @@ Cubit_Client::run () { this->cube_struct (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1385,8 +1341,7 @@ Cubit_Client::run () for (i = 0; i < this->loop_count_; ++i) { - this->cube_union (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->cube_union (); } timer.stop (); @@ -1408,7 +1363,6 @@ Cubit_Client::run () this->cube_long_sequence (this->loop_count_, 4 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1430,7 +1384,6 @@ Cubit_Client::run () this->cube_long_sequence (this->loop_count_, 1024 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1457,7 +1410,6 @@ Cubit_Client::run () this->cube_octet_sequence (this->loop_count_, bytes_in_octet_sequence_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } else @@ -1467,7 +1419,6 @@ Cubit_Client::run () this->cube_octet_sequence (this->loop_count_, 16 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } } @@ -1490,7 +1441,6 @@ Cubit_Client::run () this->cube_octet_sequence (this->loop_count_, 4096 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1512,7 +1462,6 @@ Cubit_Client::run () this->cube_many_sequence (this->loop_count_, 4 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1534,7 +1483,6 @@ Cubit_Client::run () this->cube_many_sequence (this->loop_count_, 1024 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1555,15 +1503,12 @@ Cubit_Client::run () { this->cube_short (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->cube_octet (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->cube_long (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1585,7 +1530,6 @@ Cubit_Client::run () 2, 5 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1606,7 +1550,6 @@ Cubit_Client::run () { this->cube_oneway (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1627,7 +1570,6 @@ Cubit_Client::run () { this->cube_any (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1648,7 +1590,6 @@ Cubit_Client::run () this->cube_any_struct (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } timer.stop (); @@ -1660,11 +1601,10 @@ Cubit_Client::run () this->shutdown_server (this->shutdown_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_TRY_EX (SHM) { - this->cubit_->ping (ACE_ENV_SINGLE_ARG_PARAMETER); + this->cubit_->ping (); ACE_TRY_CHECK_EX (SHM); } ACE_CATCHANY @@ -1694,7 +1634,7 @@ Cubit_Client::shutdown_server (int do_shutdown ACE_TRY_EX(NOT_COLLOCATED) { - this->cubit_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); + this->cubit_->shutdown (); ACE_TRY_CHECK_EX (NOT_COLLOCATED); } ACE_CATCHANY @@ -1703,7 +1643,6 @@ Cubit_Client::shutdown_server (int do_shutdown "Cubit::shutdown_server"); } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); } return 0; @@ -1749,7 +1688,6 @@ Cubit_Client::init (int argc, char **argv) this->argv_, "internet" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Parse command line and verify parameters. if (this->parse_args () == -1) @@ -1779,12 +1717,10 @@ Cubit_Client::init (int argc, char **argv) CORBA::Object_var factory_object = this->orb_->string_to_object (this->cubit_factory_key_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->factory_ = Cubit_Factory::_narrow (factory_object.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (this->factory_.in ())) { @@ -1799,8 +1735,7 @@ Cubit_Client::init (int argc, char **argv) // Now retrieve the Cubit obj ref corresponding to the key. this->cubit_ = - this->factory_->make_cubit (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->factory_->make_cubit (); if (CORBA::is_nil (this->cubit_.in ())) { diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h index 34f047dae48..55033beac6c 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h @@ -82,7 +82,7 @@ private: ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time); // Prints the time stats. - void cube_union (ACE_ENV_SINGLE_ARG_DECL); + void cube_union (void); // Exercise the union. Cube a union. void cube_struct (int i diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp index 2d7ef27249d..1d456fa91e8 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp @@ -69,7 +69,6 @@ Cubit_Server::init (int argc, "%p\n", "init_child_poa"), -1); - ACE_CHECK_RETURN (-1); this->argc_ = argc; this->argv_ = argv; @@ -91,7 +90,6 @@ Cubit_Server::init (int argc, this->orb_manager_.activate_under_child_poa ("factory", this->factory_impl_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", @@ -109,9 +107,9 @@ Cubit_Server::init (int argc, } int -Cubit_Server::run (ACE_ENV_SINGLE_ARG_DECL) +Cubit_Server::run (void) { - if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->orb_manager_.run () == -1) ACE_ERROR_RETURN ((LM_ERROR, "Cubit_Server::run"), -1); diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h index 87c501fdaf6..188c2ba651c 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h @@ -55,7 +55,7 @@ public: ACE_ENV_ARG_DECL); // Initialize the Cubit_Server state - parsing arguments and ... - int run (ACE_ENV_SINGLE_ARG_DECL); + int run (void); // Run the orb private: diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp index 91a6f4b7df3..ccc48c3cdbe 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp @@ -128,10 +128,10 @@ Cubit_Factory_i::~Cubit_Factory_i (void) } Cubit_ptr -Cubit_Factory_i::make_cubit (ACE_ENV_SINGLE_ARG_DECL) +Cubit_Factory_i::make_cubit (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return my_cubit_._this (ACE_ENV_SINGLE_ARG_PARAMETER); + return my_cubit_._this (); } void @@ -154,7 +154,7 @@ Cubit_i::~Cubit_i (void) } PortableServer::POA_ptr -Cubit_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Cubit_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -166,14 +166,14 @@ Cubit_i::set_default_poa (PortableServer::POA_ptr poa) } void -Cubit_i::cube_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Cubit_i::cube_oneway (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ONEWAY_START); } void -Cubit_i::cube_void (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Cubit_i::cube_void (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_VOID_START); @@ -441,7 +441,7 @@ Cubit_i::cube_any_struct (const CORBA::Any & any // Shutdown. -void Cubit_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +void Cubit_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -453,7 +453,7 @@ void Cubit_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) void -Cubit_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Cubit_i::ping (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // do nothing diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h index 74cb14a9238..a1646985076 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h @@ -37,14 +37,14 @@ public: ~Cubit_i (void); // Destructor - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (void); // Returns the default POA for this servant. - virtual void cube_oneway (ACE_ENV_SINGLE_ARG_DECL) + virtual void cube_oneway (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Test a oneway call. - virtual void cube_void (ACE_ENV_SINGLE_ARG_DECL) + virtual void cube_void (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Test a twoway call. @@ -108,12 +108,12 @@ public: // Cube a struct in an any /// Shutdown routine. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// A ping. Please see the idl file for details. - virtual void ping (ACE_ENV_SINGLE_ARG_DECL) + virtual void ping (void) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -141,7 +141,7 @@ public: ~Cubit_Factory_i (void); // Destructor. - virtual Cubit_ptr make_cubit (ACE_ENV_SINGLE_ARG_DECL) + virtual Cubit_ptr make_cubit (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Make a cubit object. diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp index 389f51d958d..5e74b97b338 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp @@ -46,14 +46,12 @@ svr_worker (void *arg) int result = cubit_server.init (args.argc (), args.argv () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (result == -1) return (void *) 1; thread_barrier->server_init_.wait (); - cubit_server.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + cubit_server.run (); thread_barrier->client_fini_.wait (); } diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp index f28cd411ef0..19bb46abb59 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp @@ -54,13 +54,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { int ret = cubit_server.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (ret == -1) return -1; - cubit_server.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + cubit_server.run (); ACE_OS::sleep (5); } diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp index 2fb15abdc38..a5add90c160 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp @@ -72,21 +72,18 @@ Cubit_Task::svc (void) // Handle requests for this object until we're killed, or one of // the methods asks us to exit. - int r = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + int r = this->orb_manager_.run (); if (r == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1); - ACE_TRY_CHECK; CORBA::ORB_var orb = this->orb_manager_.orb (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -124,7 +121,6 @@ Cubit_Task::initialize_orb (void) "persistent_poa", orb_name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (r == -1) return -1; @@ -173,18 +169,14 @@ Cubit_Task::create_servants (void) CORBA::Object_var obj = this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var manager = - poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa->the_POAManager(); - manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + manager->activate(); // Create the array of cubit implementations. ACE_NEW_RETURN (this->servants_, @@ -233,14 +225,12 @@ Cubit_Task::create_servants (void) // some client. Then release the object. Cubit_var cubit = - this->servants_[i]->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->servants_[i]->_this (); CORBA::String_var str = this->orb_->object_to_string (cubit.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->servants_iors_[i] = ACE_OS::strdup (str.in ()); diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp index 876035b66dc..6ef61d05dfd 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp @@ -16,11 +16,7 @@ inline ACE_UINT32 ACE_round (ACE_timer_t t) { -#if defined (ACE_LACKS_FLOATING_POINT) - return t; -#else return static_cast<ACE_UINT32> (t); -#endif } ACE_RCSID(MT_Cubit, Task_Client, "$Id$") @@ -555,7 +551,7 @@ Client::find_frequency (void) } CORBA::ORB_ptr -Client::init_orb (ACE_ENV_SINGLE_ARG_DECL) +Client::init_orb (void) { ACE_DEBUG ((LM_DEBUG, "I'm thread %t\n")); @@ -586,7 +582,6 @@ Client::init_orb (ACE_ENV_SINGLE_ARG_DECL) argv, orbid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::ORB::_nil ()); if (this->id_ == 0) { @@ -636,7 +631,6 @@ Client::get_cubit (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) CORBA::Object_var objref = orb->string_to_object (my_ior ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (CORBA::is_nil (objref.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -647,7 +641,6 @@ Client::get_cubit (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) // checking the type along the way using _is_a. this->cubit_ = Cubit::_narrow (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->cubit_)) ACE_ERROR_RETURN ((LM_ERROR, @@ -660,7 +653,6 @@ Client::get_cubit (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) CORBA::String_var str = orb->object_to_string (this->cubit_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "(%t) CUBIT OBJECT connected to <%s>\n", @@ -676,15 +668,13 @@ Client::svc (void) ACE_TRY { // Initialize the ORB. - CORBA::ORB_var orb = this->init_orb (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ORB_var orb = this->init_orb (); // Find the frequency of CORBA requests based on thread id. this->find_frequency (); // Get the cubit object from the file. int r = this->get_cubit (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (r != 0) return r; @@ -718,15 +708,13 @@ Client::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%t) CALLING SHUTDOWN() ON THE SERVANT\n")); - this->cubit_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->cubit_->shutdown (); } CORBA::release (this->cubit_); this->cubit_ = 0; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { @@ -766,7 +754,6 @@ Client::cube_octet (void) ACE_ENV_ARG_PARAMETER); STOP_QUANTIFY; - ACE_TRY_CHECK; // Perform the cube operation. arg_octet = arg_octet * arg_octet * arg_octet; @@ -806,7 +793,6 @@ Client::cube_short (void) ret_short = this->cubit_->cube_short (arg_short ACE_ENV_ARG_PARAMETER); STOP_QUANTIFY; - ACE_TRY_CHECK; arg_short = arg_short * arg_short * arg_short; if (arg_short != ret_short) @@ -843,7 +829,6 @@ Client::cube_long (void) ret_long = this->cubit_->cube_long (arg_long ACE_ENV_ARG_PARAMETER); STOP_QUANTIFY; - ACE_TRY_CHECK; arg_long = arg_long * arg_long * arg_long; @@ -884,7 +869,6 @@ Client::cube_struct (void) ret_struct = this->cubit_->cube_struct (arg_struct ACE_ENV_ARG_PARAMETER); STOP_QUANTIFY; - ACE_TRY_CHECK; arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l ; arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s ; @@ -947,8 +931,7 @@ Client::make_request (void) { this->call_count_++; START_QUANTIFY; - this->cubit_->noop (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->cubit_->noop (); STOP_QUANTIFY; } ACE_CATCHANY @@ -1016,12 +999,7 @@ ACE_timer_t Client::calc_delta (ACE_timer_t real_time, ACE_timer_t delta) { - ACE_timer_t new_delta; -#if defined (ACE_LACKS_FLOATING_POINT) - new_delta = 40 * real_time / 100 + 60 * delta / 100; -#else /* !ACE_LACKS_FLOATING_POINT */ - new_delta = 0.4 * fabs (real_time) + 0.6 * delta; -#endif /* ACE_LACKS_FLOATING_POINT */ + ACE_timer_t new_delta = 0.4 * fabs (real_time) + 0.6 * delta; return new_delta; } diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h index 98b43509b90..41a5d68f355 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h @@ -58,12 +58,6 @@ # include /**/ <math.h> #endif /* ACE_HAS_EXCEPTIONS */ -#if defined (ACE_LACKS_FLOATING_POINT) -// The following is just temporary, until we finish the sqrt() -// implementation. -#define sqrt(X) (1) -#endif /* ACE_LACKS_FLOATING_POINT */ - #if defined (ACE_HAS_QUANTIFY) # define START_QUANTIFY quantify_start_recording_data (); # define STOP_QUANTIFY quantify_stop_recording_data(); @@ -279,7 +273,7 @@ public: // cubed. private: - CORBA::ORB_ptr init_orb (ACE_ENV_SINGLE_ARG_DECL); + CORBA::ORB_ptr init_orb (void); // initialize the ORB. void read_ior (void); diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp index 23cc89ffc17..80be1bd682c 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp @@ -38,19 +38,9 @@ ACE_timer_t MT_Cubit_Timer::get_elapsed (void) { ACE_timer_t real_time; -#if defined (ACE_LACKS_FLOATING_POINT) -# if defined (CHORUS_MVME) - real_time = (this->pstopTime_ - this->pstartTime_) / this->granularity_; -# else /* CHORUS_MVME */ - // Store the time in usecs. - real_time = (this->delta_.sec () * ACE_ONE_SECOND_IN_USECS + - this->delta_.usec ()) / this->granularity_; -# endif /* !CHORUS_MVME */ -#else /* !ACE_LACKS_FLOATING_POINT */ // Store the time in usecs. real_time = (ACE_timer_t) this->delta_.sec () * ACE_ONE_SECOND_IN_USECS + (ACE_timer_t) this->delta_.usec (); real_time = real_time/this->granularity_; -#endif /* !ACE_LACKS_FLOATING_POINT */ return real_time; // in usecs. } diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp index cd3adaaf7ca..57239669fdc 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp @@ -56,13 +56,13 @@ Cubit_i::cube_struct (const Cubit::Many &values } void -Cubit_i::noop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Cubit_i::noop (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // does nothing. } -void Cubit_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +void Cubit_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -71,7 +71,7 @@ void Cubit_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } PortableServer::POA_ptr -Cubit_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Cubit_i::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h index eaa646cfb06..f7fefe19059 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h @@ -45,14 +45,14 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void noop (ACE_ENV_SINGLE_ARG_DECL) + virtual void noop (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableServer::POA_ptr - _default_POA (ACE_ENV_SINGLE_ARG_DECL); + _default_POA (void); // The default POA protected: |