diff options
Diffstat (limited to 'TAO/performance-tests/Cubit')
14 files changed, 183 insertions, 183 deletions
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp index 09a07be02fd..4c17c253c65 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp @@ -201,7 +201,7 @@ DII_Cubit_Client::init (int argc, char **argv) this->orb_var_ = CORBA::ORB_init (this->argc_, this->argv_, "internet" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -214,12 +214,12 @@ DII_Cubit_Client::init (int argc, char **argv) // Get a factory object reference from the factory IOR. this->factory_var_ = this->orb_var_->string_to_object (this->factory_IOR_ - TAO_ENV_ARG_PARAMETER); + 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" - TAO_ENV_ARG_PARAMETER)); + ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; @@ -233,7 +233,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + mc_req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Extract the returned object reference from the request. @@ -388,7 +388,7 @@ DII_Cubit_Client::cube_short_dii (void) { // Create the request ... CORBA::Request_var req (this->obj_var_->_request ("cube_short" - TAO_ENV_ARG_PARAMETER)); + ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; @@ -402,7 +402,7 @@ DII_Cubit_Client::cube_short_dii (void) this->call_count_++; - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; req->return_value () >>= ret_short; @@ -432,7 +432,7 @@ DII_Cubit_Client::cube_long_dii (void) { // Create the request ... CORBA::Request_var req (this->obj_var_->_request ("cube_long" - TAO_ENV_ARG_PARAMETER)); + ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; @@ -446,7 +446,7 @@ DII_Cubit_Client::cube_long_dii (void) this->call_count_++; - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -477,7 +477,7 @@ DII_Cubit_Client::cube_octet_dii (void) { // Create the request ... CORBA::Request_var req (this->obj_var_->_request ("cube_octet" - TAO_ENV_ARG_PARAMETER)); + ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; @@ -493,7 +493,7 @@ DII_Cubit_Client::cube_octet_dii (void) // Invoke, check for an exception and verify the result. this->call_count_++; - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -525,7 +525,7 @@ DII_Cubit_Client::cube_union_dii (void) { // Create the request ... CORBA::Request_var req (this->obj_var_->_request ("cube_union" - TAO_ENV_ARG_PARAMETER)); + ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; @@ -545,7 +545,7 @@ DII_Cubit_Client::cube_union_dii (void) this->call_count_++; - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -580,7 +580,7 @@ DII_Cubit_Client::cube_struct_dii (void) { // Create the request ... CORBA::Request_var req (this->obj_var_->_request ("cube_struct" - TAO_ENV_ARG_PARAMETER)); + ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; @@ -599,7 +599,7 @@ DII_Cubit_Client::cube_struct_dii (void) this->call_count_++; - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -632,7 +632,7 @@ DII_Cubit_Client::cube_octet_seq_dii (int length) { // Create the request ... CORBA::Request_var req (this->obj_var_->_request ("cube_octet_sequence" - TAO_ENV_ARG_PARAMETER)); + ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; @@ -652,7 +652,7 @@ DII_Cubit_Client::cube_octet_seq_dii (int length) this->call_count_++; - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -693,7 +693,7 @@ DII_Cubit_Client::cube_long_seq_dii (int length) { // Create the request ... CORBA::Request_var req (this->obj_var_->_request ("cube_long_sequence" - TAO_ENV_ARG_PARAMETER)); + ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; @@ -714,7 +714,7 @@ DII_Cubit_Client::cube_long_seq_dii (int length) this->call_count_++; - req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); + req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -822,12 +822,12 @@ DII_Cubit_Client::run (void) if (this->shutdown_) { CORBA::Request_var req (this->obj_var_->_request ("shutdown" - TAO_ENV_ARG_PARAMETER)); + ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; // Cubit::shutdown () is a oneway operation. - req->send_oneway (TAO_ENV_SINGLE_ARG_PARAMETER); + req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; 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 3f9d51cff0b..cd4c2b57d43 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp @@ -382,7 +382,7 @@ Cubit_Client::check_enabled (u_int mask) const // Exercise the union. Cube a union. void -Cubit_Client::cube_union (TAO_ENV_SINGLE_ARG_DECL) +Cubit_Client::cube_union (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -398,7 +398,7 @@ Cubit_Client::cube_union (TAO_ENV_SINGLE_ARG_DECL) ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START); r = this->cubit_->cube_union (u - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -426,7 +426,7 @@ Cubit_Client::cube_union (TAO_ENV_SINGLE_ARG_DECL) ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START); r = this->cubit_->cube_union (u - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -459,7 +459,7 @@ Cubit_Client::cube_union (TAO_ENV_SINGLE_ARG_DECL) void Cubit_Client::cube_short (int i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -471,7 +471,7 @@ Cubit_Client::cube_short (int i ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_SHORT_START); ret_short = cubit_->cube_short (arg_short - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -510,12 +510,12 @@ Cubit_Client::cube_short (int i void Cubit_Client::cube_oneway (int - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ONEWAY_START); - this->cubit_->cube_oneway (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cubit_->cube_oneway (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->call_count_++; } @@ -531,12 +531,12 @@ Cubit_Client::cube_oneway (int void Cubit_Client::cube_void (int - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_VOID_START); - this->cubit_->cube_void (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cubit_->cube_void (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->call_count_++; } @@ -554,7 +554,7 @@ Cubit_Client::cube_void (int void Cubit_Client::cube_octet (int i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -566,7 +566,7 @@ Cubit_Client::cube_octet (int i ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_OCTET_START); ret_octet = this->cubit_->cube_octet (arg_octet - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -606,7 +606,7 @@ Cubit_Client::cube_octet (int i void Cubit_Client::cube_long (int i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -618,7 +618,7 @@ Cubit_Client::cube_long (int i ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_LONG_START); ret_long = this->cubit_->cube_long (arg_long - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -661,7 +661,7 @@ Cubit_Client::cube_long (int i void Cubit_Client::cube_struct (int i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -679,7 +679,7 @@ Cubit_Client::cube_struct (int i ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_STRUCT_START); ret_struct = this->cubit_->cube_struct (arg_struct - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -718,7 +718,7 @@ Cubit_Client::cube_struct (int i void Cubit_Client::cube_long_sequence (int, int l - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -746,7 +746,7 @@ Cubit_Client::cube_long_sequence (int, this->cubit_->cube_long_sequence (input, vout - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -791,7 +791,7 @@ Cubit_Client::cube_long_sequence (int, void Cubit_Client::cube_octet_sequence (int, int l - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -820,7 +820,7 @@ Cubit_Client::cube_octet_sequence (int, this->cubit_->cube_octet_sequence (input, vout - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -866,7 +866,7 @@ Cubit_Client::cube_octet_sequence (int, void Cubit_Client::cube_many_sequence (int, int l - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -902,7 +902,7 @@ Cubit_Client::cube_many_sequence (int, this->cubit_->cube_many_sequence (input, vout - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -951,7 +951,7 @@ void Cubit_Client::cube_rti_data (int, int numUpdates, int numAttrs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -1022,7 +1022,7 @@ Cubit_Client::cube_rti_data (int, this->cubit_->cube_rti_data (input, vout - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -1054,7 +1054,7 @@ Cubit_Client::cube_rti_data (int, void Cubit_Client::cube_any (int i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -1069,7 +1069,7 @@ Cubit_Client::cube_any (int i { ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ANY_START); ret_any = this->cubit_->cube_any (arg_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -1114,7 +1114,7 @@ Cubit_Client::cube_any (int i void Cubit_Client::cube_any_struct (int i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -1134,7 +1134,7 @@ Cubit_Client::cube_any_struct (int i { ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ANY_STRUCT_START); ret_any = this->cubit_->cube_any_struct (arg_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; @@ -1246,7 +1246,7 @@ Cubit_Client::run () // Show the results one type at a time. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // VOID @@ -1259,7 +1259,7 @@ Cubit_Client::run () for (i = 0; i < this->loop_count_; ++i) { this->cube_void (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1280,7 +1280,7 @@ Cubit_Client::run () for (i = 0; i < this->loop_count_; ++i) { this->cube_short (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1301,7 +1301,7 @@ Cubit_Client::run () for (i = 0; i < this->loop_count_; ++i) { this->cube_octet (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1322,7 +1322,7 @@ Cubit_Client::run () for (i = 0; i < this->loop_count_; ++i) { this->cube_long (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1342,7 +1342,7 @@ Cubit_Client::run () for (i = 0; i < this->loop_count_; ++i) { this->cube_struct (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1362,7 +1362,7 @@ Cubit_Client::run () for (i = 0; i < this->loop_count_; ++i) { - this->cube_union (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cube_union (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1384,7 +1384,7 @@ Cubit_Client::run () { this->cube_long_sequence (this->loop_count_, 4 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1406,7 +1406,7 @@ Cubit_Client::run () { this->cube_long_sequence (this->loop_count_, 1024 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1433,7 +1433,7 @@ Cubit_Client::run () { this->cube_octet_sequence (this->loop_count_, bytes_in_octet_sequence_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1443,7 +1443,7 @@ Cubit_Client::run () { this->cube_octet_sequence (this->loop_count_, 16 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1466,7 +1466,7 @@ Cubit_Client::run () { this->cube_octet_sequence (this->loop_count_, 4096 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1488,7 +1488,7 @@ Cubit_Client::run () { this->cube_many_sequence (this->loop_count_, 4 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1510,7 +1510,7 @@ Cubit_Client::run () { this->cube_many_sequence (this->loop_count_, 1024 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1531,15 +1531,15 @@ Cubit_Client::run () for (i = 0; i < this->loop_count_; ++i) { this->cube_short (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->cube_octet (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->cube_long (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1561,7 +1561,7 @@ Cubit_Client::run () this->cube_rti_data (this->loop_count_, 2, 5 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1582,7 +1582,7 @@ Cubit_Client::run () for (i = 0; i < this->loop_count_; ++i) { this->cube_oneway (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1603,7 +1603,7 @@ Cubit_Client::run () for (i = 0; i < this->loop_count_; ++i) { this->cube_any (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1623,7 +1623,7 @@ Cubit_Client::run () for (i = 0; i < this->loop_count_; ++i) { this->cube_any_struct (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1636,7 +1636,7 @@ Cubit_Client::run () } this->shutdown_server (this->shutdown_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1651,7 +1651,7 @@ Cubit_Client::run () int Cubit_Client::shutdown_server (int do_shutdown - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (do_shutdown) { @@ -1660,7 +1660,7 @@ Cubit_Client::shutdown_server (int do_shutdown ACE_TRY_EX(NOT_COLLOCATED) { - this->cubit_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cubit_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (NOT_COLLOCATED); } ACE_CATCHANY @@ -1714,7 +1714,7 @@ Cubit_Client::init (int argc, char **argv) this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "internet" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -1744,12 +1744,12 @@ Cubit_Client::init (int argc, char **argv) CORBA::Object_var factory_object = this->orb_->string_to_object (this->cubit_factory_key_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->factory_ = Cubit_Factory::_narrow (factory_object.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->factory_.in ())) @@ -1765,7 +1765,7 @@ Cubit_Client::init (int argc, char **argv) // Now retrieve the Cubit obj ref corresponding to the key. this->cubit_ = - this->factory_->make_cubit (TAO_ENV_SINGLE_ARG_PARAMETER); + this->factory_->make_cubit (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; 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 4cddf3da4bd..54d2244eaaa 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h @@ -82,59 +82,59 @@ private: ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time); // Prints the time stats. - void cube_union (TAO_ENV_SINGLE_ARG_DECL); + void cube_union (ACE_ENV_SINGLE_ARG_DECL); // Exercise the union. Cube a union. void cube_struct (int i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // calculate the cube from a struct. void cube_long (int i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // calculate the cube from a long. void cube_oneway (int i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Oneway operation test. void cube_void (int i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Twoway operation test. void cube_octet (int i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Cube an octet. void cube_short (int i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Cube a short. void cube_long_sequence (int i, int l - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Cube a sequence <l> is the length of the sequence. void cube_octet_sequence (int i, int l - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Cube a sequence of octets, <l> is the length of the sequence. void cube_many_sequence (int i, int l - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Cube a sequence of manys, <l> is the length of the sequence. void cube_rti_data (int i, int numUpdates, int numAttrs - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Cube a sequence <l> is the length of the sequence. void cube_any_struct (int i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // calculate the cube from a struct in an any. void cube_any (int i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // calculate the cube from a long in an any. int shutdown_server (int do_shutdown - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Invoke the method with <do_shutdown> != 0 to shutdown the server. int argc_; 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 9e39a72109b..539f14720cb 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp @@ -56,14 +56,14 @@ Cubit_Server::parse_args (void) int Cubit_Server::init (int argc, char** argv - TAO_ENV_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER) + ACE_ENV_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER) { // Call the init of <TAO_ORB_Manager> to initialize the ORB and // create a child POA under the root POA. if (this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -89,7 +89,7 @@ Cubit_Server::init (int argc, this->factory_id_ = this->orb_manager_.activate_under_child_poa ("factory", this->factory_impl_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -108,9 +108,9 @@ Cubit_Server::init (int argc, } int -Cubit_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Cubit_Server::run (ACE_ENV_SINGLE_ARG_DECL) { - if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -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 d31269dd6ee..5f5bb1419d4 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h @@ -52,10 +52,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Cubit_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // 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 6eca9eb5f98..d3c6cc45515 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp @@ -126,10 +126,10 @@ Cubit_Factory_i::~Cubit_Factory_i (void) } Cubit_ptr -Cubit_Factory_i::make_cubit (TAO_ENV_SINGLE_ARG_DECL) +Cubit_Factory_i::make_cubit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return my_cubit_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + return my_cubit_._this (ACE_ENV_SINGLE_ARG_PARAMETER); } void @@ -152,7 +152,7 @@ Cubit_i::~Cubit_i (void) } PortableServer::POA_ptr -Cubit_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Cubit_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -164,14 +164,14 @@ Cubit_i::set_default_poa (PortableServer::POA_ptr poa) } void -Cubit_i::cube_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Cubit_i::cube_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ONEWAY_START); } void -Cubit_i::cube_void (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Cubit_i::cube_void (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_VOID_START); @@ -181,7 +181,7 @@ Cubit_i::cube_void (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Octet Cubit_i::cube_octet (CORBA::Octet o - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_START); @@ -193,7 +193,7 @@ Cubit_i::cube_octet (CORBA::Octet o CORBA::Short Cubit_i::cube_short (CORBA::Short s - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_SHORT_START); @@ -205,7 +205,7 @@ Cubit_i::cube_short (CORBA::Short s CORBA::Long Cubit_i::cube_long (CORBA::Long l - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_START); @@ -217,7 +217,7 @@ Cubit_i::cube_long (CORBA::Long l Cubit::Many Cubit_i::cube_struct (const Cubit::Many &values - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_STRUCT_START); @@ -235,7 +235,7 @@ Cubit_i::cube_struct (const Cubit::Many &values Cubit::oneof Cubit_i::cube_union (const Cubit::oneof &values - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_UNION_START); @@ -269,7 +269,7 @@ Cubit_i::cube_union (const Cubit::oneof &values void Cubit_i::cube_long_sequence (const Cubit::long_seq &input, Cubit::long_seq_out output - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START); @@ -296,7 +296,7 @@ Cubit_i::cube_long_sequence (const Cubit::long_seq &input, void Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input, Cubit::octet_seq_out output - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_SEQUENCE_START); @@ -337,7 +337,7 @@ Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input, void Cubit_i::cube_many_sequence (const Cubit::many_seq & input, Cubit::many_seq_out output - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_MANY_SEQUENCE_START); @@ -371,7 +371,7 @@ Cubit_i::cube_many_sequence (const Cubit::many_seq & input, void Cubit_i::cube_rti_data (const Cubit::RtiPacket &input, Cubit::RtiPacket_out output - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START); @@ -403,7 +403,7 @@ Cubit_i::cube_rti_data (const Cubit::RtiPacket &input, CORBA::Any * Cubit_i::cube_any (const CORBA::Any & any - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ANY_START); @@ -420,7 +420,7 @@ Cubit_i::cube_any (const CORBA::Any & any CORBA::Any * Cubit_i::cube_any_struct (const CORBA::Any & any - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ANY_STRUCT_START); @@ -439,7 +439,7 @@ Cubit_i::cube_any_struct (const CORBA::Any & any // Shutdown. -void Cubit_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +void Cubit_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, 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 454be029601..517bd50068c 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h @@ -37,77 +37,77 @@ public: ~Cubit_i (void); // Destructor - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Returns the default POA for this servant. - virtual void cube_oneway (TAO_ENV_SINGLE_ARG_DECL) + virtual void cube_oneway (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Test a oneway call. - virtual void cube_void (TAO_ENV_SINGLE_ARG_DECL) + virtual void cube_void (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Test a twoway call. virtual CORBA::Octet cube_octet (CORBA::Octet o - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cube an octet virtual CORBA::Short cube_short (CORBA::Short s - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a short virtual CORBA::Long cube_long (CORBA::Long l - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a long virtual Cubit::Many cube_struct (const Cubit::Many &values - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a struct. virtual Cubit::oneof cube_union (const Cubit::oneof &values - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a union. virtual void cube_long_sequence (const Cubit::long_seq &input, Cubit::long_seq_out output - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a sequence. virtual void cube_octet_sequence (const Cubit::octet_seq &input, Cubit::octet_seq_out output - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cube an octet sequence. virtual void cube_many_sequence (const Cubit::many_seq & input, Cubit::many_seq_out output - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cube an Many sequence. virtual void cube_rti_data (const Cubit::RtiPacket &input, Cubit::RtiPacket_out output - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a sequence. virtual CORBA::Any * cube_any (const CORBA::Any & any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a long in an any virtual CORBA::Any * cube_any_struct (const CORBA::Any & any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cube a struct in an any - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown routine. @@ -135,7 +135,7 @@ public: ~Cubit_Factory_i (void); // Destructor. - virtual Cubit_ptr make_cubit (TAO_ENV_SINGLE_ARG_DECL) + virtual Cubit_ptr make_cubit (ACE_ENV_SINGLE_ARG_DECL) 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 b988891d80a..aef78ddc350 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp @@ -44,14 +44,14 @@ svr_worker (void *arg) { int result = cubit_server.init (args.argc (), args.argv () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return (void *) 1; barrier->server_init_.wait (); - cubit_server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + cubit_server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; 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 af690c0ace4..b32c03b6451 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp @@ -46,13 +46,13 @@ main (int argc, char *argv[]) "\n\tIDL_Cubit: server\n\n")); ACE_TRY_NEW_ENV { - int ret = cubit_server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int ret = cubit_server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret == -1) return -1; - cubit_server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + cubit_server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; 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 1105a5a099c..25363f792a3 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp @@ -64,14 +64,14 @@ Cubit_Task::svc (void) "Create Servants failed.\n"), -1); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { GLOBALS::instance ()->barrier_->wait (); // Handle requests for this object until we're killed, or one of // the methods asks us to exit. - int r = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int r = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) @@ -84,7 +84,7 @@ Cubit_Task::svc (void) CORBA::ORB_var orb = this->orb_manager_.orb (); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -105,7 +105,7 @@ Cubit_Task::svc (void) int Cubit_Task::initialize_orb (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { ACE_ARGV args (this->orbargs_); @@ -122,7 +122,7 @@ Cubit_Task::initialize_orb (void) argv, "persistent_poa", orb_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) return -1; @@ -166,23 +166,23 @@ Cubit_Task::get_servant_ior (u_int index) int Cubit_Task::create_servants (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Object_var obj = this->orb_->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var manager = - poa->the_POAManager(TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - manager->activate(TAO_ENV_SINGLE_ARG_PARAMETER); + manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the array of cubit implementations. @@ -232,13 +232,13 @@ Cubit_Task::create_servants (void) // some client. Then release the object. Cubit_var cubit = - this->servants_[i]->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->servants_[i]->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = this->orb_->object_to_string (cubit.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->servants_iors_[i] = 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 824d3dbcabc..da15b9ad9b3 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp @@ -553,7 +553,7 @@ Client::find_frequency (void) } CORBA::ORB_ptr -Client::init_orb (TAO_ENV_SINGLE_ARG_DECL) +Client::init_orb (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "I'm thread %t\n")); @@ -583,7 +583,7 @@ Client::init_orb (TAO_ENV_SINGLE_ARG_DECL) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::ORB::_nil ()); if (this->id_ == 0) @@ -613,7 +613,7 @@ Client::init_orb (TAO_ENV_SINGLE_ARG_DECL) } int -Client::get_cubit (CORBA::ORB_ptr orb TAO_ENV_ARG_DECL) +Client::get_cubit (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) { char *my_ior = this->ts_->use_utilization_test_ == 1 @@ -633,7 +633,7 @@ Client::get_cubit (CORBA::ORB_ptr orb TAO_ENV_ARG_DECL) CORBA::Object_var objref = orb->string_to_object (my_ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (objref.in ())) @@ -644,7 +644,7 @@ Client::get_cubit (CORBA::ORB_ptr orb TAO_ENV_ARG_DECL) // Narrow the CORBA::Object reference to the stub object, // checking the type along the way using _is_a. this->cubit_ = Cubit::_narrow (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->cubit_)) @@ -657,7 +657,7 @@ Client::get_cubit (CORBA::ORB_ptr orb TAO_ENV_ARG_DECL) CORBA::String_var str = orb->object_to_string (this->cubit_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -670,18 +670,18 @@ Client::get_cubit (CORBA::ORB_ptr orb TAO_ENV_ARG_DECL) int Client::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. - CORBA::ORB_var orb = this->init_orb (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ORB_var orb = this->init_orb (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // 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 () TAO_ENV_ARG_PARAMETER); + int r = this->get_cubit (orb.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r != 0) return r; @@ -716,14 +716,14 @@ Client::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%t) CALLING SHUTDOWN() ON THE SERVANT\n")); - this->cubit_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cubit_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } CORBA::release (this->cubit_); this->cubit_ = 0; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -746,7 +746,7 @@ Client::svc (void) int Client::cube_octet (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->call_count_++; @@ -758,10 +758,10 @@ Client::cube_octet (void) if (this->ts_->use_utilization_test_ == 1 && this->ts_->remote_invocations_ == 0) ret_octet = this->cubit_impl_.cube_octet (arg_octet - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else ret_octet = this->cubit_->cube_octet (arg_octet - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); STOP_QUANTIFY; ACE_TRY_CHECK; @@ -792,7 +792,7 @@ Client::cube_octet (void) int Client::cube_short (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->call_count_++; @@ -802,7 +802,7 @@ Client::cube_short (void) START_QUANTIFY; ret_short = this->cubit_->cube_short (arg_short - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); STOP_QUANTIFY; ACE_TRY_CHECK; arg_short = arg_short * arg_short * arg_short; @@ -829,7 +829,7 @@ Client::cube_short (void) int Client::cube_long (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->call_count_++; @@ -839,7 +839,7 @@ Client::cube_long (void) START_QUANTIFY; ret_long = this->cubit_->cube_long (arg_long - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); STOP_QUANTIFY; ACE_TRY_CHECK; @@ -866,7 +866,7 @@ Client::cube_long (void) int Client::cube_struct (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Cubit::Many arg_struct; @@ -880,7 +880,7 @@ Client::cube_struct (void) START_QUANTIFY; ret_struct = this->cubit_->cube_struct (arg_struct - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); STOP_QUANTIFY; ACE_TRY_CHECK; @@ -940,12 +940,12 @@ Client::make_request (void) } else { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->call_count_++; START_QUANTIFY; - this->cubit_->noop (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cubit_->noop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; STOP_QUANTIFY; } 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 554ad87b619..cd169ebe4d0 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h @@ -279,14 +279,14 @@ public: // cubed. private: - CORBA::ORB_ptr init_orb (TAO_ENV_SINGLE_ARG_DECL); + CORBA::ORB_ptr init_orb (ACE_ENV_SINGLE_ARG_DECL); // initialize the ORB. void read_ior (void); // reads the cubit ior from a file. int get_cubit (CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // gets the cubit object. int run_tests (void); 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 8de8568c427..0dbd9106a87 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp @@ -19,7 +19,7 @@ Cubit_i::~Cubit_i (void) CORBA::Octet Cubit_i::cube_octet (CORBA::Octet o - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return (CORBA::Octet) (o * o * o); @@ -27,7 +27,7 @@ Cubit_i::cube_octet (CORBA::Octet o CORBA::Short Cubit_i::cube_short (CORBA::Short s - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return (CORBA::Short) (s * s * s); @@ -35,7 +35,7 @@ Cubit_i::cube_short (CORBA::Short s CORBA::Long Cubit_i::cube_long (CORBA::Long l - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return (CORBA::Long) (l * l * l); @@ -43,7 +43,7 @@ Cubit_i::cube_long (CORBA::Long l Cubit::Many Cubit_i::cube_struct (const Cubit::Many &values - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Cubit::Many out_values; @@ -56,13 +56,13 @@ Cubit_i::cube_struct (const Cubit::Many &values } void -Cubit_i::noop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Cubit_i::noop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // does nothing. } -void Cubit_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +void Cubit_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -71,7 +71,7 @@ void Cubit_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } PortableServer::POA_ptr -Cubit_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Cubit_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { 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 bc65208821d..eaa646cfb06 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h @@ -30,29 +30,29 @@ public: ~Cubit_i (void); virtual CORBA::Octet cube_octet (CORBA::Octet o - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Short cube_short (CORBA::Short s - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Long cube_long (CORBA::Long l - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Cubit::Many cube_struct (const Cubit::Many &values - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void noop (TAO_ENV_SINGLE_ARG_DECL) + virtual void noop (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableServer::POA_ptr - _default_POA (TAO_ENV_SINGLE_ARG_DECL); + _default_POA (ACE_ENV_SINGLE_ARG_DECL); // The default POA protected: |