diff options
Diffstat (limited to 'TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp')
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp | 174 |
1 files changed, 94 insertions, 80 deletions
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index 9ee389f0ce4..13af016f3b7 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -30,30 +30,30 @@ Subscribe::~Subscribe () } void -Subscribe::init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV) +Subscribe::init (int argc, char *argv [] TAO_ENV_ARG_DECL) { - init_ORB (argc, argv, ACE_TRY_ENV); + init_ORB (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; - resolve_naming_service (ACE_TRY_ENV); + resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - resolve_Notify_factory (ACE_TRY_ENV); + resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_EC (ACE_TRY_ENV); + create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_supplieradmin (ACE_TRY_ENV); + create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumeradmin (ACE_TRY_ENV); + create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumers (ACE_TRY_ENV); + create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_suppliers (ACE_TRY_ENV); + create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::run (CORBA::Environment &ACE_TRY_ENV) +Subscribe::run (TAO_ENV_SINGLE_ARG_DECL) { - this->send_events (ACE_TRY_ENV); + this->send_events (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (g_result_count != EVENT_COUNT) // if we still need to wait for events, run the orb. @@ -72,18 +72,18 @@ Subscribe::done (void) void Subscribe::init_ORB (int argc, - char *argv [], - CORBA::Environment &ACE_TRY_ENV) + char *argv [] + TAO_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_ptr poa_object = - this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object)) @@ -93,23 +93,23 @@ Subscribe::init_ORB (int argc, return; } this->root_poa_ = - PortableServer::POA::_narrow (poa_object, ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_TRY_ENV); + root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) +Subscribe::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references (NAMING_SERVICE_NAME, - ACE_TRY_ENV); + this->orb_->resolve_initial_references (NAMING_SERVICE_NAME + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -117,96 +117,96 @@ Subscribe::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) ACE_THROW (CORBA::UNKNOWN ()); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV) +Subscribe::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME); CORBA::Object_var obj = - this->naming_context_->resolve (name, - ACE_TRY_ENV); + this->naming_context_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->notify_factory_ = - CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in (), - ACE_TRY_ENV); + CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::create_EC (CORBA::Environment &ACE_TRY_ENV) +Subscribe::create_EC (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, - id, - ACE_TRY_ENV); + id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -Subscribe::create_supplieradmin (CORBA::Environment &ACE_TRY_ENV) +Subscribe::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); } void -Subscribe:: create_consumeradmin (CORBA::Environment &ACE_TRY_ENV) +Subscribe:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); } void -Subscribe::create_consumers (CORBA::Environment &ACE_TRY_ENV) +Subscribe::create_consumers (TAO_ENV_SINGLE_ARG_DECL) { consumer_1_ = new Subscribe_StructuredPushConsumer (this); - consumer_1_->connect (this->consumer_admin_.in (), - ACE_TRY_ENV); + consumer_1_->connect (this->consumer_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; consumer_2_ = new Subscribe_StructuredPushConsumer (this); - consumer_2_->connect (this->consumer_admin_.in (), - ACE_TRY_ENV); + consumer_2_->connect (this->consumer_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::create_suppliers (CORBA::Environment &ACE_TRY_ENV) +Subscribe::create_suppliers (TAO_ENV_SINGLE_ARG_DECL) { supplier_1_ = new Subscribe_StructuredPushSupplier (); - supplier_1_->connect (this->supplier_admin_.in (), - ACE_TRY_ENV); + supplier_1_->connect (this->supplier_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; supplier_2_ = new Subscribe_StructuredPushSupplier (); - supplier_2_->connect (this->supplier_admin_.in (), - ACE_TRY_ENV); + supplier_2_->connect (this->supplier_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV) +Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL) { // Setup the CA to receive event_type : "domain_A", "Type_a" CosNotification::EventTypeSeq added(1); @@ -220,7 +220,7 @@ Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV) removed[0].domain_name = CORBA::string_dup ("*"); removed[0].type_name = CORBA::string_dup ("*"); - this->consumer_admin_->subscription_change (added, removed, ACE_TRY_ENV); + this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the Consumer 1 to receive event_type : "domain_B", "Type_b" @@ -232,8 +232,8 @@ Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV) added_1.length (1); removed_1.length (0); - this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1, - ACE_TRY_ENV); + this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the Consumer 2 to receive event_type : "domain_C", "Type_c" @@ -245,8 +245,8 @@ Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV) added_2.length (1); removed_2.length (0); - this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2, - ACE_TRY_ENV); + this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create the events - one of each type @@ -286,11 +286,11 @@ Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV) // let supplier 1 send all these events for (int i = 0; i < 1; ++i) { - supplier_1_->send_event (event1, ACE_TRY_ENV); + supplier_1_->send_event (event1 TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_1_->send_event (event2, ACE_TRY_ENV); + supplier_1_->send_event (event2 TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_1_->send_event (event3, ACE_TRY_ENV); + supplier_1_->send_event (event3 TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -306,15 +306,17 @@ Subscribe_StructuredPushConsumer::~Subscribe_StructuredPushConsumer () } void -Subscribe_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV) +Subscribe_StructuredPushConsumer::connect + (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin + TAO_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = - consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_, ACE_TRY_ENV); + consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); @@ -322,27 +324,29 @@ Subscribe_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ // narrow this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: - _narrow (proxysupplier.in (), ACE_TRY_ENV); + _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); - proxy_supplier_->connect_structured_push_consumer (objref.in (), - ACE_TRY_ENV); + proxy_supplier_->connect_structured_push_consumer (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe_StructuredPushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +Subscribe_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { this->proxy_supplier_-> - disconnect_structured_push_supplier(ACE_TRY_ENV); + disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Subscribe_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/, CORBA::Environment & //ACE_TRY_ENV -) +Subscribe_StructuredPushConsumer::offer_change + (const CosNotification::EventTypeSeq & /*added*/, + const CosNotification::EventTypeSeq & /*removed*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -352,7 +356,9 @@ Subscribe_StructuredPushConsumer::offer_change (const CosNotification::EventType } void -Subscribe_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &/*ACE_TRY_ENV*/) +Subscribe_StructuredPushConsumer::push_structured_event + (const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -372,7 +378,8 @@ Subscribe_StructuredPushConsumer::push_structured_event (const CosNotification:: } void -Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer (CORBA::Environment &/*ACE_TRY_ENV*/) +Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer + (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -397,41 +404,45 @@ Subscribe_StructuredPushSupplier::~Subscribe_StructuredPushSupplier () } void -Subscribe_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV) +Subscribe_StructuredPushSupplier::connect + (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin + TAO_ENV_ARG_DECL) { CosNotifyComm::StructuredPushSupplier_var objref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = - supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_, ACE_TRY_ENV); + supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = - CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in (), ACE_TRY_ENV); + CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); - proxy_consumer_->connect_structured_push_supplier (objref.in (), - ACE_TRY_ENV); + proxy_consumer_->connect_structured_push_supplier (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe_StructuredPushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +Subscribe_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_structured_push_consumer(ACE_TRY_ENV); + this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER); } void -Subscribe_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */, CORBA::Environment & /*ACE_TRY_ENV*/ - ) +Subscribe_StructuredPushSupplier::subscription_change + (const CosNotification::EventTypeSeq & /*added*/, + const CosNotification::EventTypeSeq & /*removed */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -441,16 +452,19 @@ Subscribe_StructuredPushSupplier::subscription_change (const CosNotification::Ev } void -Subscribe_StructuredPushSupplier::send_event (const CosNotification::StructuredEvent& event, CORBA::Environment &ACE_TRY_ENV) +Subscribe_StructuredPushSupplier::send_event + (const CosNotification::StructuredEvent& event + TAO_ENV_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - proxy_consumer_->push_structured_event (event, ACE_TRY_ENV); + proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier (CORBA::Environment &/*ACE_TRY_ENV*/) +Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier + (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) |