diff options
Diffstat (limited to 'TAO/orbsvcs/tests/EC_Throughput')
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp | 30 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp | 46 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp | 32 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp | 46 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp | 70 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h | 12 |
11 files changed, 133 insertions, 133 deletions
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp index 346cc25fbe4..171604e78f2 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp @@ -32,10 +32,10 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler, int type_start, int type_count, RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecScheduler::handle_t rt_info = - scheduler->create (name TAO_ENV_ARG_PARAMETER); + scheduler->create (name ACE_ENV_ARG_PARAMETER); ACE_CHECK; // The worst case execution time is far less than 2 @@ -51,7 +51,7 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler, time, 0, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ConsumerQOS_Factory qos; @@ -64,29 +64,29 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler, // = Connect as a consumer. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + RtecEventComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_->connect_push_consumer (objref.in (), qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Test_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Test_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -94,12 +94,12 @@ Test_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) // Deactivate the servant PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -118,7 +118,7 @@ Test_Consumer::accumulate (ACE_Throughput_Stats& stats) const void Test_Consumer::push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) @@ -157,7 +157,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events { // We stop the timer as soon as we realize it is time to // do so. - this->driver_->shutdown_consumer (this->cookie_ TAO_ENV_ARG_PARAMETER); + this->driver_->shutdown_consumer (this->cookie_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -175,7 +175,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events } void -Test_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h index 6490b55497b..d384a8bea82 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h @@ -45,10 +45,10 @@ public: int type_start, int type_count, RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method connects the consumer to the EC. - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. void dump_results (const char* name, @@ -59,9 +59,9 @@ public: // Add our throughput and latency statistics to <stats> virtual void push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index d233ca90453..5cb9dcba533 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -43,16 +43,16 @@ ECT_Consumer_Driver::~ECT_Consumer_Driver (void) int ECT_Consumer_Driver::run (int argc, char* argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->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 = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -61,11 +61,11 @@ ECT_Consumer_Driver::run (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 (this->parse_args (argc, argv)) @@ -125,7 +125,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -134,7 +134,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name schedule_name (1); @@ -142,13 +142,13 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) schedule_name[0].id = CORBA::string_dup ("ScheduleService"); CORBA::Object_var sched_obj = - naming_context->resolve (schedule_name TAO_ENV_ARG_PARAMETER); + naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (sched_obj.in ())) return 1; RtecScheduler::Scheduler_var scheduler = RtecScheduler::Scheduler::_narrow (sched_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name name (1); @@ -156,7 +156,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) name[0].id = CORBA::string_dup ("EventService"); CORBA::Object_var ec_obj = - naming_context->resolve (name TAO_ENV_ARG_PARAMETER); + naming_context->resolve (name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var channel; @@ -164,13 +164,13 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) channel = RtecEventChannelAdmin::EventChannel::_nil (); else channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->connect_consumers (scheduler.in (), channel.in () TAO_ENV_ARG_PARAMETER); + this->connect_consumers (scheduler.in (), channel.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n")); @@ -179,7 +179,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) for (;;) { ACE_Time_Value tv (1, 0); - this->orb_->perform_work (tv TAO_ENV_ARG_PARAMETER); + this->orb_->perform_work (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1); if (this->active_count_ <= 0) @@ -189,19 +189,19 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) this->dump_results (); - this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->shutdown_event_channel_ != 0) { - channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sys_ex) @@ -218,7 +218,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) void ECT_Consumer_Driver::shutdown_consumer (void* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // int ID = // (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie) @@ -234,7 +234,7 @@ void ECT_Consumer_Driver::connect_consumers (RtecScheduler::Scheduler_ptr scheduler, RtecEventChannelAdmin::EventChannel_ptr channel - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -255,7 +255,7 @@ ECT_Consumer_Driver::connect_consumers this->type_start_, this->type_count_, channel - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -278,11 +278,11 @@ ECT_Consumer_Driver::dump_results (void) } void -ECT_Consumer_Driver::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL) +ECT_Consumer_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->n_consumers_; ++i) { - this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; delete this->consumers_[i]; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h index 67579078b74..4af70e0f7a8 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h @@ -45,7 +45,7 @@ public: // Execute the test. virtual void shutdown_consumer (void* consumer_cookie - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Callback method for consumers, each consumer will call this // method once it receives all the shutdown events from the // suppliers. @@ -56,8 +56,8 @@ private: void connect_consumers (RtecScheduler::Scheduler_ptr scheduler, RtecEventChannelAdmin::EventChannel_ptr local_ec - TAO_ENV_ARG_DECL); - void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL); // Connect and disconnect the consumers. void dump_results (void); diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h index 9d474f5ff65..372a9eced34 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h @@ -26,7 +26,7 @@ public: virtual ~ECT_Driver (void); virtual void shutdown_consumer (void* consumer_cookie - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; // Callback method for consumers, each consumer will call this // method once it receives all the shutdown events from the // suppliers. diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index 73730d301e1..13dd1a46abb 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -44,7 +44,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler, int type_start, int type_count, RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->burst_count_ = burst_count; this->burst_size_ = burst_size; @@ -54,7 +54,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler, this->type_count_ = type_count; RtecScheduler::handle_t rt_info = - scheduler->create (name TAO_ENV_ARG_PARAMETER); + scheduler->create (name ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_Time_Value tv (0, burst_pause); @@ -75,7 +75,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler, time, 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->supplier_id_ = ACE::crc32 (name); @@ -94,30 +94,30 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler, rt_info, 1); RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushSupplier_var objref = - this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_->connect_push_supplier (objref.in (), qos.get_SupplierQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Test_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +Test_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; - this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = @@ -125,19 +125,19 @@ Test_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) // Deactivate the servant PortableServer::POA_var poa = - this->supplier_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (&this->supplier_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->supplier_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } int Test_Supplier::svc () { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize a time value to pace the test @@ -173,7 +173,7 @@ Test_Supplier::svc () ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, request_start); // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n")); - this->consumer_proxy ()->push (event TAO_ENV_ARG_PARAMETER); + this->consumer_proxy ()->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_hrtime_t end = ACE_OS::gethrtime (); @@ -197,7 +197,7 @@ Test_Supplier::svc () ACE_hrtime_t request_start = ACE_OS::gethrtime (); ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, request_start); - this->consumer_proxy ()->push(event TAO_ENV_ARG_PARAMETER); + this->consumer_proxy ()->push(event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_hrtime_t end = ACE_OS::gethrtime (); this->throughput_.sample (end - test_start, @@ -220,7 +220,7 @@ Test_Supplier::svc () } void -Test_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Test_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h index 8fb44c736b7..17fbcb8ce02 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h @@ -46,13 +46,13 @@ public: int type_start, int type_count, RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method connects the supplier to the EC. - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // The methods in the skeleton. RtecEventComm::EventSourceID supplier_id (void) const; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index 90c8dac6867..eb5e9103bcd 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -43,22 +43,22 @@ ECT_Supplier_Driver::~ECT_Supplier_Driver (void) void ECT_Supplier_Driver::shutdown_consumer (void* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } int ECT_Supplier_Driver::run (int argc, char* argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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 ())) @@ -67,11 +67,11 @@ ECT_Supplier_Driver::run (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 (this->parse_args (argc, argv)) @@ -136,7 +136,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) } CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -145,7 +145,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name schedule_name (1); @@ -153,20 +153,20 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) schedule_name[0].id = CORBA::string_dup ("ScheduleService"); CORBA::Object_var sched_obj = - naming_context->resolve (schedule_name TAO_ENV_ARG_PARAMETER); + naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (sched_obj.in ())) return 1; RtecScheduler::Scheduler_var scheduler = RtecScheduler::Scheduler::_narrow (sched_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name name (1); name.length (1); name[0].id = CORBA::string_dup ("EventService"); CORBA::Object_var ec_obj = - naming_context->resolve (name TAO_ENV_ARG_PARAMETER); + naming_context->resolve (name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var channel; @@ -174,20 +174,20 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) channel = RtecEventChannelAdmin::EventChannel::_nil (); else channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->connect_suppliers (scheduler.in (), channel.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n")); - this->activate_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "suppliers are active\n")); @@ -203,17 +203,17 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) this->dump_results (); - this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n")); // @@ Deactivate the suppliers (as CORBA Objects?) - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "orb and poa destroyed\n")); @@ -234,7 +234,7 @@ void ECT_Supplier_Driver::connect_suppliers (RtecScheduler::Scheduler_ptr scheduler, RtecEventChannelAdmin::EventChannel_ptr channel - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (int i = 0; i < this->n_suppliers_; ++i) { @@ -252,13 +252,13 @@ ECT_Supplier_Driver::connect_suppliers this->type_start_, this->type_count_, channel - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ECT_Supplier_Driver::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECT_Supplier_Driver::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { for (int i = 0; i < this->n_suppliers_; ++i) { @@ -267,11 +267,11 @@ ECT_Supplier_Driver::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -ECT_Supplier_Driver::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL) +ECT_Supplier_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->n_suppliers_; ++i) { - this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; delete this->suppliers_[i]; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h index 67efa007c52..e51f0f73551 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h @@ -35,7 +35,7 @@ public: virtual ~ECT_Supplier_Driver (void); virtual void shutdown_consumer (void* consumer_cookie - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Not used.... enum { @@ -52,11 +52,11 @@ private: void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler, RtecEventChannelAdmin::EventChannel_ptr local_ec - TAO_ENV_ARG_DECL); - void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL); // Connect the suppliers. - void activate_suppliers (TAO_ENV_SINGLE_ARG_DECL); + void activate_suppliers (ACE_ENV_SINGLE_ARG_DECL); // Activate the suppliers, i.e. they start generating events. void dump_results (void); diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index 6e69d0feb01..66518a6ec95 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -70,12 +70,12 @@ ECT_Throughput::run (int argc, char* argv[]) ACE_High_Res_Timer::calibrate (); this->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 = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -84,14 +84,14 @@ ECT_Throughput::run (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; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv)) @@ -189,13 +189,13 @@ ECT_Throughput::run (int argc, char* argv[]) runtime_infos); #endif RtecScheduler::Scheduler_var scheduler = - scheduler_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + scheduler_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #if 0 CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -204,7 +204,7 @@ ECT_Throughput::run (int argc, char* argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This is the name we (potentially) register the Scheduling @@ -214,13 +214,13 @@ ECT_Throughput::run (int argc, char* argv[]) schedule_name[0].id = CORBA::string_dup ("ScheduleService"); CORBA::String_var str = - this->orb_->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n", str.in ())); // Register the servant with the Naming Context.... - naming_context->rebind (schedule_name, scheduler.in () TAO_ENV_ARG_PARAMETER); + naming_context->rebind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Scheduler_Factory::use_config (naming_context.in ()); @@ -263,7 +263,7 @@ ECT_Throughput::run (int argc, char* argv[]) TAO_EC_Event_Channel *ec = new TAO_EC_Event_Channel (attr); - ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; auto_ptr<POA_RtecEventChannelAdmin::EventChannel> auto_ec_impl (ec); @@ -271,23 +271,23 @@ ECT_Throughput::run (int argc, char* argv[]) } RtecEventChannelAdmin::EventChannel_var channel = - ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->connect_consumers (scheduler.in (), - channel.in () TAO_ENV_ARG_PARAMETER); + channel.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n")); this->connect_suppliers (scheduler.in (), channel.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n")); - this->activate_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "suppliers are active\n")); @@ -303,17 +303,17 @@ ECT_Throughput::run (int argc, char* argv[]) this->dump_results (); - this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "consumers disconnected\n")); - this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n")); - channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "channel destroyed\n")); @@ -321,12 +321,12 @@ ECT_Throughput::run (int argc, char* argv[]) { // Deactivate the EC PortableServer::POA_var poa = - ec_impl->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (ec_impl.get () TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (ec_impl.get () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "EC deactivated\n")); @@ -335,12 +335,12 @@ ECT_Throughput::run (int argc, char* argv[]) { // Deactivate the Scheduler PortableServer::POA_var poa = - scheduler_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + scheduler_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (&scheduler_impl TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&scheduler_impl ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "scheduler deactivated\n")); @@ -362,7 +362,7 @@ ECT_Throughput::run (int argc, char* argv[]) void ECT_Throughput::shutdown_consumer (void* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // int ID = // (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie) @@ -376,7 +376,7 @@ ECT_Throughput::shutdown_consumer (void* { ACE_DEBUG ((LM_DEBUG, "(%t) shutting down the ORB\n")); - // Not needed: this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + // Not needed: this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } } @@ -384,7 +384,7 @@ void ECT_Throughput::connect_consumers (RtecScheduler::Scheduler_ptr scheduler, RtecEventChannelAdmin::EventChannel_ptr channel - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -408,7 +408,7 @@ ECT_Throughput::connect_consumers start, this->consumer_type_count_, channel - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -417,7 +417,7 @@ void ECT_Throughput::connect_suppliers (RtecScheduler::Scheduler_ptr scheduler, RtecEventChannelAdmin::EventChannel_ptr channel - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (int i = 0; i < this->n_suppliers_; ++i) { @@ -436,13 +436,13 @@ ECT_Throughput::connect_suppliers start, this->supplier_type_count_, channel - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ECT_Throughput::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECT_Throughput::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -461,21 +461,21 @@ ECT_Throughput::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -ECT_Throughput::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL) +ECT_Throughput::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->n_suppliers_; ++i) { - this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -ECT_Throughput::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL) +ECT_Throughput::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->n_consumers_; ++i) { - this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h index 99d6f7b15e1..43ed45298bd 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h @@ -44,7 +44,7 @@ public: // Execute the test. virtual void shutdown_consumer (void* consumer_cookie - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Callback method for consumers, each consumer will call this // method once it receives all the shutdown events from the // suppliers. @@ -55,17 +55,17 @@ private: void connect_consumers (RtecScheduler::Scheduler_ptr scheduler, RtecEventChannelAdmin::EventChannel_ptr local_ec - TAO_ENV_ARG_DECL); - void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL); // Connect and disconnect the consumers. void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler, RtecEventChannelAdmin::EventChannel_ptr local_ec - TAO_ENV_ARG_DECL); - void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL); // Connect the suppliers. - void activate_suppliers (TAO_ENV_SINGLE_ARG_DECL); + void activate_suppliers (ACE_ENV_SINGLE_ARG_DECL); // Activate the suppliers, i.e. they start generating events. void dump_results (void); |