diff options
Diffstat (limited to 'TAO/performance-tests/RTCorba')
12 files changed, 149 insertions, 149 deletions
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp index 3c40536d884..706289d63f9 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp @@ -12,7 +12,7 @@ ACE_RCSID(Latency, test_i, "$Id$") void Test_i::test_method (CORBA::Long id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -23,16 +23,16 @@ Test_i::test_method (CORBA::Long id void Test_i::shutdown (const char *orb_id - TAO_ENV_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER) + ACE_ENV_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER) ACE_THROW_SPEC ((CORBA::SystemException)) { int argc = 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, orb_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - orb->shutdown (0 TAO_ENV_ARG_PARAMETER); + orb->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h index a3d93fa6f2d..2a3de616b96 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h @@ -32,11 +32,11 @@ public: // = The Test methods. void test_method (CORBA::Long id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); void shutdown (const char *orb_id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp index ab4e491160b..971444dd810 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp @@ -141,7 +141,7 @@ main (int argc, char *argv[]) ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -150,12 +150,12 @@ main (int argc, char *argv[]) // Obtain Priority Mapping used by the ORB. CORBA::Object_var object = orb->resolve_initial_references ("PriorityMappingManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (mapping_manager.in ())) @@ -260,11 +260,11 @@ Client::svc (void) priorities[this->id_]); CORBA::Object_var object = - orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var server = - Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -282,11 +282,11 @@ Client::svc (void) { /* CORBA::PolicyList_var pols; server->_validate_connection (pols.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); */ server->test_method (this->id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -301,7 +301,7 @@ Client::svc (void) // Invoke method. server->test_method (this->id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Grab timestamp again. @@ -320,7 +320,7 @@ Client::svc (void) /* char orb_name[50]; ACE_OS::sprintf (orb_name, "%d", priorities[this->id_]); - server->shutdown (orb_name TAO_ENV_ARG_PARAMETER); + server->shutdown (orb_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK;*/ } ACE_CATCHANY diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp index 3ed70825ae0..2b54912aca0 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp @@ -120,7 +120,7 @@ main (int argc, char *argv[]) int argc_ = argc; for (int i = 0; i < argc; ++i) argv_[i] = argv[i]; - orb = CORBA::ORB_init (argc_, argv_, "" TAO_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc_, argv_, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the arguments. @@ -130,12 +130,12 @@ main (int argc, char *argv[]) // Obtain Priority Mapping used by the ORB. CORBA::Object_var object = orb->resolve_initial_references ("PriorityMappingManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (mapping_manager.in ())) @@ -214,11 +214,11 @@ Server::svc (void) char orb_name[64]; ACE_OS::sprintf (orb_name, "%d", this->priority_); CORBA::ORB_var orb = - CORBA::ORB_init (argc_, argv_, orb_name TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc_, argv_, orb_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -227,23 +227,23 @@ Server::svc (void) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var oid = - root_poa->activate_object (this->server_ TAO_ENV_ARG_PARAMETER); + root_poa->activate_object (this->server_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = - root_poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER); + root_poa->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -266,10 +266,10 @@ Server::svc (void) ACE_OS::fclose (output_file); // Start orb event loop. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp index febe0cde286..d128bcd1ae9 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp @@ -141,18 +141,18 @@ main (int argc, char *argv[]) ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + 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 TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var server = - Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -165,12 +165,12 @@ main (int argc, char *argv[]) // Obtain Priority Mapping used by the ORB. object = orb->resolve_initial_references ("PriorityMappingManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (mapping_manager.in ())) @@ -222,7 +222,7 @@ main (int argc, char *argv[]) } throughput.dump_results ("Aggregated", gsf); - server->shutdown ("" TAO_ENV_ARG_PARAMETER); + server->shutdown ("" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -286,11 +286,11 @@ Client::svc (void) { /* CORBA::PolicyList_var pols; server_->_validate_connection (pols.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); */ server_->test_method (this->id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -305,7 +305,7 @@ Client::svc (void) // Invoke method. server_->test_method (this->id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Grab timestamp again. diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp index 5a7a5f2aea7..7b623eadc7e 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp @@ -59,11 +59,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -72,11 +72,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -85,11 +85,11 @@ main (int argc, char *argv[]) Test_i server_impl; Test_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -107,10 +107,10 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp index 58b3e73585e..1f7ef7a756a 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp @@ -135,7 +135,7 @@ print_params (void) static void twoway_work_test (Test_ptr server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { #if defined (USING_TIMERS) ACE_Throughput_Stats latency; @@ -156,7 +156,7 @@ twoway_work_test (Test_ptr server #endif /* USING_TIMERS */ server->twoway_work_test (work - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; #if defined (USING_TIMERS) @@ -180,7 +180,7 @@ twoway_work_test (Test_ptr server static void oneway_work_test (Test_ptr server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { #if defined (USING_TIMERS) ACE_Throughput_Stats latency; @@ -201,7 +201,7 @@ oneway_work_test (Test_ptr server #endif /* USING_TIMERS */ server->oneway_work_test (work - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; #if defined (USING_TIMERS) @@ -225,7 +225,7 @@ oneway_work_test (Test_ptr server static void oneway_payload_test (Test_ptr server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { #if defined (USING_TIMERS) ACE_Throughput_Stats latency; @@ -249,7 +249,7 @@ oneway_payload_test (Test_ptr server #endif /* USING_TIMERS */ server->oneway_payload_test (the_data - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; #if defined (USING_TIMERS) @@ -432,7 +432,7 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the command line options. @@ -445,30 +445,30 @@ main (int argc, char *argv[]) CORBA::Object_var obj = orb->resolve_initial_references ("ORBPolicyManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; obj = orb->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; obj = orb->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var server = Test::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print testing parameters. @@ -478,7 +478,7 @@ main (int argc, char *argv[]) if (test_twoway) { twoway_work_test (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -495,7 +495,7 @@ main (int argc, char *argv[]) sync_scope_policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, sync_scope_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; switch (level) @@ -504,7 +504,7 @@ main (int argc, char *argv[]) // Set the sync scope policy at the ORB level. policy_manager->set_policy_overrides (sync_scope_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -512,7 +512,7 @@ main (int argc, char *argv[]) // Set the sync scope policy at the thread level. policy_current->set_policy_overrides (sync_scope_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -520,12 +520,12 @@ main (int argc, char *argv[]) // Set the sync scope policy at the object level. obj = server->_set_policy_overrides (sync_scope_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the new object reference with the updated policy. server = Test::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -534,7 +534,7 @@ main (int argc, char *argv[]) } // We are done with this policy. - sync_scope_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + sync_scope_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Are we buffering the oneway requests? @@ -558,32 +558,32 @@ main (int argc, char *argv[]) buffering_constraint_policy_list[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_constraint_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Set up the constraints (at the object level). obj = server->_set_policy_overrides (buffering_constraint_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We are done with this policy. - buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + buffering_constraint_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the new object reference with the updated policy. server = Test::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } // Run the oneway test. if (payload_test) oneway_payload_test (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else oneway_work_test (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -592,7 +592,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\nShutting down server\n")); - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -602,7 +602,7 @@ main (int argc, char *argv[]) // static destructors to flush the queues, it will be too late. // Therefore, we use explicit destruction here and flush the // queues before main() ends. - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp index 89bc9f56bd4..b23da7d1bb9 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp @@ -95,7 +95,7 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the command line options. @@ -108,27 +108,27 @@ main (int argc, char *argv[]) CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Test_i server_impl (orb.in ()); Test_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -149,17 +149,17 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp index 17c0cfa9726..3062b3b2402 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp @@ -11,7 +11,7 @@ ACE_RCSID(Reliable, test_i, "$Id$") void Test_i::oneway_work_test (CORBA::ULong work - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { for (CORBA::ULong i = 0; i < work; i++) @@ -25,14 +25,14 @@ Test_i::oneway_work_test (CORBA::ULong work void Test_i::oneway_payload_test (const Test::data & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Test_i::twoway_work_test (CORBA::ULong work - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { for (CORBA::ULong i = 0; i < work; i++) @@ -45,9 +45,9 @@ Test_i::twoway_work_test (CORBA::ULong work } void -Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER) +Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h index 2ef26b8c187..0359d3c1fa3 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h @@ -32,18 +32,18 @@ public: // = The Test methods. void oneway_payload_test (const Test::data &d - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void oneway_work_test (CORBA::ULong work - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void twoway_work_test (CORBA::ULong work - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp index a45471a31a4..1c565863857 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp @@ -249,7 +249,7 @@ start_synchronization (test_ptr test, { test->method (work, prime_number - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -358,7 +358,7 @@ max_throughput (test_ptr test, ACE_TRY_NEW_ENV { CORBA_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean result = @@ -387,7 +387,7 @@ max_throughput (test_ptr test, test->method (work, prime_number - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ++calls_made; @@ -430,9 +430,9 @@ public: int svc (void); ACE_hrtime_t deadline_for_current_call (CORBA::ULong i); - void reset_priority (TAO_ENV_SINGLE_ARG_DECL); + void reset_priority (ACE_ENV_SINGLE_ARG_DECL); void print_stats (ACE_hrtime_t test_end); - int setup (TAO_ENV_SINGLE_ARG_DECL); + int setup (ACE_ENV_SINGLE_ARG_DECL); void missed_start_deadline (CORBA::ULong invocation); void missed_end_deadline (CORBA::ULong invocation); @@ -483,18 +483,18 @@ Paced_Worker::Paced_Worker (ACE_Thread_Manager &thread_manager, } void -Paced_Worker::reset_priority (TAO_ENV_SINGLE_ARG_DECL) +Paced_Worker::reset_priority (ACE_ENV_SINGLE_ARG_DECL) { if (set_priority) { this->current_->the_priority (this->priority_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { this->current_->the_priority (continuous_worker_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -600,16 +600,16 @@ Paced_Worker::print_stats (ACE_hrtime_t test_end) } int -Paced_Worker::setup (TAO_ENV_SINGLE_ARG_DECL) +Paced_Worker::setup (ACE_ENV_SINGLE_ARG_DECL) { if (priority_setting == AFTER_THREAD_CREATION) { - this->reset_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + this->reset_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } this->CORBA_priority_ = - this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Boolean result = @@ -647,7 +647,7 @@ Paced_Worker::svc (void) ACE_TRY_NEW_ENV { int result = - this->setup (TAO_ENV_SINGLE_ARG_PARAMETER); + this->setup (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -671,7 +671,7 @@ Paced_Worker::svc (void) this->test_->method (work, prime_number - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_hrtime_t time_after_call = @@ -725,7 +725,7 @@ public: int svc (void); void print_stats (ACE_Sample_History &history, ACE_hrtime_t test_end); - int setup (TAO_ENV_SINGLE_ARG_DECL); + int setup (ACE_ENV_SINGLE_ARG_DECL); void print_collective_stats (void); test_var test_; @@ -827,17 +827,17 @@ Continuous_Worker::print_collective_stats (void) } int -Continuous_Worker::setup (TAO_ENV_SINGLE_ARG_DECL) +Continuous_Worker::setup (ACE_ENV_SINGLE_ARG_DECL) { if (priority_setting == AFTER_THREAD_CREATION) { this->current_->the_priority (continuous_worker_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } this->CORBA_priority_ = - this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Boolean result = @@ -862,7 +862,7 @@ Continuous_Worker::svc (void) ACE_Sample_History history (this->iterations_); int result = - this->setup (TAO_ENV_SINGLE_ARG_PARAMETER); + this->setup (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -876,7 +876,7 @@ Continuous_Worker::svc (void) this->test_->method (work, prime_number - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_hrtime_t end = ACE_OS::gethrtime (); @@ -911,7 +911,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -922,31 +922,31 @@ main (int argc, char *argv[]) fudge_priorities (orb.in ()); CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_var test = - test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("PriorityMappingManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMapping &priority_mapping = @@ -1145,7 +1145,7 @@ main (int argc, char *argv[]) if (shutdown_server) { - test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp index ba0290feaa6..1521f88ee83 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp @@ -22,13 +22,13 @@ public: void method (CORBA::ULong work, CORBA::ULong prime_number - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: CORBA::ORB_var orb_; @@ -45,7 +45,7 @@ test_i::test_i (CORBA::ORB_ptr orb, void test_i::method (CORBA::ULong work, CORBA::ULong prime_number - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -60,17 +60,17 @@ test_i::method (CORBA::ULong work, } PortableServer::POA_ptr -test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -170,11 +170,11 @@ int write_ior_to_file (const char *ior_file, CORBA::ORB_ptr orb, CORBA::Object_ptr object - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::String_var ior = orb->object_to_string (object - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); FILE *output_file = @@ -205,47 +205,47 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; fudge_priorities (orb.in ()); CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = orb->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; default_thread_priority = - current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -273,7 +273,7 @@ main (int argc, char *argv[]) max_request_buffer_size, allow_borrowing, policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (ACE_OS::strcmp (lanes_file, "empty-file") != 0) @@ -290,7 +290,7 @@ main (int argc, char *argv[]) max_request_buffer_size, allow_borrowing, policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -301,7 +301,7 @@ main (int argc, char *argv[]) bands_file, rt_orb.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -321,13 +321,13 @@ main (int argc, char *argv[]) allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies.length (policies.length () + 1); policies[policies.length () - 1] = rt_orb->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (bands_file, "empty-file") != 0) @@ -337,7 +337,7 @@ main (int argc, char *argv[]) bands_file, rt_orb.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -349,21 +349,21 @@ main (int argc, char *argv[]) policies[policies.length () - 1] = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies.length (policies.length () + 1); policies[policies.length () - 1] = rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, default_thread_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = root_poa->create_POA ("RT POA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; test_i *servant = @@ -374,26 +374,26 @@ main (int argc, char *argv[]) ACE_UNUSED_ARG (safe_servant); test_var test = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; result = write_ior_to_file (ior_output_file, orb.in (), test.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |