diff options
Diffstat (limited to 'TAO/orbsvcs/tests/EC_MT_Mcast')
| -rw-r--r-- | TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp | 18 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp | 51 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp | 22 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h | 3 |
7 files changed, 42 insertions, 64 deletions
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp index 50ea5a9002b..a7f4dc64cef 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp @@ -14,8 +14,7 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr) void AddrServer::get_addr (const RtecEventComm::EventHeader&, - RtecUDPAdmin::UDP_Addr_out addr - ACE_ENV_ARG_DECL_NOT_USED) + RtecUDPAdmin::UDP_Addr_out addr) ACE_THROW_SPEC ((CORBA::SystemException)) { addr = this->addr_; diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h index 232f63a5071..7fcc819f905 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h @@ -27,8 +27,7 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr - ACE_ENV_ARG_DECL_NOT_USED) + RtecUDPAdmin::UDP_Addr_out addr) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp index 4513a0573ce..e08f25ae9e3 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp @@ -15,8 +15,7 @@ Consumer::Consumer (void) } void -Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin - ACE_ENV_ARG_DECL) +Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin) { this->proxy_ = consumer_admin->obtain_push_supplier (); @@ -40,23 +39,21 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin h1.type = ACE_ES_EVENT_UNDEFINED; // first free event type h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK - this->proxy_->connect_push_consumer (me.in (), qos - ACE_ENV_ARG_PARAMETER); + this->proxy_->connect_push_consumer (me.in (), qos); } void Consumer::disconnect (void) { - ACE_TRY + try { // Disconnect from the proxy this->proxy_->disconnect_push_supplier (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions } - ACE_ENDTRY; this->proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); // Deactivate this object @@ -64,14 +61,13 @@ Consumer::disconnect (void) this->_default_POA (); // Get the Object Id used for the servant.. PortableServer::ObjectId_var oid = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this); // Deactivate the object - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in ()); } void -Consumer::push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL_NOT_USED) +Consumer::push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h index d02b498acc3..b09bde069d3 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h @@ -24,8 +24,7 @@ public: Consumer (void); // Constructor - void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin - ACE_ENV_ARG_DECL); + void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin); // Connect to the Event Channel void disconnect (void); @@ -33,8 +32,7 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL) + virtual void push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index 34b30ae6448..306419936da 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -31,11 +31,10 @@ static const int data_items = 60000; void * run_orb_within_thread (void *) { - ACE_DECLARE_NEW_CORBA_ENV; while (! terminate_threads) { - ACE_TRY + try { CORBA::Boolean there_is_work = orb->work_pending (); @@ -46,17 +45,15 @@ run_orb_within_thread (void *) // perform_work() or work_pending(), so just calling // them results in a spin loop. ACE_Time_Value tv (0, 50000); - orb->perform_work (tv ACE_ENV_ARG_PARAMETER); + orb->perform_work (tv); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "perform work"); + ex._tao_print_exception ("perform work"); return 0; } - ACE_ENDTRY; } return 0; @@ -74,13 +71,12 @@ main (int argc, char* argv[]) // so we have to explicitly invoke this function. TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // **************** HERE IS THE ORB SETUP // Create the ORB, pass the argv list for parsing. - orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc, argv, ""); // Parse the arguments, you usually want to do this after // invoking ORB_init() because ORB_init() will remove all the @@ -97,9 +93,9 @@ main (int argc, char* argv[]) // The POA starts in the holding state, if it is not activated // it will not process any requests. CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); @@ -187,8 +183,7 @@ main (int argc, char* argv[]) sender->init (event_channel.in (), address_server.in (), - endpoint - ACE_ENV_ARG_PARAMETER); + endpoint); // Now we connect the sender as a consumer of events, it will // receive any event from any source and send it to the "right" @@ -202,7 +197,7 @@ main (int argc, char* argv[]) sub.dependencies[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK - sender->connect (sub ACE_ENV_ARG_PARAMETER); + sender->connect (sub); // To receive events we need to setup an event handler: TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver; @@ -220,16 +215,14 @@ main (int argc, char* argv[]) // required by all the local consumer. // Then it register for the multicast groups that carry those // events: - mcast_eh.open (event_channel.in () - ACE_ENV_ARG_PARAMETER); + mcast_eh.open (event_channel.in ()); // Again the receiver connects to the event channel as a // supplier of events, using the Observer features to detect // local consumers and their interests: receiver->init (event_channel.in (), endpoint, - address_server.in () - ACE_ENV_ARG_PARAMETER); + address_server.in ()); // The Receiver is also a supplier of events. The exact type of // events is only known to the application, because it depends @@ -248,7 +241,7 @@ main (int argc, char* argv[]) pub.publications[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY; pub.is_gateway = 1; - receiver->connect (pub ACE_ENV_ARG_PARAMETER); + receiver->connect (pub); // **************** THAT COMPLETES THE FEDERATION SETUP @@ -260,15 +253,14 @@ main (int argc, char* argv[]) Consumer consumer2; RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = event_channel->for_consumers (); - consumer1.connect (consumer_admin.in () ACE_ENV_ARG_PARAMETER); - consumer2.connect (consumer_admin.in () ACE_ENV_ARG_PARAMETER); + consumer1.connect (consumer_admin.in ()); + consumer2.connect (consumer_admin.in ()); // And now create a supplier Supplier supplier; RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = event_channel->for_suppliers (); - supplier.connect (supplier_admin.in () - ACE_ENV_ARG_PARAMETER); + supplier.connect (supplier_admin.in ()); // **************** THAT COMPLETES THE CLIENT SETUP @@ -336,14 +328,14 @@ main (int argc, char* argv[]) ec_impl._default_POA (); // Get the Object Id used for the servant.. PortableServer::ObjectId_var oid = - poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (&ec_impl); // Deactivate the object - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in ()); } // Now we can destroy the POA, the flags mean that we want to // wait until the POA is really destroyed - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); // Finally destroy the ORB orb->destroy (); @@ -353,12 +345,11 @@ main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "MCast example finished\n")); } - 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; } diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp index 253b0e4182d..adc2b007fa0 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp @@ -14,8 +14,7 @@ Supplier::Supplier (void) } void -Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin - ACE_ENV_ARG_DECL) +Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin) { this->proxy_ = supplier_admin->obtain_push_consumer (); @@ -34,34 +33,32 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin h0.type = ACE_ES_EVENT_UNDEFINED; // first free event type h0.source = 1; // first free event source - this->proxy_->connect_push_supplier (me.in (), qos - ACE_ENV_ARG_PARAMETER); + this->proxy_->connect_push_supplier (me.in (), qos); } void Supplier::disconnect (void) { // Disconnect from the EC - ACE_TRY + try { this->proxy_->disconnect_push_consumer (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this); + poa->deactivate_object (id.in ()); } void Supplier::perform_push (void) { - ACE_TRY + try { // The event type and source must match our publications RtecEventComm::EventSet event (1); @@ -71,12 +68,11 @@ Supplier::perform_push (void) // Avoid loops throught the event channel federations event[0].header.ttl = 1; - this->proxy_->push (event ACE_ENV_ARG_PARAMETER); + this->proxy_->push (event); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; } void diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h index 048b23daf20..432359e4202 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h @@ -25,8 +25,7 @@ public: Supplier (void); // Constructor - void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin - ACE_ENV_ARG_DECL); + void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin); // Connect to the event channel void disconnect (void); |