diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp | 140 |
1 files changed, 51 insertions, 89 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index 66c4a913cdd..aa0da5850e8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -76,7 +76,7 @@ TAO_CEC_TypedEventChannel::~TAO_CEC_TypedEventChannel (void) } void -TAO_CEC_TypedEventChannel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_TypedEventChannel::activate (void) { this->dispatching_->activate (); this->consumer_control_->activate (); @@ -101,49 +101,38 @@ namespace } void -TAO_CEC_TypedEventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedEventChannel::shutdown (void) { this->dispatching_->shutdown (); this->supplier_control_->shutdown (); this->consumer_control_->shutdown (); PortableServer::POA_var typed_consumer_poa = - this->typed_consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->typed_consumer_admin_->_default_POA (); PortableServer::ObjectId_var typed_consumer_id = - typed_consumer_poa->servant_to_id (this->typed_consumer_admin_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - typed_consumer_poa->deactivate_object (typed_consumer_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + typed_consumer_poa->servant_to_id (this->typed_consumer_admin_); + typed_consumer_poa->deactivate_object (typed_consumer_id.in ()); PortableServer::POA_var typed_supplier_poa = - this->typed_supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->typed_supplier_admin_->_default_POA (); PortableServer::ObjectId_var typed_supplier_id = - typed_supplier_poa->servant_to_id (this->typed_supplier_admin_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - typed_supplier_poa->deactivate_object (typed_supplier_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + typed_supplier_poa->servant_to_id (this->typed_supplier_admin_); + typed_supplier_poa->deactivate_object (typed_supplier_id.in ()); - this->typed_supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->typed_supplier_admin_->shutdown (); - this->typed_consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->typed_consumer_admin_->shutdown (); if (destroy_on_shutdown_) { // Deactivate the Typed EC PortableServer::POA_var t_poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_default_POA (); PortableServer::ObjectId_var t_id = - t_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + t_poa->servant_to_id (this); - t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + t_poa->deactivate_object (t_id.in ()); ACE_Event_Handler *timer; ACE_NEW (timer, ShutdownHandler (this->orb_.in ())); @@ -153,51 +142,39 @@ TAO_CEC_TypedEventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_TypedEventChannel::connected (TAO_CEC_TypedProxyPushConsumer* consumer - ACE_ENV_ARG_DECL) +TAO_CEC_TypedEventChannel::connected (TAO_CEC_TypedProxyPushConsumer* consumer) { - this->typed_supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->typed_supplier_admin_->connected (consumer); } void -TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_TypedProxyPushConsumer* consumer - ACE_ENV_ARG_DECL) +TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_TypedProxyPushConsumer* consumer) { - this->typed_supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->typed_supplier_admin_->reconnected (consumer); } void -TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_TypedProxyPushConsumer* consumer - ACE_ENV_ARG_DECL) +TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_TypedProxyPushConsumer* consumer) { - this->typed_supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->typed_supplier_admin_->disconnected (consumer); } void -TAO_CEC_TypedEventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier - ACE_ENV_ARG_DECL) +TAO_CEC_TypedEventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier) { - this->typed_consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->typed_consumer_admin_->connected (supplier); } void -TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier - ACE_ENV_ARG_DECL) +TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier) { - this->typed_consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->typed_consumer_admin_->reconnected (supplier); } void -TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier - ACE_ENV_ARG_DECL) +TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier) { - this->typed_consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->typed_consumer_admin_->disconnected (supplier); } // Find from the ifr cache the operation and return the parameter array pointer. @@ -271,20 +248,17 @@ TAO_CEC_TypedEventChannel::clear_ifr_cache (void) // All the operations and their parameters are then inserted in the ifr cache. // Function returns 0 if successful or -1 on a failure. int -TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_ - ACE_ENV_ARG_DECL) +TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_) { - ACE_TRY + try { // Lookup the Interface Name in the IFR CORBA::Contained_var contained = - this->interface_repository_->lookup_id (interface_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->interface_repository_->lookup_id (interface_); // Narrow the interface CORBA::InterfaceDef_var interface = - CORBA::InterfaceDef::_narrow (contained.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::InterfaceDef::_narrow (contained.in ()); if (CORBA::is_nil (interface.in () )) { @@ -300,8 +274,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_ { // Obtain the full interface description CORBA::InterfaceDef::FullInterfaceDescription_var fid = - interface->describe_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + interface->describe_interface (); // Obtain the base interfaces this->base_interfaces_ = fid->base_interfaces; @@ -378,24 +351,24 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_ } } } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { if (TAO_debug_level >= 4) { - ACE_PRINT_EXCEPTION (sysex, "during TAO_CEC_TypedEventChannel::cache_interface_description"); + sysex._tao_print_exception ( + "during TAO_CEC_TypedEventChannel::cache_interface_description"); } return -1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { if (TAO_debug_level >= 4) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "ACE_ANY_EXCEPTION raised during TAO_CEC_TypedEventChannel::cache_interface_description"); + ex._tao_print_exception ( + "ex raised during TAO_CEC_TypedEventChannel::cache_interface_description"); } return -1; } - ACE_ENDTRY; return 0; } @@ -408,8 +381,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_ // If neither a consumer nor a supplier has registered an interface, // the function calls cache_interface_description and returns 0 if successful. int -TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_interface - ACE_ENV_ARG_DECL) +TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_interface) { // Check if a consumer has already registered an interface with the typed EC if (this->uses_interface_.length() > 0) @@ -452,8 +424,7 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int else { // Neither a consumer nor a supplier has connected yet - int result = cache_interface_description (uses_interface ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + int result = cache_interface_description (uses_interface); if (result == 0) { @@ -472,8 +443,7 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int // If neither a consumer nor a supplier has registered an interface, // the function calls cache_interface_description and returns 0 if successful. int -TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *supported_interface - ACE_ENV_ARG_DECL) +TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *supported_interface) { // Check if a supplier has already registered an interface with the typed EC if (this->supported_interface_.length() > 0) @@ -516,8 +486,7 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su else { // Neither a consumer nor a supplier has connected yet - int result = cache_interface_description (supported_interface ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + int result = cache_interface_description (supported_interface); if (result == 0) { @@ -530,11 +499,9 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su // Function creates a NVList and populates it from the parameter information. void TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper_params, - CORBA::NVList_out new_list - ACE_ENV_ARG_DECL) + CORBA::NVList_out new_list) { - this->orb_->create_list (0, new_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->orb_->create_list (0, new_list); for (CORBA::ULong param=0; param<oper_params->num_params_; param++) { @@ -544,46 +511,41 @@ TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper new_list->add_value (oper_params->parameters_[param].name_. in (), any_1, - oper_params->parameters_[param].direction_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + oper_params->parameters_[param].direction_); } } // Function creates an empty NVList. void TAO_CEC_TypedEventChannel::create_list (CORBA::Long count, - CORBA::NVList_out new_list - ACE_ENV_ARG_DECL) + CORBA::NVList_out new_list) { - this->orb_->create_list (count, new_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->orb_->create_list (count, new_list); } // The CosTypedEventChannelAdmin::TypedEventChannel methods... CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr -TAO_CEC_TypedEventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedEventChannel::for_consumers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->typed_consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->typed_consumer_admin_->_this (); } CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr -TAO_CEC_TypedEventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedEventChannel::for_suppliers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->typed_supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->typed_supplier_admin_->_this (); } void -TAO_CEC_TypedEventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_CEC_TypedEventChannel::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!destroyed_) { destroyed_ = 1; - this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->shutdown (); } } |