diff options
Diffstat (limited to 'TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp')
| -rw-r--r-- | TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp | 50 |
1 files changed, 9 insertions, 41 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")); |