diff options
Diffstat (limited to 'TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp | 175 |
1 files changed, 59 insertions, 116 deletions
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index 0c5aea70a2f..01df584fecc 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -21,17 +21,13 @@ main (int argc, char* argv[]) // **************************************************************** void -deactivate_servant (PortableServer::Servant servant - ACE_ENV_ARG_DECL) +deactivate_servant (PortableServer::Servant servant) { PortableServer::POA_var poa = - servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + servant->_default_POA (); PortableServer::ObjectId_var oid = - poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + poa->servant_to_id (servant); + poa->deactivate_object (oid.in ()); } @@ -46,12 +42,10 @@ RND_Driver::RND_Driver (void) int RND_Driver::run (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ORB_init (argc, argv, ""); // **************************************************************** @@ -107,16 +101,12 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa->the_POAManager (); + poa_manager->activate (); // **************************************************************** @@ -126,30 +116,24 @@ RND_Driver::run (int argc, char *argv[]) attributes.supplier_reconnect = 1; TAO_CEC_EventChannel ec_impl (attributes); - ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec_impl.activate (); CosEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec_impl._this (); // **************************************************************** // Obtain the consumer admin.. this->consumer_admin_ = - event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + event_channel->for_consumers (); // Obtain the supplier admin.. this->supplier_admin_ = - event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + event_channel->for_suppliers (); // **************************************************************** - this->supplier_.connect (this->supplier_admin_.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->supplier_.connect (this->supplier_admin_.in ()); // **************************************************************** @@ -163,8 +147,7 @@ RND_Driver::run (int argc, char *argv[]) 1); CORBA::Object_var obj = - this->consumers_[i]->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->consumers_[i]->_this (); } // **************************************************************** @@ -180,8 +163,7 @@ RND_Driver::run (int argc, char *argv[]) this->suppliers_[j]->activate (); CORBA::Object_var obj = - this->suppliers_[j]->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->suppliers_[j]->_this (); } // **************************************************************** @@ -190,8 +172,7 @@ RND_Driver::run (int argc, char *argv[]) { ACE_Time_Value tv (0, 50000); orb->run (tv); - this->supplier_.push_new_event (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->supplier_.push_new_event (); } ACE_Thread_Manager::instance ()->wait (); @@ -201,11 +182,8 @@ RND_Driver::run (int argc, char *argv[]) { for (int k = 0; k != this->nsuppliers_; ++k) { - deactivate_servant (this->suppliers_[k] - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->suppliers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + deactivate_servant (this->suppliers_[k]); + this->suppliers_[k]->_remove_ref (); } delete[] this->suppliers_; this->suppliers_ = 0; @@ -215,19 +193,15 @@ RND_Driver::run (int argc, char *argv[]) // We destroy now to verify that the callbacks work and do not // produce any problems. - event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + event_channel->destroy (); // **************************************************************** { for (int k = 0; k != this->nconsumers_; ++k) { - deactivate_servant (this->consumers_[k] - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->consumers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + deactivate_servant (this->consumers_[k]); + this->consumers_[k]->_remove_ref (); } delete[] this->consumers_; this->consumers_ = 0; @@ -235,32 +209,26 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** - deactivate_servant (&ec_impl - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + deactivate_servant (&ec_impl); // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + poa->destroy (1, 1); // **************************************************************** - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Random"); + ex._tao_print_exception ("Random"); return 1; } - ACE_ENDTRY; return 0; } void -RND_Driver::timer (const CORBA::Any &e - ACE_ENV_ARG_DECL) +RND_Driver::timer (const CORBA::Any &e) { int r = ACE_OS::rand (); if (r < 0) @@ -281,8 +249,7 @@ RND_Driver::timer (const CORBA::Any &e CORBA::Any new_event; recursion++; new_event <<= recursion; - this->supplier_.push (new_event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->supplier_.push (new_event); } } break; @@ -301,9 +268,7 @@ RND_Driver::timer (const CORBA::Any &e // ACE_DEBUG ((LM_DEBUG, "Connecting supplier %d\n", n)); - this->suppliers_[n]->connect (this->supplier_admin_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->suppliers_[n]->connect (this->supplier_admin_.in ()); } break; @@ -313,9 +278,7 @@ RND_Driver::timer (const CORBA::Any &e // ACE_DEBUG ((LM_DEBUG, "Connecting consumer %d\n", n)); - this->consumers_[n]->connect (this->consumer_admin_.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->consumers_[n]->connect (this->consumer_admin_.in ()); } break; @@ -325,8 +288,7 @@ RND_Driver::timer (const CORBA::Any &e // ACE_DEBUG ((LM_DEBUG, "Disconnecting supplier %d\n", n)); - this->suppliers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->suppliers_[n]->disconnect (); } break; @@ -336,25 +298,22 @@ RND_Driver::timer (const CORBA::Any &e // ACE_DEBUG ((LM_DEBUG, "Disconnecting consumer %d\n", n)); - this->consumers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->consumers_[n]->disconnect (); } break; } } void -RND_Driver::event (const CORBA::Any &e - ACE_ENV_ARG_DECL) +RND_Driver::event (const CORBA::Any &e) { - this->timer (e ACE_ENV_ARG_PARAMETER); + this->timer (e); } // **************************************************************** void -RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin - ACE_ENV_ARG_DECL) +RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin) { CosEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -362,43 +321,37 @@ RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin if (CORBA::is_nil (this->proxy_.in ())) { - this->proxy_ = admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->proxy_ = admin->obtain_push_supplier (); } proxy = CosEventChannelAdmin::ProxyPushSupplier::_duplicate(this->proxy_.in ()); } CosEventComm::PushConsumer_var me = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - proxy->connect_push_consumer (me.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->_this (); + proxy->connect_push_consumer (me.in ()); } void -RND_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) +RND_Consumer::disconnect (void) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; - this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->proxy_->disconnect_push_supplier (); this->proxy_ = CosEventChannelAdmin::ProxyPushSupplier::_nil (); } void -RND_Consumer::push (const CORBA::Any &event - ACE_ENV_ARG_DECL) +RND_Consumer::push (const CORBA::Any &event) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->event (event ACE_ENV_ARG_PARAMETER); + this->driver_->event (event); } void -RND_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +RND_Consumer::disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -406,8 +359,7 @@ RND_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) // **************************************************************** void -RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin - ACE_ENV_ARG_DECL) +RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin) { CosEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -415,8 +367,7 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin if (CORBA::is_nil (this->proxy_.in ())) { - this->proxy_ = admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->proxy_ = admin->obtain_push_consumer (); } proxy = @@ -427,40 +378,35 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin int r = ACE_OS::rand () % 2; if (r == 0) { - me = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + me = this->_this (); } - proxy->connect_push_supplier (me.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + proxy->connect_push_supplier (me.in ()); } void -RND_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) +RND_Supplier::disconnect (void) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; - this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->proxy_->disconnect_push_consumer (); this->proxy_ = CosEventChannelAdmin::ProxyPushConsumer::_nil (); } void -RND_Supplier::push_new_event (ACE_ENV_SINGLE_ARG_DECL) +RND_Supplier::push_new_event (void) { CORBA::Any event; CORBA::Long recursion = 0; event <<= recursion; - this->push (event ACE_ENV_ARG_PARAMETER); + this->push (event); } void -RND_Supplier::push (CORBA::Any &event - ACE_ENV_ARG_DECL) +RND_Supplier::push (CORBA::Any &event) { CosEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -473,11 +419,11 @@ RND_Supplier::push (CORBA::Any &event CosEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ()); } - proxy->push (event ACE_ENV_ARG_PARAMETER); + proxy->push (event); } void -RND_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +RND_Supplier::disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -490,19 +436,16 @@ RND_Supplier::svc (void) int niterations = 5000; for (int i = 0; i != niterations; ++i) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Time_Value tv (0, 10000); ACE_OS::sleep (tv); - this->push_new_event (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->push_new_event (); } - ACE_CATCHANY + catch (const CORBA::Exception&) { } - ACE_ENDTRY; if (i * 100 / niterations >= percent) { ACE_DEBUG ((LM_DEBUG, "Thread %t %d%%\n", percent)); |