diff options
Diffstat (limited to 'TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp')
| -rw-r--r-- | TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp | 106 |
1 files changed, 33 insertions, 73 deletions
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index bb27f0bad68..24b985f0f69 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -29,13 +29,11 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) == -1) { @@ -45,28 +43,22 @@ main (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 (); // **************************************************************** #if 0 // Obtain a reference to the naming service... CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->resolve_initial_references ("NameService"); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CosNaming::NamingContext::_narrow (naming_obj.in ()); #endif /* 0 */ // **************************************************************** @@ -92,8 +84,7 @@ main (int argc, char* argv[]) } RtecScheduler::Scheduler_var scheduler = - sched_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sched_impl->_this (); #if 0 // Bind the scheduler with the naming service so clients @@ -104,9 +95,7 @@ main (int argc, char* argv[]) schedule_name.length (1); schedule_name[0].id = CORBA::string_dup ("ScheduleService"); // Register the servant with the Naming Context.... - naming_context->rebind (schedule_name, scheduler.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + naming_context->rebind (schedule_name, scheduler.in ()); #endif /* 0 */ // **************************************************************** @@ -117,13 +106,11 @@ main (int argc, char* argv[]) TAO_EC_Event_Channel ec_impl (attributes); ACE_DEBUG ((LM_DEBUG, "activating EC\n")); - ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec_impl.activate (); ACE_DEBUG ((LM_DEBUG, "EC activated\n")); RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ec_impl._this (); // **************************************************************** @@ -133,8 +120,7 @@ main (int argc, char* argv[]) Consumer consumer_impl; RtecScheduler::handle_t consumer_rt_info1 = - scheduler->create ("consumer_event_1" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + scheduler->create ("consumer_event_1"); // Let's say that the execution time for event 1 is 2 // milliseconds... @@ -148,13 +134,10 @@ main (int argc, char* argv[]) RtecScheduler::VERY_LOW_IMPORTANCE, time, 0, - RtecScheduler::OPERATION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + RtecScheduler::OPERATION); RtecScheduler::handle_t consumer_rt_info2 = - scheduler->create ("consumer_event_2" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + scheduler->create ("consumer_event_2"); // Let's say that the execution time for event 2 is 1 // milliseconds... @@ -167,9 +150,7 @@ main (int argc, char* argv[]) RtecScheduler::VERY_LOW_IMPORTANCE, time, 0, - RtecScheduler::OPERATION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + RtecScheduler::OPERATION); ACE_ConsumerQOS_Factory consumer_qos; consumer_qos.start_disjunction_group (); @@ -182,22 +163,17 @@ main (int argc, char* argv[]) // The canonical protocol to connect to the EC RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + event_channel->for_consumers (); RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy = - consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_admin->obtain_push_supplier (); RtecEventComm::PushConsumer_var consumer = - consumer_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_impl._this (); ACE_DEBUG ((LM_DEBUG, "connecting consumer\n")); supplier_proxy->connect_push_consumer (consumer.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_qos.get_ConsumerQOS ()); ACE_DEBUG ((LM_DEBUG, "consumer connected\n")); // **************************************************************** @@ -205,8 +181,7 @@ main (int argc, char* argv[]) Supplier supplier_impl; RtecScheduler::handle_t supplier_rt_info1 = - scheduler->create ("supplier_event_1" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + scheduler->create ("supplier_event_1"); // The execution times are set to reasonable values, but // actually they are changed on the real execution, i.e. we @@ -224,13 +199,10 @@ main (int argc, char* argv[]) RtecScheduler::VERY_LOW_IMPORTANCE, 0, 1, - RtecScheduler::OPERATION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + RtecScheduler::OPERATION); RtecScheduler::handle_t supplier_rt_info2 = - scheduler->create ("supplier_event_2" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + scheduler->create ("supplier_event_2"); // The execution times are set to reasonable values, but // actually they are changed on the real execution, i.e. we @@ -247,9 +219,7 @@ main (int argc, char* argv[]) RtecScheduler::VERY_LOW_IMPORTANCE, 0, 1, - RtecScheduler::OPERATION - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + RtecScheduler::OPERATION); RtecEventComm::EventSourceID supplier_id = 1; ACE_SupplierQOS_Factory supplier_qos; @@ -264,22 +234,17 @@ main (int argc, char* argv[]) // The canonical protocol to connect to the EC RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + event_channel->for_suppliers (); RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy = - supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier_admin->obtain_push_consumer (); RtecEventComm::PushSupplier_var supplier = - supplier_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier_impl._this (); ACE_DEBUG ((LM_DEBUG, "connecting supplier\n")); consumer_proxy->connect_push_supplier (supplier.in (), - supplier_qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + supplier_qos.get_SupplierQOS ()); ACE_DEBUG ((LM_DEBUG, "supplier connected\n")); // **************************************************************** @@ -316,9 +281,7 @@ main (int argc, char* argv[]) infos.out (), deps.out (), configs.out (), - anomalies.out () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + anomalies.out ()); // Dump the schedule to a file.. ACE_Scheduler_Factory::dump_schedule (infos.in (), @@ -350,13 +313,11 @@ main (int argc, char* argv[]) { if (i % 2 == 0) { - consumer_proxy->push (event1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_proxy->push (event1); } else { - consumer_proxy->push (event2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + consumer_proxy->push (event2); } ACE_Time_Value rate (0, 10000); @@ -370,12 +331,11 @@ main (int argc, char* argv[]) // just a simple demo so we are going to be lazy. } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } |