diff options
Diffstat (limited to 'TAO/examples/Simulator/Event_Supplier/Event_Con.cpp')
| -rw-r--r-- | TAO/examples/Simulator/Event_Supplier/Event_Con.cpp | 115 |
1 files changed, 37 insertions, 78 deletions
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp index e14e834f16c..0ae7315b44f 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp @@ -61,8 +61,7 @@ int Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, const char *my_name) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Get a Scheduler. @@ -70,8 +69,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, ACE_Scheduler_Factory::server (); // Define Real-time information. - rt_info_ = server->create (my_name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + rt_info_ = server->create (my_name); server->set (rt_info_, RtecScheduler::VERY_LOW_CRITICALITY, @@ -82,9 +80,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, RtecScheduler::VERY_LOW_IMPORTANCE, ORBSVCS_Time::zero (), 1, - RtecScheduler::OPERATION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + RtecScheduler::OPERATION); // Create the event that we're registering for. @@ -102,48 +98,41 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, // = Connect as a consumer. this->consumer_admin_ = - channel_admin_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + channel_admin_->for_consumers (); // Obtain a pointer to a push supplier. "suppliers" is // inherited from a base class. this->suppliers_ = - consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_admin_->obtain_push_supplier (); // The _this function returns an object pointer. This is needed // because a consumer inherits from a Servant class that is no // CORBA::Object. RtecEventComm::PushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_this (); this->suppliers_->connect_push_consumer (objref.in (), - dependencies.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + dependencies.get_ConsumerQOS ()); } - ACE_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se) + catch (const RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR& ) { ACE_ERROR_RETURN ((LM_ERROR, "Demo_Consumer::open: subscribe failed.\n"), -1); } - ACE_CATCHANY + catch (const CORBA::Exception&) { ACE_ERROR_RETURN ((LM_ERROR, "Demo_Consumer::open: unexpected exception.\n"), -1); } - ACE_ENDTRY; - ACE_CHECK_RETURN (0); return 0; } void -Demo_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Demo_Consumer::disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -151,8 +140,7 @@ Demo_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Demo_Consumer::push (const RtecEventComm::EventSet &events - ACE_ENV_ARG_DECL) +Demo_Consumer::push (const RtecEventComm::EventSet &events) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -176,24 +164,19 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events { ACE_DEBUG ((LM_DEBUG, "Demo Consumer: received ACE_ES_EVENT_NOTIFICATION event.\n")); - ACE_TRY + try { // Use a temporary int to avoid overload ambiguities with // the enum. - int kind = events[i].data.any_value.type()->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ACE_DEBUG ((LM_DEBUG, "ID: %s\n", events[i].data.any_value.type()->id(ACE_ENV_SINGLE_ARG_PARAMETER))); - ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG, "Name: %s\n", events[i].data.any_value.type()->name(ACE_ENV_SINGLE_ARG_PARAMETER))); - ACE_TRY_CHECK; - ACE_DEBUG ((LM_DEBUG, "member_count: %u\n", events[i].data.any_value.type()->member_count(ACE_ENV_SINGLE_ARG_PARAMETER))); - ACE_TRY_CHECK; + int kind = events[i].data.any_value.type()->kind (); + + ACE_DEBUG ((LM_DEBUG, "ID: %s\n", events[i].data.any_value.type()->id())); + ACE_DEBUG ((LM_DEBUG, "Name: %s\n", events[i].data.any_value.type()->name())); + ACE_DEBUG ((LM_DEBUG, "member_count: %u\n", events[i].data.any_value.type()->member_count())); ACE_DEBUG ((LM_DEBUG, "TCKind: %d\n", kind)); CORBA::Boolean ret = - _tc_Navigation->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + _tc_Navigation->equal (events[i].data.any_value.type()); if (ret) { @@ -203,8 +186,7 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events } else { - ret = _tc_Weapons->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ret = _tc_Weapons->equal (events[i].data.any_value.type()); if (ret) { @@ -214,12 +196,10 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events } } } - ACE_CATCHANY + catch (const CORBA::Exception&) { ACE_ERROR ((LM_ERROR, "(%t)Error in extracting the Navigation and Weapons data.\n")); } - ACE_ENDTRY; - ACE_CHECK; } } } @@ -227,25 +207,21 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events void Demo_Consumer::shutdown (void) { - ACE_TRY_NEW_ENV + try { // Disconnect from the push supplier. - this->suppliers_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->suppliers_->disconnect_push_supplier (); ACE_DEBUG ((LM_DEBUG, "@@ we should shutdown here!!!\n")); - ACE_TRY_CHECK; TAO_ORB_Core_instance ()->orb ()->shutdown (); - ACE_TRY_CHECK; } - ACE_CATCHANY + catch (const CORBA::Exception&) { ACE_ERROR ((LM_ERROR, "(%t) Demo_Consumer::shutdown: unexpected exception.\n")); } - ACE_ENDTRY; } // function get_options @@ -291,18 +267,15 @@ get_options (int argc, char *argv []) int main (int argc, char *argv []) { - ACE_TRY_NEW_ENV + try { // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ORB_init (argc, argv, "internet"); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -310,17 +283,13 @@ main (int argc, char *argv []) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->resolve_initial_references ("NameService"); if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -328,9 +297,7 @@ main (int argc, char *argv []) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CosNaming::NamingContext::_narrow (naming_obj.in ()); ACE_Scheduler_Factory::use_config (naming_context.in ()); @@ -344,13 +311,10 @@ main (int argc, char *argv []) channel_name[0].id = CORBA::string_dup ("EventService"); CORBA::Object_var ec_obj = - naming_context->resolve (channel_name - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + naming_context->resolve (channel_name); RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in()); if (CORBA::is_nil (ec.in())) ACE_ERROR_RETURN ((LM_ERROR, @@ -370,27 +334,22 @@ main (int argc, char *argv []) "Someone was feeling introverted.\n"), -1); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Run the ORB - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); delete demo_consumer; root_poa->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX"); + ex._tao_print_exception ("SYS_EX"); } - ACE_ENDTRY; return 0; } |