diff options
Diffstat (limited to 'TAO/orbsvcs/examples/Notify')
32 files changed, 225 insertions, 454 deletions
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp index 3e6109e1ee1..2e901202219 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp @@ -182,7 +182,7 @@ private: virtual void - disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + disconnect_structured_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // We don't care. @@ -224,7 +224,6 @@ main (int argc, char* argv[]) CORBA::Object_var obj ( orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; PortableServer::POA_var root_poa (PortableServer::POA::_narrow (obj.in ())); @@ -255,13 +254,11 @@ main (int argc, char* argv[]) ns->init_service (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create the channel factory. // EventChannelFactory_var factory (ns->create (root_poa.in () ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; if (is_nil (factory.in ())) { diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp index f34fd4bd09c..8538b217a11 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp @@ -249,7 +249,7 @@ push_structured_event (StructuredEvent const& e ACE_ENV_ARG_DECL_NOT_USED) void Gate:: -disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +disconnect_structured_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // We don't care. diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h index 312bb6b5a20..016da30f670 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h +++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h @@ -67,7 +67,7 @@ private: virtual void - disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL) + disconnect_structured_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp index 2751694dcd7..9ebf15df497 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp @@ -52,7 +52,6 @@ main (int argc, char* argv[]) CORBA::Object_var obj ( orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; PortableServer::POA_var root_poa (PortableServer::POA::_narrow (obj.in ())); @@ -83,13 +82,11 @@ main (int argc, char* argv[]) ns->init_service (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create the channel factory. // EventChannelFactory_var factory (ns->create (root_poa.in () ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; if (is_nil (factory.in ())) { diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp index a2aa9dbf434..eb8e92c2897 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp @@ -31,35 +31,26 @@ void FilterClient::init (int argc, char *argv [] ACE_ENV_ARG_DECL) { init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + resolve_naming_service (); - resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + resolve_Notify_factory (); - create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + create_EC (); - create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + create_supplieradmin (); - create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + create_consumeradmin (); - create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + create_consumers (); - create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + create_suppliers (); } void -FilterClient::run (ACE_ENV_SINGLE_ARG_DECL) +FilterClient::run (void) { - send_events (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + send_events (); if (g_result_count != EVENTS_EXPECTED_TO_RECEIVE) { // if we still need to wait for events, run the orb. @@ -84,12 +75,10 @@ FilterClient::init_ORB (int argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_ptr poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (poa_object)) { @@ -100,23 +89,19 @@ FilterClient::init_ORB (int argc, this->root_poa_ = PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa_manager->activate (); } void -FilterClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) +FilterClient::resolve_naming_service (void) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Need to check return value for errors. if (CORBA::is_nil (naming_obj.in ())) @@ -124,11 +109,10 @@ FilterClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -FilterClient::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL) +FilterClient::resolve_Notify_factory (void) { CosNaming::Name name (1); name.length (1); @@ -137,16 +121,14 @@ FilterClient::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->notify_factory_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -FilterClient::create_EC (ACE_ENV_SINGLE_ARG_DECL) +FilterClient::create_EC (void) { CosNotifyChannelAdmin::ChannelID id; @@ -154,30 +136,26 @@ FilterClient::create_EC (ACE_ENV_SINGLE_ARG_DECL) initial_admin_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -FilterClient::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL) +FilterClient::create_supplieradmin (void) { CosNotifyChannelAdmin::AdminID adminid = 0; supplier_admin_ = ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); CosNotifyFilter::FilterFactory_var ffact = - ec_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ec_->default_filter_factory (); // setup a filter at the consumer admin CosNotifyFilter::Filter_var sa_filter = ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (sa_filter.in ())); @@ -188,31 +166,26 @@ FilterClient::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL) constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER); sa_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_admin_->add_filter (sa_filter.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -FilterClient:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL) +FilterClient:: create_consumeradmin (void) { CosNotifyChannelAdmin::AdminID adminid = 0; consumer_admin_ = ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); CosNotifyFilter::FilterFactory_var ffact = - ec_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ec_->default_filter_factory (); // setup a filter at the consumer admin CosNotifyFilter::Filter_var ca_filter = ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ca_filter.in ())); @@ -228,14 +201,12 @@ FilterClient:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL) constraint_list[0].constraint_expr = CORBA::string_dup (CA_FILTER); ca_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer_admin_->add_filter (ca_filter.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -FilterClient::create_consumers (ACE_ENV_SINGLE_ARG_DECL) +FilterClient::create_consumers (void) { // startup the first consumer. ACE_NEW_THROW_EX (consumer_1, @@ -243,7 +214,6 @@ FilterClient::create_consumers (ACE_ENV_SINGLE_ARG_DECL) CORBA::NO_MEMORY ()); consumer_1->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // startup the second consumer. ACE_NEW_THROW_EX (consumer_2, @@ -251,11 +221,10 @@ FilterClient::create_consumers (ACE_ENV_SINGLE_ARG_DECL) CORBA::NO_MEMORY ()); consumer_2->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -FilterClient::create_suppliers (ACE_ENV_SINGLE_ARG_DECL) +FilterClient::create_suppliers (void) { // startup the first supplier ACE_NEW_THROW_EX (supplier_1, @@ -263,7 +232,6 @@ FilterClient::create_suppliers (ACE_ENV_SINGLE_ARG_DECL) CORBA::NO_MEMORY ()); supplier_1->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // startup the second supplier ACE_NEW_THROW_EX (supplier_2, @@ -271,11 +239,10 @@ FilterClient::create_suppliers (ACE_ENV_SINGLE_ARG_DECL) CORBA::NO_MEMORY ()); supplier_2->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -FilterClient::send_events (ACE_ENV_SINGLE_ARG_DECL) +FilterClient::send_events (void) { // operations: CosNotification::StructuredEvent event; @@ -321,10 +288,8 @@ FilterClient::send_events (ACE_ENV_SINGLE_ARG_DECL) event.remainder_of_body <<= (CORBA::Long)i; supplier_1->send_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_2->send_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -344,12 +309,10 @@ Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr { // Activate the consumer with the default_POA_ CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); @@ -357,21 +320,18 @@ Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); proxy_supplier_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Filter_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) +Filter_StructuredPushConsumer::disconnect (void) { this->proxy_supplier_-> - disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + disconnect_structured_push_supplier(); } void @@ -416,7 +376,7 @@ Filter_StructuredPushConsumer::push_structured_event void Filter_StructuredPushConsumer::disconnect_structured_push_consumer - (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -440,33 +400,29 @@ void Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL) { CosNotifyComm::StructuredPushSupplier_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); proxy_consumer_->connect_structured_push_supplier (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Filter_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) +Filter_StructuredPushSupplier::disconnect (void) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); + this->proxy_consumer_->disconnect_structured_push_consumer(); } void @@ -492,12 +448,11 @@ Filter_StructuredPushSupplier::send_event "%s is sending an event \n", my_name_.fast_rep ())); proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void Filter_StructuredPushSupplier::disconnect_structured_push_supplier - (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + (void) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index e7f9cd236a4..ecd6679122c 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -43,7 +43,7 @@ class FilterClient void init (int argc, char *argv [] ACE_ENV_ARG_DECL); // Init the Client. - void run (ACE_ENV_SINGLE_ARG_DECL); + void run (void); // Run the demo. void done (void); @@ -53,28 +53,28 @@ class FilterClient void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); + void resolve_naming_service (void); // Try to get hold of a running naming service. - void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL); + void resolve_Notify_factory (void); // Try to resolve the Notify factory from the Naming service. - void create_EC (ACE_ENV_SINGLE_ARG_DECL); + void create_EC (void); // Create an EC. - void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL); + void create_supplieradmin(void); // Create the Supplier Admin. - void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL); + void create_consumeradmin (void); // Create the Consumer Admin. - void create_consumers (ACE_ENV_SINGLE_ARG_DECL); + void create_consumers (void); // Create and initialize the consumers. - void create_suppliers (ACE_ENV_SINGLE_ARG_DECL); + void create_suppliers (void); // create and initialize the suppliers. - void send_events (ACE_ENV_SINGLE_ARG_DECL); + void send_events (void); // send the events. // = Data Members @@ -144,7 +144,7 @@ class Filter_StructuredPushConsumer // Connect the Consumer to the EventChannel. // Creates a new proxy supplier and connects to it. - virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL); + virtual void disconnect (void); // Disconnect from the supplier. protected: @@ -216,7 +216,7 @@ class Filter_StructuredPushSupplier // Connect the Supplier to the EventChannel. // Creates a new proxy supplier and connects to it. - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); // Disconnect from the supplier. virtual void send_event (const CosNotification::StructuredEvent& event diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp index 845f7ab68f7..86f80717ef8 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp @@ -12,10 +12,8 @@ main (int argc, char *argv []) { client.init (argc, argv ACE_ENV_ARG_PARAMETER); //Init the Client - ACE_TRY_CHECK; - client.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.run (); } ACE_CATCH (CORBA::UserException, ue) { diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp index 17d2109cfb0..4ade161f36f 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp @@ -23,45 +23,41 @@ TAO_Notify_Lanes_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelA this->admin_ = admin; this->event_type_ = event_type; - this->connect (ACE_ENV_SINGLE_ARG_PARAMETER); + this->connect (); } PortableServer::POA_ptr -TAO_Notify_Lanes_Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Lanes_Consumer::_default_POA (void) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_Notify_Lanes_Consumer::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Lanes_Consumer::run (void) { // Nothing to do. } void -TAO_Notify_Lanes_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Consumer::connect (void) { // Activate the consumer with the default_POA_ - CosNotifyComm::StructuredPushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyComm::StructuredPushConsumer_var objref = this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = this->admin_->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT , proxy_supplier_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); // narrow this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); this->proxy_supplier_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Call subscription_change to inform the supplier that this consumer is available. CosNotification::EventTypeSeq added (1); @@ -72,14 +68,12 @@ TAO_Notify_Lanes_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL) added[0].type_name = CORBA::string_dup (this->event_type_.c_str ()); this->proxy_supplier_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Lanes_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Consumer::disconnect (void) { - this->proxy_supplier_->disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->proxy_supplier_->disconnect_structured_push_supplier(); } void @@ -106,8 +100,7 @@ TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::Structu { // Check the current threads priority. RTCORBA::Priority thread_priority = - this->orb_objects_.current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_objects_.current_->the_priority (); const CosNotification::PropertySeq& prop_seq = notification.header.variable_header; @@ -128,10 +121,10 @@ TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::Structu ACE_DEBUG ((LM_DEBUG, "(%P, %t) Error: Event priority and thread priority are different. \n")); // Disconnect from the EC - this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); + this->disconnect (); // Deactivate this object. - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (); // We received the event, shutdown the ORB. this->orb_objects_.orb_->shutdown (1); @@ -147,25 +140,22 @@ TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::Structu } void -TAO_Notify_Lanes_Consumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Consumer::deactivate (void) { - PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; + PortableServer::POA_var poa (this->_default_POA ()); PortableServer::ObjectId_var id (poa->servant_to_id (this ACE_ENV_ARG_PARAMETER)); - ACE_CHECK; poa->deactivate_object (id.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (); } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h index 0f3c3d76dd9..779f093620b 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h @@ -38,7 +38,7 @@ public: void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type ACE_ENV_ARG_DECL); /// Run - void run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + void run (void); protected: // = Data members @@ -66,17 +66,17 @@ protected: virtual ~TAO_Notify_Lanes_Consumer (void); // = ServantBase operations - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (void); /// Connect the Consumer to the EventChannel. /// Creates a new proxy supplier and connects to it. - void connect (ACE_ENV_SINGLE_ARG_DECL); + void connect (void); /// Disconnect the supplier. - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); /// Deactivate. - void deactivate (ACE_ENV_SINGLE_ARG_DECL); + void deactivate (void); // = NotifyPublish method virtual void offer_change ( diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index 942d444d0cf..23bbaa14770 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -55,32 +55,27 @@ TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, char *argv[]) } void -TAO_Notify_Lanes_Consumer_Client::initialize (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Consumer_Client::initialize (void) { ACE_DEBUG ((LM_DEBUG, "(%P, %t)Initializing Consumer Client with lane priority = %d, event type = (%s)\n" , this->lane_priority_, this->event_type_.c_str ())); PortableServer::POAManager_var poa_manager = - this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_objects_.root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa_manager->activate (); // Resolve the Notification Factory. - CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (); // Find the EventChannel created by the supplier. - CosNotifyChannelAdmin::ChannelIDSeq_var channel_seq = ecf->get_all_channels (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyChannelAdmin::ChannelIDSeq_var channel_seq = ecf->get_all_channels (); CosNotifyChannelAdmin::EventChannel_var ec; if (channel_seq->length() > 0) { ec = ecf->get_event_channel (channel_seq[0] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { @@ -93,12 +88,10 @@ TAO_Notify_Lanes_Consumer_Client::initialize (ACE_ENV_SINGLE_ARG_DECL) CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin = ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin.in ())); - PortableServer::POA_var rt_poa = this->create_rt_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POA_var rt_poa = this->create_rt_poa (); // Create a Consumer this->consumer_ = new TAO_Notify_Lanes_Consumer (this->orb_objects_); @@ -108,7 +101,7 @@ TAO_Notify_Lanes_Consumer_Client::initialize (ACE_ENV_SINGLE_ARG_DECL) } PortableServer::POA_ptr -TAO_Notify_Lanes_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void) { PortableServer::POA_var rt_poa; @@ -118,14 +111,12 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL) CORBA::Policy_var activation_policy = this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (rt_poa._retn ()); // Create a priority model policy. priority_model_policy = this->orb_objects_.rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED , 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (rt_poa._retn ()); RTCORBA::ThreadpoolLanes lanes (1); lanes.length (1); @@ -151,13 +142,11 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL) max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (rt_poa._retn ()); // Create a thread-pool policy. lanes_policy = this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (rt_poa._retn ()); CORBA::PolicyList poa_policy_list; @@ -167,22 +156,20 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL) poa_policy_list[2] = lanes_policy; PortableServer::POAManager_var poa_manager = - this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (rt_poa._retn ()); + this->orb_objects_.root_poa_->the_POAManager (); rt_poa = this->orb_objects_.root_poa_->create_POA ("RT POA!", poa_manager.in (), poa_policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (rt_poa._retn ()); return rt_poa._retn (); } void -TAO_Notify_Lanes_Consumer_Client::run (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Consumer_Client::run (void) { - this->consumer_->run (ACE_ENV_SINGLE_ARG_PARAMETER); + this->consumer_->run (); } int @@ -192,13 +179,10 @@ TAO_Notify_Lanes_Consumer_Client::svc (void) { // Initialize this threads priority. this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->initialize (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client - ACE_TRY_CHECK; + this->initialize (); //Init the Client - this->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->run (); } ACE_CATCHANY { @@ -221,12 +205,10 @@ main (int argc, char *argv []) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_Notify_ORB_Objects orb_objects; orb_objects.init (orb ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_Notify_ORB_Run_Task orb_run_task (orb_objects); diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h index 31193b994f2..8160df2c847 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h @@ -39,10 +39,10 @@ public: ~TAO_Notify_Lanes_Consumer_Client (); /// Init - void initialize (ACE_ENV_SINGLE_ARG_DECL); + void initialize (void); /// Run - void run (ACE_ENV_SINGLE_ARG_DECL); + void run (void); /// Parse Args int parse_args (int argc, char *argv[]); @@ -52,7 +52,7 @@ public: protected: /// Create an RT POA with a single lane at the specified RT Priority. - PortableServer::POA_ptr create_rt_poa (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr create_rt_poa (void); /// ORB Objects. TAO_Notify_ORB_Objects orb_objects_; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp index b26b9dbb0ec..9790bf16f98 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp @@ -15,36 +15,28 @@ TAO_Notify_ORB_Objects::init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL) CORBA::Object_var object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->root_poa_ = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Resolve the RTORB. object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Resolve the Current object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->current_ = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Resolve the Naming service object = this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->naming_ = CosNaming::NamingContextExt::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects () @@ -52,7 +44,7 @@ TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects () } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ORB_Objects::notify_factory (void) { CosNotifyChannelAdmin::EventChannelFactory_var ecf; @@ -62,10 +54,8 @@ TAO_Notify_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL) name[0].id = CORBA::string_dup ("NotifyEventChannelFactory"); CORBA::Object_var object = this->naming_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ecf._retn ()); ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ecf._retn ()); return ecf._retn (); } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h index e846e43303b..97a10af69c3 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h @@ -38,7 +38,7 @@ public: void init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL); /// Resolve Notification - CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (ACE_ENV_SINGLE_ARG_DECL); + CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void); ///= Public Data CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp index 953328f78c5..2477f15457a 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp @@ -19,10 +19,8 @@ TAO_Notify_ORB_Run_Task::svc (void) ACE_TRY_NEW_ENV { this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->orb_objects_.orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_objects_.orb_->run (); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp index 8b3a2a50862..22d6e8cf5bf 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp @@ -26,11 +26,11 @@ TAO_Notify_Lanes_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin this->admin_ = admin; this->expected_consumer_count_ = expected_consumer_count; - this->connect (ACE_ENV_SINGLE_ARG_PARAMETER); + this->connect (); } void -TAO_Notify_Lanes_Supplier::run (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Supplier::run (void) { // The Priority at which we send the first event to the first consumer. RTCORBA::Priority priority = 1; @@ -51,12 +51,10 @@ TAO_Notify_Lanes_Supplier::run (ACE_ENV_SINGLE_ARG_DECL) { // Set this threads priority. this->orb_objects_.current_->the_priority (priority ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Make sure the priority was set, get the priority of the current thread. RTCORBA::Priority thread_priority = - this->orb_objects_.current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_objects_.current_->the_priority (); // We will send this event. CosNotification::StructuredEvent event; @@ -87,64 +85,57 @@ TAO_Notify_Lanes_Supplier::run (ACE_ENV_SINGLE_ARG_DECL) } // repeat for the next consumer at the next priority. // Disconnect from the EC - this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); + this->disconnect (); // Deactivate this object. - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (); // we're done. shutdown the ORB to exit the process. this->orb_objects_.orb_->shutdown (1); } void -TAO_Notify_Lanes_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Supplier::connect (void) { // Activate the supplier object. - CosNotifyComm::StructuredPushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyComm::StructuredPushSupplier_var objref = this->_this (); // Obtain the proxy. CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = this->admin_->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT , proxy_consumer_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); // connect to the proxyconsumer. proxy_consumer_->connect_structured_push_supplier (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Lanes_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Supplier::disconnect (void) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); + this->proxy_consumer_->disconnect_structured_push_consumer(); } void -TAO_Notify_Lanes_Supplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Supplier::deactivate (void) { - PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; + PortableServer::POA_var poa (this->_default_POA ()); PortableServer::ObjectId_var id (poa->servant_to_id (this ACE_ENV_ARG_PARAMETER)); - ACE_CHECK; poa->deactivate_object (id.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -172,14 +163,13 @@ TAO_Notify_Lanes_Supplier::send_event (const CosNotification::StructuredEvent& e ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (); } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h index db4a8f816cd..6930c1592a8 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h @@ -39,20 +39,20 @@ class TAO_Notify_Lanes_Supplier void init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int count ACE_ENV_ARG_DECL); /// Run - void run (ACE_ENV_SINGLE_ARG_DECL); + void run (void); protected: // = Protected Methods /// Connect the Supplier to the EventChannel. /// Creates a new proxy consumer and connects to it. - void connect (ACE_ENV_SINGLE_ARG_DECL); + void connect (void); /// Disconnect the supplier. - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); /// Deactivate. - void deactivate (ACE_ENV_SINGLE_ARG_DECL); + void deactivate (void); /// Send one event. virtual void send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL); @@ -72,7 +72,7 @@ protected: )); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect_structured_push_supplier (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index 2acb6bcc18b..5fd38a1da4c 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -61,24 +61,20 @@ TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[]) } void -TAO_Notify_Lanes_Supplier_Client::initialize (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Supplier_Client::initialize (void) { PortableServer::POAManager_var poa_manager = - this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_objects_.root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa_manager->activate (); - CosNotifyChannelAdmin::EventChannel_var ec = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyChannelAdmin::EventChannel_var ec = this->create_ec (); // Create a Supplier Admin CosNotifyChannelAdmin::AdminID adminid = 0; CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin = ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin.in ())); @@ -90,12 +86,11 @@ TAO_Notify_Lanes_Supplier_Client::initialize (ACE_ENV_SINGLE_ARG_DECL) } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_Lanes_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Supplier_Client::create_ec (void) { CosNotifyChannelAdmin::EventChannel_var ec; - CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (ec._retn ()); + CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (); // Create an EventChannel CosNotification::QoSProperties qos; @@ -108,7 +103,6 @@ TAO_Notify_Lanes_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL) admin, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ec._retn ()); // Set the Qos : 2 Lanes NotifyExt::ThreadPoolLanesParams tpl_params; @@ -149,26 +143,23 @@ TAO_Notify_Lanes_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL) // Note that instead of <set_qos>, the <qos> can also be passed while creating the channel. ec->set_qos (qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ec._retn ()); return ec._retn (); } void -TAO_Notify_Lanes_Supplier_Client::run (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Supplier_Client::run (void) { /// First, signal that the supplier is ready. - this->write_ior (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->write_ior (); - this->supplier_->run (ACE_ENV_SINGLE_ARG_PARAMETER); + this->supplier_->run (); } void -TAO_Notify_Lanes_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lanes_Supplier_Client::write_ior (void) { - CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this (); // Write the ior to a file to signal waiting consumers. FILE *ior_output_file = ACE_OS::fopen (this->ior_file_name_.c_str (), ACE_TEXT("w")); @@ -177,7 +168,6 @@ TAO_Notify_Lanes_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL) { CORBA::String_var str = this->orb_objects_.orb_->object_to_string (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_OS::fprintf (ior_output_file, "%s", @@ -192,13 +182,10 @@ TAO_Notify_Lanes_Supplier_Client::svc (void) ACE_TRY_NEW_ENV { this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->initialize (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client - ACE_TRY_CHECK; + this->initialize (); //Init the Client - this->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->run (); } ACE_CATCHANY { @@ -221,13 +208,11 @@ main (int argc, char *argv []) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create a holder for the common ORB Objects. TAO_Notify_ORB_Objects orb_objects; orb_objects.init (orb ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; /* Run the ORB in a seperate thread */ TAO_Notify_ORB_Run_Task orb_run_task (orb_objects); diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h index 7dd4eb19259..9761d77481a 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h @@ -36,10 +36,10 @@ public: ~TAO_Notify_Lanes_Supplier_Client (); /// Init - void initialize (ACE_ENV_SINGLE_ARG_DECL); + void initialize (void); /// Run - void run (ACE_ENV_SINGLE_ARG_DECL); + void run (void); /// Parse Args int parse_args (int argc, char *argv[]); @@ -49,10 +49,10 @@ public: protected: /// Create an EC - CosNotifyChannelAdmin::EventChannel_ptr create_ec (ACE_ENV_SINGLE_ARG_DECL); + CosNotifyChannelAdmin::EventChannel_ptr create_ec (void); /// Write ior to file. - void write_ior (ACE_ENV_SINGLE_ARG_DECL); + void write_ior (void); /// ORB Objects. TAO_Notify_ORB_Objects orb_objects_; diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index a7a0e96183f..b677c11d0db 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -34,28 +34,19 @@ void Subscribe::init (int argc, char *argv [] ACE_ENV_ARG_DECL) { init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + resolve_naming_service (); + resolve_Notify_factory (); + create_EC (); + create_supplieradmin (); + create_consumeradmin (); + create_consumers (); + create_suppliers (); } void -Subscribe::run (ACE_ENV_SINGLE_ARG_DECL) +Subscribe::run (void) { - this->send_events (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->send_events (); if (g_result_count != EVENT_COUNT) // if we still need to wait for events, run the orb. { // if we still need to wait for events, run the orb. @@ -80,12 +71,10 @@ Subscribe::init_ORB (int argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_ptr poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (poa_object)) { @@ -95,23 +84,19 @@ Subscribe::init_ORB (int argc, } this->root_poa_ = PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa_manager->activate (); } void -Subscribe::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) +Subscribe::resolve_naming_service (void) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Need to check return value for errors. if (CORBA::is_nil (naming_obj.in ())) @@ -119,11 +104,10 @@ Subscribe::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Subscribe::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL) +Subscribe::resolve_Notify_factory (void) { CosNaming::Name name (1); name.length (1); @@ -132,16 +116,14 @@ Subscribe::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->notify_factory_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Subscribe::create_EC (ACE_ENV_SINGLE_ARG_DECL) +Subscribe::create_EC (void) { CosNotifyChannelAdmin::ChannelID id; @@ -149,65 +131,58 @@ Subscribe::create_EC (ACE_ENV_SINGLE_ARG_DECL) initial_admin_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -Subscribe::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL) +Subscribe::create_supplieradmin (void) { CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); } void -Subscribe:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL) +Subscribe:: create_consumeradmin (void) { CosNotifyChannelAdmin::AdminID adminid; consumer_admin_ = ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); } void -Subscribe::create_consumers (ACE_ENV_SINGLE_ARG_DECL) +Subscribe::create_consumers (void) { consumer_1_ = new Subscribe_StructuredPushConsumer (this); consumer_1_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; consumer_2_ = new Subscribe_StructuredPushConsumer (this); consumer_2_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Subscribe::create_suppliers (ACE_ENV_SINGLE_ARG_DECL) +Subscribe::create_suppliers (void) { supplier_1_ = new Subscribe_StructuredPushSupplier (); supplier_1_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_2_ = new Subscribe_StructuredPushSupplier (); supplier_2_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL) +Subscribe::send_events (void) { // Setup the CA to receive event_type : "domain_A", "Type_a" CosNotification::EventTypeSeq added(1); @@ -218,7 +193,6 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL) added[0].type_name = CORBA::string_dup (TYPE_A); this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Setup the Consumer 1 to receive event_type : "domain_B", "Type_b" CosNotification::EventTypeSeq added_1(1); @@ -231,7 +205,6 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL) this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Setup the Consumer 2 to receive event_type : "domain_C", "Type_c" CosNotification::EventTypeSeq added_2(1); @@ -244,7 +217,6 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL) this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Create the events - one of each type // Event 1 @@ -284,11 +256,8 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL) for (int i = 0; i < 1; ++i) { supplier_1_->send_event (event1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_1_->send_event (event2 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; supplier_1_->send_event (event3 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -309,12 +278,10 @@ Subscribe_StructuredPushConsumer::connect { // Activate the consumer with the default_POA_ CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); @@ -322,21 +289,18 @@ Subscribe_StructuredPushConsumer::connect this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); proxy_supplier_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Subscribe_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) +Subscribe_StructuredPushConsumer::disconnect (void) { this->proxy_supplier_-> - disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + disconnect_structured_push_supplier(); } void @@ -376,7 +340,7 @@ Subscribe_StructuredPushConsumer::push_structured_event void Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer - (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -406,33 +370,29 @@ Subscribe_StructuredPushSupplier::connect ACE_ENV_ARG_DECL) { CosNotifyComm::StructuredPushSupplier_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); proxy_consumer_->connect_structured_push_supplier (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Subscribe_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) +Subscribe_StructuredPushSupplier::disconnect (void) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); + this->proxy_consumer_->disconnect_structured_push_consumer(); } void @@ -456,12 +416,11 @@ Subscribe_StructuredPushSupplier::send_event ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier - (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + (void) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index 126b842a4ca..7fd58ae9b1d 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -38,7 +38,7 @@ class Subscribe void init (int argc, char *argv [] ACE_ENV_ARG_DECL); // Init the Client. - void run (ACE_ENV_SINGLE_ARG_DECL); + void run (void); // Run the demo. void done (void); @@ -48,28 +48,28 @@ class Subscribe void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); + void resolve_naming_service (void); // Try to get hold of a running naming service. - void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL); + void resolve_Notify_factory (void); // Try to resolve the Notify factory from the Naming service. - void create_EC (ACE_ENV_SINGLE_ARG_DECL); + void create_EC (void); // Create an EC. - void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL); + void create_supplieradmin(void); // Create the Supplier Admin. - void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL); + void create_consumeradmin (void); // Create the Consumer Admin. - void create_consumers (ACE_ENV_SINGLE_ARG_DECL); + void create_consumers (void); // Create and initialize the consumers. - void create_suppliers (ACE_ENV_SINGLE_ARG_DECL); + void create_suppliers (void); // create and initialize the suppliers. - void send_events (ACE_ENV_SINGLE_ARG_DECL); + void send_events (void); // send the events. // = Data Members @@ -133,7 +133,7 @@ class Subscribe_StructuredPushConsumer // Connect the Consumer to the EventChannel. // Creates a new proxy supplier and connects to it. - virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL); + virtual void disconnect (void); // Disconnect from the supplier. CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void); @@ -204,7 +204,7 @@ class Subscribe_StructuredPushSupplier // Connect the Supplier to the EventChannel. // Creates a new proxy consumer and connects to it. - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); // Disconnect from the supplier. virtual void send_event (const CosNotification::StructuredEvent& event diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp index b817728c231..18d86e4232a 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp @@ -12,10 +12,8 @@ main (int argc, char *argv []) { client.init (argc, argv ACE_ENV_ARG_PARAMETER); //Init the Client - ACE_TRY_CHECK; - client.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + client.run (); } ACE_CATCH (CORBA::UserException, ue) { diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp index 3f8b943dba2..489f6aabb9e 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp @@ -39,27 +39,26 @@ TAO_Notify_ThreadPool_Consumer::init (PortableServer::POA_var& poa, CosNotifyCha ACE_DEBUG ((LM_DEBUG, "(%P, %t)Consumer Delay = %d, param = %d\n", delay_.sec (), delay)); - this->connect (ACE_ENV_SINGLE_ARG_PARAMETER); + this->connect (); } PortableServer::POA_ptr -TAO_Notify_ThreadPool_Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_ThreadPool_Consumer::_default_POA (void) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_Notify_ThreadPool_Consumer::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_ThreadPool_Consumer::run (void) { // Nothing to do. } void -TAO_Notify_ThreadPool_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Consumer::connect (void) { // Activate the consumer with the default_POA_ - CosNotifyComm::StructuredPushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyComm::StructuredPushConsumer_var objref = this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier; @@ -67,7 +66,6 @@ TAO_Notify_ThreadPool_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL) { // Narrow to the extended interface. NotifyExt::ConsumerAdmin_var admin_ext = NotifyExt::ConsumerAdmin::_narrow (this->admin_.in ()ACE_ENV_ARG_PARAMETER); - ACE_CHECK; NotifyExt::ThreadPoolParams tp_params = { NotifyExt::CLIENT_PROPAGATED, 0, 0, this->proxy_supplier_thread_count_, 0, 0, 0, 0, 0 }; @@ -80,13 +78,11 @@ TAO_Notify_ThreadPool_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL) // Obtain the proxy. The QoS is applied to the POA in which the Proxy is hosted. proxysupplier = admin_ext->obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::STRUCTURED_EVENT , proxy_supplier_id_, qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { proxysupplier = this->admin_->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT , proxy_supplier_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); @@ -94,13 +90,11 @@ TAO_Notify_ThreadPool_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL) // narrow this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); this->proxy_supplier_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Call subscription_change to inform the supplier that this consumer is available. CosNotification::EventTypeSeq added (1); @@ -116,17 +110,15 @@ TAO_Notify_ThreadPool_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL) added[0].type_name = CORBA::string_dup (type); this->proxy_supplier_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P,%t) Created Consumer %d with %d threads at the ProxySupplier\n", proxy_supplier_id_, this->proxy_supplier_thread_count_)); } void -TAO_Notify_ThreadPool_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Consumer::disconnect (void) { - this->proxy_supplier_->disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->proxy_supplier_->disconnect_structured_push_supplier(); } void @@ -167,12 +159,10 @@ TAO_Notify_ThreadPool_Consumer::push_structured_event (const CosNotification::St this->t_last_ = ACE_OS::gethrtime (); // Disconnect from the EC - this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->disconnect (); // Deactivate this object. - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->deactivate (); // We received the event, shutdown the ORB. this->orb_objects_.orb_->shutdown (1); @@ -195,25 +185,22 @@ TAO_Notify_ThreadPool_Consumer::dump_throughput (void) } void -TAO_Notify_ThreadPool_Consumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Consumer::deactivate (void) { - PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; + PortableServer::POA_var poa (this->_default_POA ()); PortableServer::ObjectId_var id (poa->servant_to_id (this ACE_ENV_ARG_PARAMETER)); - ACE_CHECK; poa->deactivate_object (id.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (); } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h index 0af5b74d5fa..ee5620f4aae 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h @@ -39,7 +39,7 @@ public: void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, int proxy_supplier_thread_count, int max_events, long delay ACE_ENV_ARG_DECL); /// Run - void run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + void run (void); /// Print the consumer throughput void dump_throughput (void); @@ -51,16 +51,16 @@ protected: /// Connect the Consumer to the EventChannel. /// Creates a new proxy supplier and connects to it. - void connect (ACE_ENV_SINGLE_ARG_DECL); + void connect (void); /// Disconnect the supplier. - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); /// Deactivate. - void deactivate (ACE_ENV_SINGLE_ARG_DECL); + void deactivate (void); // = ServantBase operations - virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (void); // = NotifyPublish method virtual void offer_change ( diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index 480dbb5005c..d97ec85e0c5 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -62,29 +62,24 @@ TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, char *argv[]) } void -TAO_Notify_ThreadPool_Consumer_Client::_init (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Consumer_Client::_init (void) { PortableServer::POAManager_var poa_manager = - this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_objects_.root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa_manager->activate (); // Resolve the Notification Factory. - CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (); // Find the EventChannel created by the supplier. - CosNotifyChannelAdmin::ChannelIDSeq_var channel_seq = ecf->get_all_channels (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyChannelAdmin::ChannelIDSeq_var channel_seq = ecf->get_all_channels (); CosNotifyChannelAdmin::EventChannel_var ec; if (channel_seq->length() > 0) { ec = ecf->get_event_channel (channel_seq[0] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { @@ -97,12 +92,10 @@ TAO_Notify_ThreadPool_Consumer_Client::_init (ACE_ENV_SINGLE_ARG_DECL) CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin = ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin.in ())); - PortableServer::POA_var rt_poa = this->create_rt_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + PortableServer::POA_var rt_poa = this->create_rt_poa (); // Create a Consumer this->consumer_ = new TAO_Notify_ThreadPool_Consumer (this->orb_objects_); @@ -112,7 +105,7 @@ TAO_Notify_ThreadPool_Consumer_Client::_init (ACE_ENV_SINGLE_ARG_DECL) } PortableServer::POA_ptr -TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (void) { PortableServer::POA_var rt_poa; @@ -122,14 +115,12 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL) CORBA::Policy_var activation_policy = this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (rt_poa._retn ()); // Create a priority model policy. priority_model_policy = this->orb_objects_.rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED , 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (rt_poa._retn ()); CORBA::ULong stacksize = 0; CORBA::ULong static_threads = 1; @@ -149,12 +140,10 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL) max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (rt_poa._retn ()); thread_pool_policy = this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (rt_poa._retn ()); CORBA::PolicyList poa_policy_list; @@ -164,22 +153,20 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL) poa_policy_list[2] = thread_pool_policy; PortableServer::POAManager_var poa_manager = - this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (rt_poa._retn ()); + this->orb_objects_.root_poa_->the_POAManager (); rt_poa = this->orb_objects_.root_poa_->create_POA ("RT POA!", poa_manager.in (), poa_policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (rt_poa._retn ()); return rt_poa._retn (); } void -TAO_Notify_ThreadPool_Consumer_Client::run (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Consumer_Client::run (void) { - this->consumer_->run (ACE_ENV_SINGLE_ARG_PARAMETER); + this->consumer_->run (); } void @@ -195,13 +182,10 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void) { // Initialize this threads priority. this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->_init (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client - ACE_TRY_CHECK; + this->_init (); //Init the Client - this->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->run (); } ACE_CATCHANY { @@ -224,12 +208,10 @@ main (int argc, char *argv []) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_Notify_ORB_Objects orb_objects; orb_objects.init (orb ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; TAO_Notify_ORB_Run_Task orb_run_task (orb_objects); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h index 158c1005daa..2967b227fcf 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h @@ -39,10 +39,10 @@ public: ~TAO_Notify_ThreadPool_Consumer_Client (); /// Init - void _init (ACE_ENV_SINGLE_ARG_DECL); + void _init (void); /// Run - void run (ACE_ENV_SINGLE_ARG_DECL); + void run (void); /// Parse Args int parse_args (int argc, char *argv[]); @@ -55,7 +55,7 @@ public: protected: /// Create an RT POA with a single threadpool. - PortableServer::POA_ptr create_rt_poa (ACE_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr create_rt_poa (void); /// ORB Objects. TAO_Notify_ORB_Objects orb_objects_; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp index b26b9dbb0ec..9790bf16f98 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp @@ -15,36 +15,28 @@ TAO_Notify_ORB_Objects::init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL) CORBA::Object_var object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->root_poa_ = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Resolve the RTORB. object = this->orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Resolve the Current object = this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->current_ = RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Resolve the Naming service object = this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->naming_ = CosNaming::NamingContextExt::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects () @@ -52,7 +44,7 @@ TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects () } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ORB_Objects::notify_factory (void) { CosNotifyChannelAdmin::EventChannelFactory_var ecf; @@ -62,10 +54,8 @@ TAO_Notify_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL) name[0].id = CORBA::string_dup ("NotifyEventChannelFactory"); CORBA::Object_var object = this->naming_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ecf._retn ()); ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ecf._retn ()); return ecf._retn (); } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h index 7ca6ab99442..a95318ae05c 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h @@ -37,7 +37,7 @@ public: void init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL); /// Resolve Notification - CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (ACE_ENV_SINGLE_ARG_DECL); + CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void); ///= Public Data CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp index 953328f78c5..2477f15457a 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp @@ -19,10 +19,8 @@ TAO_Notify_ORB_Run_Task::svc (void) ACE_TRY_NEW_ENV { this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->orb_objects_.orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_objects_.orb_->run (); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp index bb29cbd1af7..1985911cc5e 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp @@ -31,11 +31,11 @@ TAO_Notify_ThreadPool_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& this->max_events_ = max_events; this->proxy_consumer_thread_count_ = proxy_consumer_thread_count; - this->connect (ACE_ENV_SINGLE_ARG_PARAMETER); + this->connect (); } void -TAO_Notify_ThreadPool_Supplier::run (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Supplier::run (void) { { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); @@ -61,21 +61,20 @@ TAO_Notify_ThreadPool_Supplier::run (ACE_ENV_SINGLE_ARG_DECL) } // Disconnect from the EC - this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); + this->disconnect (); // Deactivate this object. - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (); // we're done. shutdown the ORB to exit the process. this->orb_objects_.orb_->shutdown (1); } void -TAO_Notify_ThreadPool_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Supplier::connect (void) { // Activate the supplier object. - CosNotifyComm::StructuredPushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyComm::StructuredPushSupplier_var objref = this->_this (); CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer; @@ -83,7 +82,6 @@ TAO_Notify_ThreadPool_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL) { // Narrow to the extended interface. NotifyExt::SupplierAdmin_var admin_ext = NotifyExt::SupplierAdmin::_narrow (this->admin_.in ()ACE_ENV_ARG_PARAMETER); - ACE_CHECK; NotifyExt::ThreadPoolParams tp_params = { NotifyExt::CLIENT_PROPAGATED, 0, 0, this->proxy_consumer_thread_count_, 0, 0, 0, 0, 0 }; @@ -96,14 +94,12 @@ TAO_Notify_ThreadPool_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL) // Obtain the proxy. The QoS is applied to the POA in which the Proxy is hosted. proxyconsumer = admin_ext->obtain_notification_push_consumer_with_qos (CosNotifyChannelAdmin::STRUCTURED_EVENT , proxy_consumer_id_, qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { // Obtain the proxy. proxyconsumer = this->admin_->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT , proxy_consumer_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); @@ -111,40 +107,35 @@ TAO_Notify_ThreadPool_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL) // narrow this->proxy_consumer_ = CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); // connect to the proxyconsumer. proxy_consumer_->connect_structured_push_supplier (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P,%t) Created Supplier %d with %d threads at the ProxyConsumer\n", proxy_consumer_id_, this->proxy_consumer_thread_count_)); } void -TAO_Notify_ThreadPool_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Supplier::disconnect (void) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); + this->proxy_consumer_->disconnect_structured_push_consumer(); } void -TAO_Notify_ThreadPool_Supplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Supplier::deactivate (void) { - PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; + PortableServer::POA_var poa (this->_default_POA ()); PortableServer::ObjectId_var id (poa->servant_to_id (this ACE_ENV_ARG_PARAMETER)); - ACE_CHECK; poa->deactivate_object (id.in() ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -181,14 +172,13 @@ TAO_Notify_ThreadPool_Supplier::send_event (const CosNotification::StructuredEve ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (); } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h index e5238d0af7e..70fbadc6b83 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h @@ -41,20 +41,20 @@ public: int proxy_consumer_thread_count ACE_ENV_ARG_DECL); /// Run - void run (ACE_ENV_SINGLE_ARG_DECL); + void run (void); protected: // = Protected Methods /// Connect the Supplier to the EventChannel. /// Creates a new proxy consumer and connects to it. - void connect (ACE_ENV_SINGLE_ARG_DECL); + void connect (void); /// Disconnect the supplier. - void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void disconnect (void); /// Deactivate. - void deactivate (ACE_ENV_SINGLE_ARG_DECL); + void deactivate (void); /// Send one event. virtual void send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL); @@ -74,7 +74,7 @@ protected: )); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect_structured_push_supplier (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index fb8dcf0c8ad..77d7f498645 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -80,24 +80,20 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[]) } void -TAO_Notify_ThreadPool_Supplier_Client::_init (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Supplier_Client::_init (void) { PortableServer::POAManager_var poa_manager = - this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_objects_.root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + poa_manager->activate (); - CosNotifyChannelAdmin::EventChannel_var ec = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyChannelAdmin::EventChannel_var ec = this->create_ec (); // Create a Supplier Admin CosNotifyChannelAdmin::AdminID adminid = 0; CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin = ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin.in ())); @@ -110,12 +106,11 @@ TAO_Notify_ThreadPool_Supplier_Client::_init (ACE_ENV_SINGLE_ARG_DECL) } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_ThreadPool_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Supplier_Client::create_ec (void) { CosNotifyChannelAdmin::EventChannel_var ec; - CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (ec._retn ()); + CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (); // Create an EventChannel CosNotification::QoSProperties qos; @@ -128,7 +123,6 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL) admin, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ec._retn ()); // Set the Qos // See $TAO_ROOT/orbsvcs/orbsvcs/NotifyExt.idl @@ -144,7 +138,6 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL) // Note that instead of <set_qos>, the <qos> can also be passed while creating the channel. ec->set_qos (qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ec._retn ()); } ACE_DEBUG ((LM_DEBUG, "(%P,%t) Created Event Channel with %d threads\n", this->ec_thread_count_)); @@ -153,20 +146,18 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_ThreadPool_Supplier_Client::run (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Supplier_Client::run (void) { /// First, signal that the supplier is ready. - this->write_ior (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->write_ior (); - this->supplier_->run (ACE_ENV_SINGLE_ARG_PARAMETER); + this->supplier_->run (); } void -TAO_Notify_ThreadPool_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_ThreadPool_Supplier_Client::write_ior (void) { - CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this (); // Write the ior to a file to signal waiting consumers. FILE *ior_output_file = ACE_OS::fopen (this->ior_file_name_.c_str (), ACE_TEXT("w")); @@ -175,7 +166,6 @@ TAO_Notify_ThreadPool_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL) { CORBA::String_var str = this->orb_objects_.orb_->object_to_string (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_OS::fprintf (ior_output_file, "%s", @@ -190,13 +180,10 @@ TAO_Notify_ThreadPool_Supplier_Client::svc (void) ACE_TRY_NEW_ENV { this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->_init (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client - ACE_TRY_CHECK; + this->_init (); //Init the Client - this->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->run (); } ACE_CATCHANY { @@ -219,13 +206,11 @@ main (int argc, char *argv []) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create a holder for the common ORB Objects. TAO_Notify_ORB_Objects orb_objects; orb_objects.init (orb ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; /* Run the ORB in a seperate thread */ TAO_Notify_ORB_Run_Task orb_run_task (orb_objects); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h index b54786ea808..be8f97fc337 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h @@ -35,10 +35,10 @@ public: ~TAO_Notify_ThreadPool_Supplier_Client (); /// Init - void _init (ACE_ENV_SINGLE_ARG_DECL); + void _init (void); /// Run - void run (ACE_ENV_SINGLE_ARG_DECL); + void run (void); /// Parse Args int parse_args (int argc, char *argv[]); @@ -48,10 +48,10 @@ public: protected: /// Create an EC - CosNotifyChannelAdmin::EventChannel_ptr create_ec (ACE_ENV_SINGLE_ARG_DECL); + CosNotifyChannelAdmin::EventChannel_ptr create_ec (void); /// Write ior to file. - void write_ior (ACE_ENV_SINGLE_ARG_DECL); + void write_ior (void); /// ORB Objects. TAO_Notify_ORB_Objects orb_objects_; |