diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Log')
44 files changed, 409 insertions, 795 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index b8704fe0988..5353a4cb052 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -21,29 +21,24 @@ TAO_BasicLogFactory_i::activate (CORBA::ORB_ptr orb, ACE_ENV_ARG_DECL) { TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ()); PortableServer::ObjectId_var oid = this->factory_poa_->activate_object (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ()); CORBA::Object_var obj = this->factory_poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ()); // narrow and store the result.. this->log_mgr_ = DsLogAdmin::LogMgr::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ()); DsLogAdmin::BasicLogFactory_var v_return = DsLogAdmin::BasicLogFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ()); return v_return._retn (); } @@ -62,17 +57,14 @@ TAO_BasicLogFactory_i::create (DsLogAdmin::LogFullActionType full_action, 0, id_out ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ()); DsLogAdmin::LogId id = id_out; #if (TAO_HAS_MINIMUM_POA == 0) DsLogAdmin::Log_var log = this->create_log_reference (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ()); #else DsLogAdmin::Log_var log = this->create_log_object (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ()); #endif // narrow to BasicLog @@ -98,16 +90,13 @@ TAO_BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id, max_size, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ()); #if (TAO_HAS_MINIMUM_POA == 0) DsLogAdmin::Log_var log = this->create_log_reference (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ()); #else DsLogAdmin::Log_var log = this->create_log_object (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ()); #endif // narrow to BasicLog @@ -136,10 +125,8 @@ TAO_BasicLogFactory_i::create_log_servant (DsLogAdmin::LogId id this->log_mgr_.in (), id), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); - basic_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + basic_log_i->init (); return basic_log_i; } diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index fa4c1f0af22..e76571c0c1d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -32,17 +32,14 @@ TAO_BasicLog_i::copy (DsLogAdmin::LogId &id DsLogAdmin::BasicLogFactory_var basicLogFactory = DsLogAdmin::BasicLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); DsLogAdmin::BasicLog_var log = basicLogFactory->create (DsLogAdmin::halt, 0, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); // Copy the attributes from the log. this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); return log._retn (); @@ -55,39 +52,33 @@ TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL) DsLogAdmin::BasicLogFactory_var basicLogFactory = DsLogAdmin::BasicLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); DsLogAdmin::BasicLog_var log = basicLogFactory->create_with_id (id, DsLogAdmin::halt, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); // Copy the attributes from the log. this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); return log._retn (); } void -TAO_BasicLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_BasicLog_i::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove ourselves from the list of logs. this->logmgr_i_.remove (this->logid_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Deregister with POA. PortableServer::ObjectId_var id = this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->poa_->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index e1a51484192..df98a3dcc26 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -72,7 +72,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); /// Destroy the log object and all contained records. - void destroy (ACE_ENV_SINGLE_ARG_DECL) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp index 5e005ee70c6..f94861e8e70 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log) : log_ (log) -{ +{ } TAO_Event_LogConsumer::~TAO_Event_LogConsumer (void) @@ -63,11 +63,10 @@ ACE_THROW_SPEC (( // // I have submitted a defect report to the OMG for clarification. // --jtc - ACE_TRY + ACE_TRY { // log the RecordList. this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (DsLogAdmin::LogFull, ex) { @@ -89,12 +88,12 @@ ACE_THROW_SPEC (( } void -TAO_Event_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_Event_LogConsumer::disconnect_push_consumer (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h index fac7eb9bbb9..6ff0db91682 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h @@ -71,7 +71,7 @@ public: private: /// Disconnect from EventLog. - void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) + void disconnect_push_consumer (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp index 901af607cc1..a66770656f6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp @@ -18,18 +18,15 @@ TAO_EventLogFactory_i::TAO_EventLogFactory_i (void) ACE_TRY { PortableServer::POA_var defPOA = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->_default_POA (); TAO_CEC_EventChannel_Attributes attr (defPOA.in (), defPOA.in ()); ACE_NEW_THROW_EX (impl, TAO_CEC_EventChannel (attr), CORBA::NO_MEMORY ()); - ACE_TRY_CHECK; - impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + impl->activate (); } ACE_CATCHANY { @@ -38,7 +35,6 @@ TAO_EventLogFactory_i::TAO_EventLogFactory_i (void) "EventLogFactory_i constructor."); } ACE_ENDTRY; - ACE_CHECK; } TAO_EventLogFactory_i::~TAO_EventLogFactory_i (void) @@ -59,18 +55,15 @@ TAO_EventLogFactory_i::init (PortableServer::POA_ptr /* poa */ PortableServer::ObjectId_var oid = this->poa_->activate_object (ec.get () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CosEventChannelAdmin::EventChannel::_nil ()); ec.release (); CORBA::Object_var obj = this->poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CosEventChannelAdmin::EventChannel::_nil ()); ec_return = CosEventChannelAdmin::EventChannel::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CosEventChannelAdmin::EventChannel::_nil ()); return ec_return._retn (); } @@ -81,41 +74,33 @@ TAO_EventLogFactory_i::activate (CORBA::ORB_ptr orb, ACE_ENV_ARG_DECL) { TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ()); this->event_channel_ = init (this->poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ()); this->consumer_admin_ = - this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ()); + this->event_channel_->for_consumers (); ACE_NEW_THROW_EX (this->notifier_, TAO_EventLogNotification(this->event_channel_.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ()); PortableServer::ObjectId_var oid = this->factory_poa_->activate_object (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ()); CORBA::Object_var obj = this->factory_poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ()); // narrow and store the result.. this->log_mgr_ = DsLogAdmin::LogMgr::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ()); DsEventLogAdmin::EventLogFactory_var v_return = DsEventLogAdmin::EventLogFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ()); return v_return._retn (); } @@ -136,17 +121,14 @@ TAO_EventLogFactory_i::create ( & thresholds, id_out ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ()); DsLogAdmin::LogId id = id_out; #if (TAO_HAS_MINIMUM_POA == 0) DsLogAdmin::Log_var log = this->create_log_reference (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ()); #else DsLogAdmin::Log_var log = this->create_log_object (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ()); #endif // narrow to EventLog @@ -155,7 +137,6 @@ TAO_EventLogFactory_i::create ( // @@ JTC - squelch exception? notifier_->object_creation (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ()); return event_log._retn(); } @@ -177,16 +158,13 @@ TAO_EventLogFactory_i::create_with_id ( max_size, & thresholds ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ()); #if (TAO_HAS_MINIMUM_POA == 0) DsLogAdmin::Log_var log = this->create_log_reference (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ()); #else DsLogAdmin::Log_var log = this->create_log_object (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ()); #endif // narrow to EventLog @@ -195,7 +173,6 @@ TAO_EventLogFactory_i::create_with_id ( // @@ JTC - squelch exception? notifier_->object_creation (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ()); return event_log._retn (); } @@ -222,32 +199,29 @@ TAO_EventLogFactory_i::create_log_servant (DsLogAdmin::LogId id id ), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); - event_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + event_log_i->init (); //dhanvey //initialise the LogConsumer object - event_log_i->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + event_log_i->activate (); return event_log_i; } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_EventLogFactory_i::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_EventLogFactory_i::obtain_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer_admin_->obtain_push_supplier (); } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_EventLogFactory_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_EventLogFactory_i::obtain_pull_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return consumer_admin_->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer_admin_->obtain_pull_supplier (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp index 130274497d7..0c6f3a27609 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp @@ -21,16 +21,16 @@ TAO_EventLogNotification::~TAO_EventLogNotification (void) } void -TAO_EventLogNotification::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) +TAO_EventLogNotification::disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); + this->consumer_->disconnect_push_consumer (); } void TAO_EventLogNotification::obtain_proxy_consumer() -{ - CosEventChannelAdmin::SupplierAdmin_var supplier_admin = +{ + CosEventChannelAdmin::SupplierAdmin_var supplier_admin = event_channel_->for_suppliers (); consumer_ = supplier_admin->obtain_push_consumer (); @@ -42,7 +42,7 @@ TAO_EventLogNotification::obtain_proxy_consumer() } void -TAO_EventLogNotification::send_notification (const CORBA::Any& any +TAO_EventLogNotification::send_notification (const CORBA::Any& any ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h index 88306c2eac7..cfb54245804 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h @@ -56,7 +56,7 @@ public: ~TAO_EventLogNotification (void); /// The skeleton methods. - virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 6c6853cf891..bc0a85a9974 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -23,7 +23,7 @@ TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb, ACE_DECLARE_NEW_CORBA_ENV; // Create an instance of the event channel. - TAO_CEC_EventChannel_Attributes attr (this->poa_.in(), + TAO_CEC_EventChannel_Attributes attr (this->poa_.in(), this->poa_.in()); ACE_NEW_THROW_EX (this->event_channel_, @@ -47,15 +47,12 @@ ACE_THROW_SPEC ((CORBA::SystemException)) DsEventLogAdmin::EventLogFactory_var eventLogFactory = DsEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); DsEventLogAdmin::EventLog_var log = eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); return log._retn (); @@ -69,15 +66,12 @@ ACE_THROW_SPEC ((CORBA::SystemException)) DsEventLogAdmin::EventLogFactory_var eventLogFactory = DsEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); DsEventLogAdmin::EventLog_var log = eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); return log._retn (); @@ -85,55 +79,49 @@ ACE_THROW_SPEC ((CORBA::SystemException)) void -TAO_EventLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_EventLog_i::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Send event to indicate the log has been deleted. notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Remove ourselves from the list of logs. this->logmgr_i_.remove (this->logid_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Deregister with POA. PortableServer::ObjectId_var id = this->log_poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->log_poa_->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_EventLog_i::activate (ACE_ENV_SINGLE_ARG_DECL) +TAO_EventLog_i::activate (void) { CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->event_channel_->for_consumers (); // Create the PushConsumer that will log the events. this->my_log_consumer_ = new TAO_Event_LogConsumer (this); - ACE_CHECK; this->my_log_consumer_->connect (consumer_admin.in ()); } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_EventLog_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL) +TAO_EventLog_i::for_consumers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->for_consumers (); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_EventLog_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) +TAO_EventLog_i::for_suppliers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->for_suppliers (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h index 545591ad31a..43f5f543dbd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h @@ -82,22 +82,22 @@ public: /// Destroy the log object and all contained records. void - destroy (ACE_ENV_SINGLE_ARG_DECL) + destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Activate the EventLog. void - activate (ACE_ENV_SINGLE_ARG_DECL); + activate (void); // = The CosEventChannelAdmin::EventChannel interface methods. CosEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (ACE_ENV_SINGLE_ARG_DECL) + for_consumers (void) ACE_THROW_SPEC (( CORBA::SystemException )); CosEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (ACE_ENV_SINGLE_ARG_DECL) + for_suppliers (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp index 0cf09c84c7b..19eb6da3148 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp @@ -45,7 +45,6 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); if (position < current_position_) { @@ -60,7 +59,6 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position, // Use an Interpreter to build an expression tree. TAO_Log_Constraint_Interpreter interpreter (constraint_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); // Sequentially iterate over all the records and pick the ones that // meet the constraints. @@ -70,7 +68,6 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position, ACE_NEW_THROW_EX (rec_list, DsLogAdmin::RecordList (how_many), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); rec_list->length (how_many); CORBA::ULong count = 0; @@ -101,8 +98,7 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position, if (count == 0 && this->iter_ == this->iter_end_) { // destroy this object.. - this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (rec_list); + this->destroy (); } return rec_list; diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index aa90c47cea0..ecfeb356013 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -93,25 +93,25 @@ TAO_Hash_LogRecordStore::close (void) } CORBA::ULongLong -TAO_Hash_LogRecordStore::get_current_size (ACE_ENV_SINGLE_ARG_DECL) +TAO_Hash_LogRecordStore::get_current_size (void) { return this->current_size_; } CORBA::ULongLong -TAO_Hash_LogRecordStore::get_n_records (ACE_ENV_SINGLE_ARG_DECL) +TAO_Hash_LogRecordStore::get_n_records (void) { return this->num_records_; } CORBA::ULongLong -TAO_Hash_LogRecordStore::get_gauge (ACE_ENV_SINGLE_ARG_DECL) +TAO_Hash_LogRecordStore::get_gauge (void) { return this->gauge_; } void -TAO_Hash_LogRecordStore::reset_gauge (ACE_ENV_SINGLE_ARG_DECL) +TAO_Hash_LogRecordStore::reset_gauge (void) { this->gauge_ = 0; } @@ -224,7 +224,7 @@ TAO_Hash_LogRecordStore::remove_i (LOG_RECORD_STORE_ITER iter } int -TAO_Hash_LogRecordStore::purge_old_records (ACE_ENV_SINGLE_ARG_DECL) +TAO_Hash_LogRecordStore::purge_old_records (void) { CORBA::ULongLong num_records_to_purge = this->num_records_ * 5U / 100U; @@ -288,14 +288,12 @@ TAO_Hash_LogRecordStore::set_records_attribute ( DsLogAdmin::InvalidAttribute)) { this->check_grammar (grammar ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); // TODO: validate attributes here. // Use an Interpreter to build an expression tree. TAO_Log_Constraint_Interpreter interpreter (constraint ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); // Create iterators LOG_RECORD_STORE_ITER iter (rec_map_.begin ()); @@ -328,7 +326,6 @@ TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id DsLogAdmin::LogRecord rec; int retval = this->retrieve_i (id, rec ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); if (retval == -1) { @@ -340,14 +337,13 @@ TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id ACE_NEW_THROW_EX (nvlist, DsLogAdmin::NVList (rec.attr_list), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return nvlist; } int -TAO_Hash_LogRecordStore::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Hash_LogRecordStore::flush (void) { return 0; } @@ -386,7 +382,6 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint, // Use an Interpreter to build an expression tree. TAO_Log_Constraint_Interpreter interpreter (constraint ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); // Sequentially iterate over all the records and pick the ones that // meet the constraints. @@ -396,7 +391,6 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint, ACE_NEW_THROW_EX (rec_list, DsLogAdmin::RecordList (how_many), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); rec_list->length(how_many); // Create iterators @@ -448,7 +442,6 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint, constraint, this->max_rec_list_len_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (rec_list); // Transfer ownership to the POA. PortableServer::ServantBase_var safe_iter_query = iter_query; @@ -476,7 +469,6 @@ TAO_Hash_LogRecordStore::query (const char *grammar, DsLogAdmin::InvalidConstraint)) { this->check_grammar (grammar ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return this->query_i (constraint, iter_out, @@ -528,12 +520,10 @@ TAO_Hash_LogRecordStore::match (const char* grammar, DsLogAdmin::InvalidConstraint)) { this->check_grammar (grammar ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); // Use an Interpreter to build an expression tree. TAO_Log_Constraint_Interpreter interpreter (constraint ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); // Create iterators LOG_RECORD_STORE_ITER iter (rec_map_.begin ()); @@ -565,12 +555,10 @@ TAO_Hash_LogRecordStore::delete_records (const char *grammar, DsLogAdmin::InvalidConstraint)) { this->check_grammar (grammar ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); // Use an Interpreter to build an expression tree. TAO_Log_Constraint_Interpreter interpreter (constraint ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); // Create iterators LOG_RECORD_STORE_ITER iter (rec_map_.begin ()); @@ -617,7 +605,7 @@ TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &i } CORBA::ULong -TAO_Hash_LogRecordStore::remove_old_records (ACE_ENV_SINGLE_ARG_DECL) +TAO_Hash_LogRecordStore::remove_old_records (void) { if (this->max_record_life_ == 0) { return 0; @@ -639,7 +627,6 @@ TAO_Hash_LogRecordStore::remove_old_records (ACE_ENV_SINGLE_ARG_DECL) // Use an Interpreter to build an expression tree. TAO_Log_Constraint_Interpreter interpreter (out ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); // Create iterators LOG_RECORD_STORE_ITER iter (rec_map_.begin ()); @@ -689,7 +676,7 @@ TAO_Hash_LogRecordStore::check_grammar (const char* grammar DsLogAdmin::AdministrativeState -TAO_Hash_LogRecordStore::get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) const +TAO_Hash_LogRecordStore::get_administrative_state (void) const { return this->admin_state_; } @@ -703,13 +690,12 @@ TAO_Hash_LogRecordStore::set_administrative_state (DsLogAdmin::AdministrativeSta DsLogAdmin::CapacityAlarmThresholdList* -TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) const +TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds (void) const { DsLogAdmin::CapacityAlarmThresholdList* ret_val; ACE_NEW_THROW_EX (ret_val, DsLogAdmin::CapacityAlarmThresholdList (this->thresholds_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return ret_val; } @@ -724,7 +710,7 @@ TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::Capaci DsLogAdmin::ForwardingState -TAO_Hash_LogRecordStore::get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) const +TAO_Hash_LogRecordStore::get_forwarding_state (void) const { return this->forward_state_; } @@ -737,7 +723,7 @@ TAO_Hash_LogRecordStore::set_forwarding_state (DsLogAdmin::ForwardingState state } DsLogAdmin::TimeInterval -TAO_Hash_LogRecordStore::get_interval (ACE_ENV_SINGLE_ARG_DECL) const +TAO_Hash_LogRecordStore::get_interval (void) const { return this->interval_; } @@ -751,7 +737,7 @@ TAO_Hash_LogRecordStore::set_interval (const DsLogAdmin::TimeInterval &interval DsLogAdmin::LogFullActionType -TAO_Hash_LogRecordStore::get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const +TAO_Hash_LogRecordStore::get_log_full_action (void) const { return this->log_full_action_; } @@ -764,13 +750,12 @@ TAO_Hash_LogRecordStore::set_log_full_action (DsLogAdmin::LogFullActionType acti } DsLogAdmin::QoSList * -TAO_Hash_LogRecordStore::get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const +TAO_Hash_LogRecordStore::get_log_qos (void) const { DsLogAdmin::QoSList* ret_val = 0; ACE_NEW_THROW_EX (ret_val, DsLogAdmin::QoSList (this->log_qos_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return ret_val; } @@ -783,7 +768,7 @@ TAO_Hash_LogRecordStore::set_log_qos (const DsLogAdmin::QoSList& qos } CORBA::ULong -TAO_Hash_LogRecordStore::get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const +TAO_Hash_LogRecordStore::get_max_record_life (void) const { return this->max_record_life_; } @@ -796,7 +781,7 @@ TAO_Hash_LogRecordStore::set_max_record_life (CORBA::ULong max_record_life } CORBA::ULongLong -TAO_Hash_LogRecordStore::get_max_size (ACE_ENV_SINGLE_ARG_DECL) const +TAO_Hash_LogRecordStore::get_max_size (void) const { return this->max_size_; } @@ -809,13 +794,12 @@ TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size } DsLogAdmin::WeekMask* -TAO_Hash_LogRecordStore::get_week_mask (ACE_ENV_SINGLE_ARG_DECL) +TAO_Hash_LogRecordStore::get_week_mask (void) { DsLogAdmin::WeekMask* ret_val = 0; ACE_NEW_THROW_EX (ret_val, DsLogAdmin::WeekMask (this->weekmask_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); return ret_val; } diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h index d4518fd3825..b570f667d12 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h @@ -87,7 +87,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore /// Gets the administrative state of the log virtual DsLogAdmin::AdministrativeState - get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) const; + get_administrative_state (void) const; /// Sets the administrative state of the log virtual void @@ -96,7 +96,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore /// Get the capacity alarm thresholds virtual DsLogAdmin::CapacityAlarmThresholdList* - get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) const; + get_capacity_alarm_thresholds (void) const; /// Set the capacity alarm thresholds virtual void @@ -105,7 +105,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore /// Gets the forwarding state virtual DsLogAdmin::ForwardingState - get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) const; + get_forwarding_state (void) const; /// Sets the forwarding state virtual void @@ -114,7 +114,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore /// Get the log duration virtual DsLogAdmin::TimeInterval - get_interval (ACE_ENV_SINGLE_ARG_DECL) const; + get_interval (void) const; /// Set the log duration. virtual void @@ -123,7 +123,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore /// Gets the log full action virtual DsLogAdmin::LogFullActionType - get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const; + get_log_full_action (void) const; /// Sets the log full action virtual void @@ -132,7 +132,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore /// Get the list of the QoS properties supported by the log. virtual DsLogAdmin::QoSList* - get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const; + get_log_qos (void) const; /// Set the list of the QoS properties supported by the log. virtual void @@ -141,7 +141,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore /// Gets the max record life virtual CORBA::ULong - get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const; + get_max_record_life (void) const; /// Sets the max record life virtual void @@ -150,44 +150,44 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore /// Get the current set value of the max size of the log data. virtual CORBA::ULongLong - get_max_size (ACE_ENV_SINGLE_ARG_DECL) const; + get_max_size (void) const; /// Set the max size of log data. size == 0, => infinite. virtual void set_max_size (CORBA::ULongLong size ACE_ENV_ARG_DECL); - + /// Get the weekly scheduling parameters virtual DsLogAdmin::WeekMask* - get_week_mask (ACE_ENV_SINGLE_ARG_DECL); - + get_week_mask (void); + /// Set the weekly scheduling parameters. virtual void set_week_mask (const DsLogAdmin::WeekMask & masks ACE_ENV_ARG_DECL); - + // = LogRecordStore status methods /// Gets the current size of the log data. virtual CORBA::ULongLong - get_current_size (ACE_ENV_SINGLE_ARG_DECL); + get_current_size (void); /// Get the number of records in the log right now. virtual CORBA::ULongLong - get_n_records (ACE_ENV_SINGLE_ARG_DECL); + get_n_records (void); // = LogRecordStore gauge - + /// Gets the current value of the "gauge" that measures the total /// size of the records written to the log. virtual CORBA::ULongLong - get_gauge(ACE_ENV_SINGLE_ARG_DECL); + get_gauge(void); /// Resets the "gauge" to 0 virtual void - reset_gauge(ACE_ENV_SINGLE_ARG_DECL); + reset_gauge(void); // = Record logging, retrieval, update and removal methods. @@ -199,7 +199,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore /// Deletes "old" records from the store. virtual int - purge_old_records (ACE_ENV_SINGLE_ARG_DECL); + purge_old_records (void); /// Set single record attributes. virtual void @@ -233,7 +233,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore /// Ensure changes have been flushed to persistent media /// Returns 0 on success, -1 on failure. virtual int - flush (ACE_ENV_SINGLE_ARG_DECL); + flush (void); /// Returns all records in the log that match the given constraint /// <c>. @@ -280,8 +280,8 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong - remove_old_records (ACE_ENV_SINGLE_ARG_DECL); - + remove_old_records (void); + /// Read-Write Lock virtual ACE_SYNCH_RW_MUTEX& lock(); @@ -310,7 +310,7 @@ protected: /// Returns 0 on success, -1 on failure. int remove_i (DsLogAdmin::RecordId id ACE_ENV_ARG_DECL); - + /// Remove the record from the LogRecordStore. void remove_i (LOG_RECORD_STORE_ITER iter ACE_ENV_ARG_DECL); @@ -384,7 +384,7 @@ protected: /// The days of the week that the log should be operational DsLogAdmin::WeekMask weekmask_; - + ACE_Reactor* reactor_; diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp index 458cfca4155..f7dc9d0419f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp @@ -22,7 +22,7 @@ TAO_Hash_LogStore::~TAO_Hash_LogStore() DsLogAdmin::LogList* -TAO_Hash_LogStore::list_logs (ACE_ENV_SINGLE_ARG_DECL) +TAO_Hash_LogStore::list_logs (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -31,7 +31,6 @@ TAO_Hash_LogStore::list_logs (ACE_ENV_SINGLE_ARG_DECL) guard, lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); DsLogAdmin::LogList* list; @@ -42,7 +41,6 @@ TAO_Hash_LogStore::list_logs (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (list, DsLogAdmin::LogList (len), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); list->length (len); @@ -64,7 +62,7 @@ TAO_Hash_LogStore::list_logs (ACE_ENV_SINGLE_ARG_DECL) } DsLogAdmin::LogIdList* -TAO_Hash_LogStore::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL) +TAO_Hash_LogStore::list_logs_by_id (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -73,7 +71,6 @@ TAO_Hash_LogStore::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL) guard, lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); DsLogAdmin::LogIdList* list; @@ -84,7 +81,6 @@ TAO_Hash_LogStore::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (list, DsLogAdmin::LogIdList (len), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); list->length (len); @@ -137,7 +133,6 @@ TAO_Hash_LogStore::exists (DsLogAdmin::LogId id guard, lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (false); return (this->hash_map_.find (id) == 0); } @@ -151,14 +146,13 @@ TAO_Hash_LogStore::remove (DsLogAdmin::LogId id guard, lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (-1); TAO_Hash_LogRecordStore* recordstore; int retval = this->hash_map_.unbind (id, recordstore); - if (retval == 0) + if (retval == 0) { - delete recordstore; + delete recordstore; } return retval; @@ -176,7 +170,6 @@ TAO_Hash_LogStore::create(DsLogAdmin::LogFullActionType full_action, guard, lock_, CORBA::INTERNAL ()); - ACE_CHECK; DsLogAdmin::LogId id; @@ -193,7 +186,6 @@ TAO_Hash_LogStore::create(DsLogAdmin::LogFullActionType full_action, thresholds ), CORBA::NO_MEMORY ()); - ACE_CHECK; auto_ptr<TAO_Hash_LogRecordStore> recordstore (impl); @@ -217,7 +209,6 @@ TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id, guard, lock_, CORBA::INTERNAL ()); - ACE_CHECK; if (this->hash_map_.find (id) == 0) { @@ -233,7 +224,6 @@ TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id, thresholds ), CORBA::NO_MEMORY ()); - ACE_CHECK; auto_ptr<TAO_Hash_LogRecordStore> recordstore (impl); @@ -254,7 +244,6 @@ TAO_Hash_LogStore::get_log_record_store (DsLogAdmin::LogId id guard, lock_, CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); TAO_Hash_LogRecordStore* recordstore = 0; diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h index 7c43c34a8a7..af4b79881c3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h @@ -53,14 +53,14 @@ public: /// Lists all logs created by the log factory. virtual DsLogAdmin::LogList * - list_logs (ACE_ENV_SINGLE_ARG_DECL) + list_logs (void) ACE_THROW_SPEC (( CORBA::SystemException )); /// Lists all log ids. virtual DsLogAdmin::LogIdList * - list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL) + list_logs_by_id (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index 139e85e262c..2e999252b50 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -16,9 +16,9 @@ TAO_Iterator_i::TAO_Iterator_i (PortableServer::POA_ptr poa, : poa_ (PortableServer::POA::_duplicate (poa)), reactor_ (reactor) { - if (this->timeout_ != ACE_Time_Value::zero) + if (this->timeout_ != ACE_Time_Value::zero) { - this->timer_id_ = + this->timer_id_ = this->reactor_->schedule_timer (this, 0, this->timeout_); } } @@ -29,24 +29,22 @@ TAO_Iterator_i::~TAO_Iterator_i (void) // cancel timer if (this->timer_id_ != -1) { - this->reactor_->cancel_timer (this->timer_id_); + this->reactor_->cancel_timer (this->timer_id_); } } void -TAO_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_Iterator_i::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Goodbye cruel world... // deactivate from the poa. this->poa_->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; return; } @@ -56,8 +54,7 @@ TAO_Iterator_i::handle_timeout(const ACE_Time_Value&, const void*) { ACE_TRY_NEW_ENV { - this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->destroy (); } ACE_CATCHANY { diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index 84042063697..303c6163e59 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -43,7 +43,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief Iterator to get LogRecords for the log via a query. */ -class TAO_Log_Serv_Export TAO_Iterator_i +class TAO_Log_Serv_Export TAO_Iterator_i : public virtual POA_DsLogAdmin::Iterator, public ACE_Event_Handler { @@ -65,7 +65,7 @@ public: DsLogAdmin::InvalidParam)) = 0; /// This destroys the iterator. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -77,10 +77,10 @@ protected: /// Timeout static ACE_Time_Value timeout_; - + /// Timer ID long timer_id_; - + virtual int handle_timeout (const ACE_Time_Value&, const void *); }; diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp index a5f60cf3c05..02bfbb96fac 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp @@ -32,7 +32,6 @@ TAO_LogActivator::incarnate (const PortableServer::ObjectId& oid, if (!logmgr_i_.exists(id ACE_ENV_ARG_PARAMETER)) ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); - ACE_CHECK_RETURN(0); return logmgr_i_.create_log_servant (id ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index 199e5154fa8..5b03a1d8640 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -34,8 +34,7 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb, this->poa_ = PortableServer::POA::_duplicate (poa); PortableServer::POAManager_var poa_manager = - this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->poa_->the_POAManager (); { TAO::Utils::PolicyList_Destroyer policies(1); @@ -45,13 +44,11 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb, policies[0] = this->poa_->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->factory_poa_ = this->poa_->create_POA ("factory_POA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -63,31 +60,26 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb, policies[0] = this->poa_->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policies[1] = this->poa_->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) policies.length(4); policies[2] = this->poa_->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER); - ACE_CHECK; policies[3] = this->poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #endif this->log_poa_ = this->factory_poa_->create_POA ("log_POA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) @@ -99,7 +91,6 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb, this->log_poa_->set_servant_manager(servant_activator ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #endif // Load Log Strategy @@ -140,14 +131,12 @@ TAO_LogMgr_i::create_log_reference (DsLogAdmin::LogId id this->log_poa_->create_reference_with_id (oid.in (), intf.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); // Use _unchecked_narrow() because this may be called from a servant // activator's incarnate() method. A plain _narrow() will result in // infinate recursion. DsLogAdmin::Log_var log = DsLogAdmin::Log::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); return log._retn(); } @@ -159,7 +148,6 @@ TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id PortableServer::ServantBase* servant = 0; servant = create_log_servant (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); PortableServer::ServantBase_var safe_servant = servant; // Transfer ownership to the POA. @@ -171,28 +159,27 @@ TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id this->log_poa_->activate_object_with_id (oid.in (), servant ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); return create_log_reference (id ACE_ENV_ARG_PARAMETER); } DsLogAdmin::LogList* -TAO_LogMgr_i::list_logs (ACE_ENV_SINGLE_ARG_DECL) +TAO_LogMgr_i::list_logs (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->logstore_->list_logs (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->logstore_->list_logs (); } DsLogAdmin::LogIdList* -TAO_LogMgr_i::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL) +TAO_LogMgr_i::list_logs_by_id (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->logstore_->list_logs_by_id (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->logstore_->list_logs_by_id (); } @@ -241,7 +228,7 @@ TAO_LogMgr_i::create_i (DsLogAdmin::LogFullActionType full_action, if (full_action != DsLogAdmin::wrap && full_action != DsLogAdmin::halt) ACE_THROW (DsLogAdmin::InvalidLogFullAction ()); - if (thresholds) + if (thresholds) { // @@ JTC - validate thresholds here } @@ -251,7 +238,6 @@ TAO_LogMgr_i::create_i (DsLogAdmin::LogFullActionType full_action, thresholds, id_out ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -265,7 +251,7 @@ TAO_LogMgr_i::create_with_id_i (DsLogAdmin::LogId id, if (full_action != DsLogAdmin::wrap && full_action != DsLogAdmin::halt) ACE_THROW (DsLogAdmin::InvalidLogFullAction ()); - if (thresholds) + if (thresholds) { // @@ JTC - validate thresholds here } @@ -275,7 +261,6 @@ TAO_LogMgr_i::create_with_id_i (DsLogAdmin::LogId id, max_size, thresholds ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CORBA::ORB_ptr diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index a75417898c8..4f85f5d0125 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -52,14 +52,14 @@ public: /// Lists all log object references. DsLogAdmin::LogList * - list_logs (ACE_ENV_SINGLE_ARG_DECL) + list_logs (void) ACE_THROW_SPEC (( CORBA::SystemException )); /// Lists all log ids. DsLogAdmin::LogIdList * - list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL) + list_logs_by_id (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -75,7 +75,7 @@ public: /// Returns true if log exists, otherwise false bool exists (DsLogAdmin::LogId id ACE_ENV_ARG_DECL); - + /// Remove the given entry from the container. int remove (DsLogAdmin::LogId id ACE_ENV_ARG_DECL); @@ -88,7 +88,7 @@ public: /// /// @return object id /// - virtual PortableServer::ObjectId* + virtual PortableServer::ObjectId* create_objectid (DsLogAdmin::LogId id); /// @brief Create log reference @@ -99,7 +99,7 @@ public: /// /// @return object reference /// - virtual DsLogAdmin::Log_ptr + virtual DsLogAdmin::Log_ptr create_log_reference (DsLogAdmin::LogId id ACE_ENV_ARG_DECL); @@ -111,7 +111,7 @@ public: /// /// @return object reference /// - virtual DsLogAdmin::Log_ptr + virtual DsLogAdmin::Log_ptr create_log_object (DsLogAdmin::LogId id ACE_ENV_ARG_DECL); @@ -134,8 +134,8 @@ public: virtual PortableServer::ServantBase* create_log_servant (DsLogAdmin::LogId id ACE_ENV_ARG_DECL) = 0; - - /// @brief Get log record store + + /// @brief Get log record store /// /// Get/Create a log record store for log channel @a id. /// @@ -156,7 +156,7 @@ protected: /// /// Creates factory and log channel POAs, and obtains the LogStore /// from a dynamically loaded Log_Persistence_Strategy (if one was - /// specified in the service config file, otherwise the default + /// specified in the service config file, otherwise the default /// Hash_Persistence_Strategy is used.) /// /// @param orb ORB @@ -179,7 +179,7 @@ protected: CORBA::ULongLong max_size, const DsLogAdmin::CapacityAlarmThresholdList* thresholds ACE_ENV_ARG_DECL); - + /// ORB. CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index e7f422dd36b..49ffdd604fa 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp @@ -40,7 +40,6 @@ TAO_LogNotification::object_creation (DsLogAdmin::LogId id this->send_notification (any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -64,7 +63,6 @@ TAO_LogNotification::object_deletion (DsLogAdmin::LogId id this->send_notification (any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -83,7 +81,6 @@ TAO_LogNotification::processing_error_alarm (CORBA::ULong error_num, this->send_notification (any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -116,7 +113,6 @@ TAO_LogNotification::attribute_value_change (DsLogAdmin::Log_ptr log, this->send_notification (any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -138,7 +134,6 @@ TAO_LogNotification::capacity_alarm_threshold_value_change ( oldV, newV ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -159,7 +154,6 @@ TAO_LogNotification::log_full_action_value_change (DsLogAdmin::Log_ptr log, oldV, newV ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -180,7 +174,6 @@ TAO_LogNotification::max_log_size_value_change (DsLogAdmin::Log_ptr log, oldV, newV ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -201,7 +194,6 @@ TAO_LogNotification::start_time_value_change (DsLogAdmin::Log_ptr log, oldV, newV ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -222,7 +214,6 @@ TAO_LogNotification::stop_time_value_change (DsLogAdmin::Log_ptr log, oldV, newV ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -243,7 +234,6 @@ TAO_LogNotification::week_mask_value_change (DsLogAdmin::Log_ptr log, oldV, newV ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -264,7 +254,6 @@ TAO_LogNotification::max_record_life_value_change (DsLogAdmin::Log_ptr log, oldV, newV ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -286,7 +275,6 @@ TAO_LogNotification::quality_of_service_value_change ( oldV, newV ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -317,7 +305,6 @@ TAO_LogNotification::state_change (DsLogAdmin::Log_ptr log, this->send_notification (any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -336,7 +323,6 @@ TAO_LogNotification::administrative_state_change ( DsLogNotification::administrativeState, newV ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -355,7 +341,6 @@ TAO_LogNotification::operational_state_change ( DsLogNotification::operationalState, newV ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -373,7 +358,6 @@ TAO_LogNotification::forwarding_state_change (DsLogAdmin::Log_ptr log, DsLogNotification::forwardingState, newV ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -405,7 +389,6 @@ TAO_LogNotification::threshold_alarm ( this->send_notification (any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index 4e630b0ea46..a0d84000b77 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -50,12 +50,12 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Close the record store. virtual int close (void) = 0; - + // = Log Parameters /// Gets the administrative state of the log virtual DsLogAdmin::AdministrativeState - get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) const = 0; + get_administrative_state (void) const = 0; /// Sets the administrative state of the log virtual void @@ -64,7 +64,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Get the capacity alarm thresholds virtual DsLogAdmin::CapacityAlarmThresholdList* - get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) const = 0; + get_capacity_alarm_thresholds (void) const = 0; /// Set the capacity alarm thresholds virtual void @@ -73,8 +73,8 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Gets the forwarding state virtual DsLogAdmin::ForwardingState - get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) const = 0; - + get_forwarding_state (void) const = 0; + /// Sets the forwarding state virtual void set_forwarding_state (DsLogAdmin::ForwardingState state @@ -82,17 +82,17 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Get the log duration virtual DsLogAdmin::TimeInterval - get_interval (ACE_ENV_SINGLE_ARG_DECL) const = 0; - + get_interval (void) const = 0; + /// Set the log duration. virtual void set_interval (const DsLogAdmin::TimeInterval& interval ACE_ENV_ARG_DECL) = 0; - + /// Get the log full action virtual DsLogAdmin::LogFullActionType - get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const = 0; - + get_log_full_action (void) const = 0; + /// Set the log full action virtual void set_log_full_action(DsLogAdmin::LogFullActionType action @@ -100,7 +100,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Get the list of the QoS properties supported by the log. virtual DsLogAdmin::QoSList* - get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const = 0; + get_log_qos (void) const = 0; /// Set the list of the QoS properties supported by the log. virtual void @@ -109,7 +109,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Gets the max record life virtual CORBA::ULong - get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const = 0; + get_max_record_life (void) const = 0; /// Sets the max record life virtual void @@ -118,7 +118,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Get the current set value of the max size of the log data. virtual CORBA::ULongLong - get_max_size (ACE_ENV_SINGLE_ARG_DECL) const = 0; + get_max_size (void) const = 0; /// Set the max size of log data. size == 0, => infinite. virtual void @@ -127,47 +127,47 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Get the weekly scheduling parameters virtual DsLogAdmin::WeekMask* - get_week_mask (ACE_ENV_SINGLE_ARG_DECL) = 0; - + get_week_mask (void) = 0; + /// Set the weekly scheduling parameters. virtual void set_week_mask (const DsLogAdmin::WeekMask& masks ACE_ENV_ARG_DECL) = 0; - + // = LogRecordStore status methods /// Gets the current size of the log data. virtual CORBA::ULongLong - get_current_size (ACE_ENV_SINGLE_ARG_DECL) = 0; + get_current_size (void) = 0; /// Get the number of records in the log right now. virtual CORBA::ULongLong - get_n_records (ACE_ENV_SINGLE_ARG_DECL) = 0; + get_n_records (void) = 0; // = LogRecordStore gauge - + /// Gets the current value of the "gauge" that measures the total /// size of the records written to the log. virtual CORBA::ULongLong - get_gauge(ACE_ENV_SINGLE_ARG_DECL) = 0; + get_gauge(void) = 0; /// Resets the "gauge" to 0 virtual void - reset_gauge(ACE_ENV_SINGLE_ARG_DECL) = 0; + reset_gauge(void) = 0; // = Record logging, retrieval, update and removal methods. - /// Insert rec into storage. + /// Insert rec into storage. /// Returns 0 on success -1 on failure and 1 if the log is full. virtual int log (const DsLogAdmin::LogRecord &rec ACE_ENV_ARG_DECL) = 0; /// Deletes "old" records from the store. virtual int - purge_old_records (ACE_ENV_SINGLE_ARG_DECL) = 0; + purge_old_records (void) = 0; /// Set single record attributes. virtual void @@ -201,7 +201,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore /// Ensure changes have been flushed to persistent media /// Returns 0 on success, -1 on failure virtual int - flush (ACE_ENV_SINGLE_ARG_DECL) = 0; + flush (void) = 0; /// Returns all records in the log that match the given constraint @@ -250,16 +250,16 @@ class TAO_Log_Serv_Export TAO_LogRecordStore virtual CORBA::ULong - remove_old_records (ACE_ENV_SINGLE_ARG_DECL) = 0; + remove_old_records (void) = 0; /// Read-Write Lock virtual ACE_SYNCH_RW_MUTEX& lock() = 0; - + protected: /// Constructor. TAO_LogRecordStore (void); - + private: }; diff --git a/TAO/orbsvcs/orbsvcs/Log/LogStore.h b/TAO/orbsvcs/orbsvcs/Log/LogStore.h index 78773abffb9..5e62df949d5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h @@ -37,14 +37,14 @@ public: /// Lists all logs created by the log factory. virtual DsLogAdmin::LogList * - list_logs (ACE_ENV_SINGLE_ARG_DECL) + list_logs (void) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; /// Lists all log ids. virtual DsLogAdmin::LogIdList * - list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL) + list_logs_by_id (void) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; @@ -58,12 +58,12 @@ public: )) = 0; /// Returns true if log exists, otherwise false - virtual bool + virtual bool exists (DsLogAdmin::LogId id ACE_ENV_ARG_DECL) = 0; /// Remove the given entry from the hash table. - virtual int + virtual int remove (DsLogAdmin::LogId id ACE_ENV_ARG_DECL) = 0; @@ -76,14 +76,14 @@ public: ACE_ENV_ARG_DECL) = 0; /// @brief Create log - virtual void + virtual void create_with_id (DsLogAdmin::LogId id, DsLogAdmin::LogFullActionType full_action, CORBA::ULongLong max_size, const DsLogAdmin::CapacityAlarmThresholdList* thresholds ACE_ENV_ARG_DECL) = 0; - /// @brief Get log record store + /// @brief Get log record store /// /// Get/Create a log record store for log channel @a id. /// @@ -94,7 +94,7 @@ public: ACE_ENV_ARG_DECL) = 0; protected: - // Constructor + // Constructor TAO_LogStore() {} diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp index d153bbe2714..ab9f366a6bb 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp @@ -52,14 +52,13 @@ TAO_Log_Compaction_Handler::handle_timeout (const ACE_Time_Value&, { ACE_TRY_NEW_ENV { - this->log_->remove_old_records(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->log_->remove_old_records(); } ACE_CATCHANY { } ACE_ENDTRY; - + return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp index e741de09004..6281d19c48d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp @@ -21,10 +21,9 @@ TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter ( ACE_NEW_THROW_EX (this->root_, TAO_ETCL_Literal_Constraint ((CORBA::Boolean) 1), CORBA::NO_MEMORY ()); - ACE_CHECK; } else - { + { // root_ is set in this base class call. if (TAO_ETCL_Interpreter::build_tree (constraints) != 0) ACE_THROW (DsLogAdmin::InvalidConstraint ()); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index 6c8b55d4d88..127f17c5b86 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -144,7 +144,6 @@ TAO_Log_Constraint_Visitor::visit_union_pos ( TAO_DynUnion_i dyn_union; dyn_union.init (this->current_member_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::TypeCode_var tc = this->current_member_->type (); @@ -156,12 +155,10 @@ TAO_Log_Constraint_Visitor::visit_union_pos ( { CORBA::Any disc_any; CORBA::TypeCode_var disc_tc = - tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + tc->discriminator_type (); CORBA::TCKind disc_kind = TAO_DynAnyFactory::unalias (disc_tc.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; switch (disc_kind) { @@ -213,18 +210,14 @@ TAO_Log_Constraint_Visitor::visit_union_pos ( disc_tc.in (), disc_any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; dyn_union.set_discriminator (dyn_any.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynAny_var u_member = - dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dyn_union.member (); this->current_member_ = - u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + u_member->to_any (); break; } @@ -232,8 +225,7 @@ TAO_Log_Constraint_Visitor::visit_union_pos ( { const char *name = (const char *) disc_val; CORBA::ULong count = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + tc->member_count (); const char *member_name = 0; CORBA::ULong i = 0; @@ -242,7 +234,6 @@ TAO_Log_Constraint_Visitor::visit_union_pos ( { member_name = tc->member_name (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (ACE_OS::strcmp (name, member_name) == 0) { @@ -255,7 +246,6 @@ TAO_Log_Constraint_Visitor::visit_union_pos ( // return -1; this->current_member_ = tc->member_label (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; break; } @@ -292,7 +282,6 @@ TAO_Log_Constraint_Visitor::visit_union_pos ( return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); } int @@ -306,7 +295,6 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos) CORBA::TypeCode_var tc = this->current_member_->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynAny_var member; CORBA::Boolean success = 0; @@ -319,11 +307,9 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos) TAO_DynEnum_i dyn_enum; dyn_enum.init (this->current_member_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; success = dyn_enum.seek (slot ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (success == 0) { @@ -331,8 +317,7 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos) } member = - dyn_enum.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dyn_enum.current_component (); break; } @@ -341,19 +326,16 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos) TAO_DynStruct_i dyn_struct; dyn_struct.init (this->current_member_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; success = dyn_struct.seek (slot ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (success == 0) { return -1; } - member = dyn_struct.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + member = dyn_struct.current_component (); break; } @@ -364,8 +346,7 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos) return -1; } - CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var value = member->to_any (); TAO_ETCL_Constraint *comp = pos->component (); @@ -386,7 +367,6 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); } int @@ -444,7 +424,6 @@ TAO_Log_Constraint_Visitor::visit_component_array ( CORBA::TypeCode_var tc = this->current_member_->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynAny_var member; CORBA::Boolean success = 0; @@ -457,19 +436,16 @@ TAO_Log_Constraint_Visitor::visit_component_array ( TAO_DynEnum_i dyn_array; dyn_array.init (this->current_member_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; success = dyn_array.seek (slot ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (success == 0) { return -1; } - member = dyn_array.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + member = dyn_array.current_component (); break; } @@ -478,11 +454,9 @@ TAO_Log_Constraint_Visitor::visit_component_array ( TAO_DynStruct_i dyn_sequence; dyn_sequence.init (this->current_member_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; success = dyn_sequence.seek (slot ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (success == 0) { @@ -490,8 +464,7 @@ TAO_Log_Constraint_Visitor::visit_component_array ( } member = - dyn_sequence.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dyn_sequence.current_component (); break; } @@ -501,8 +474,7 @@ TAO_Log_Constraint_Visitor::visit_component_array ( return -1; } - CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var value = member->to_any (); TAO_ETCL_Constraint *comp = array->component (); @@ -523,7 +495,6 @@ TAO_Log_Constraint_Visitor::visit_component_array ( return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); } int @@ -541,8 +512,7 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) // If the TCKind is not a sequence or an array, the // call to length() will raise an exception, and the // catch block will return -1; - CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ULong length = tc->length (); TAO_ETCL_Literal_Constraint lit (length); this->queue_.enqueue_head (lit); @@ -556,14 +526,11 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) TAO_DynUnion_i dyn_union; dyn_union.init (this->current_member_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynAny_var disc = - dyn_union.get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dyn_union.get_discriminator (); - CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var disc_any = disc->to_any (); TAO_ETCL_Literal_Constraint lit (disc_any.ptr ()); this->queue_.enqueue_head (lit); @@ -571,8 +538,7 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) } case TAO_ETCL_TYPE_ID: { - const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + const char *name = tc->name (); TAO_ETCL_Literal_Constraint lit (name); this->queue_.enqueue_head (lit); @@ -580,8 +546,7 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) } case TAO_ETCL_REPOS_ID: { - const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + const char *id = tc->id (); TAO_ETCL_Literal_Constraint lit (id); this->queue_.enqueue_head (lit); @@ -596,7 +561,6 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); } int @@ -669,8 +633,7 @@ TAO_Log_Constraint_Visitor::visit_default (TAO_ETCL_Default *def) // If the current member is not a union, this call will // throw BadKind and the catch block will return -1. - CORBA::Long default_index = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Long default_index = tc->default_index (); // No default index. if (default_index == -1) @@ -692,7 +655,6 @@ TAO_Log_Constraint_Visitor::visit_default (TAO_ETCL_Default *def) return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); } int @@ -1017,14 +979,12 @@ TAO_Log_Constraint_Visitor::visit_in ( CORBA::TypeCode_var tc = component->type (); kind = TAO_DynAnyFactory::unalias (tc.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { return return_value; } ACE_ENDTRY; - ACE_CHECK_RETURN (return_value); CORBA::Boolean result = 0; @@ -1087,7 +1047,6 @@ TAO_Log_Constraint_Visitor::sequence_does_contain ( CORBA::TypeCode_var type = any->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // The literal and the array elements must be // of the same simple type. @@ -1102,11 +1061,9 @@ TAO_Log_Constraint_Visitor::sequence_does_contain ( TAO_DynSequence_i dyn_seq; dyn_seq.init (*any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::AnySeq_var any_seq = - dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dyn_seq.get_elements (); CORBA::ULong length = any_seq->length (); @@ -1125,7 +1082,6 @@ TAO_Log_Constraint_Visitor::sequence_does_contain ( return 0; } ACE_ENDTRY; - ACE_CHECK_RETURN (0); return 0; } @@ -1142,7 +1098,6 @@ TAO_Log_Constraint_Visitor::array_does_contain ( CORBA::TypeCode_var type = any->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // The literal and the array elements must be // of the same simple type. @@ -1157,11 +1112,9 @@ TAO_Log_Constraint_Visitor::array_does_contain ( TAO_DynArray_i dyn_array; dyn_array.init (*any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::AnySeq_var any_seq = - dyn_array.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dyn_array.get_elements (); CORBA::ULong length = any_seq->length (); @@ -1180,7 +1133,6 @@ TAO_Log_Constraint_Visitor::array_does_contain ( return 0; } ACE_ENDTRY; - ACE_CHECK_RETURN (0); return 0; } @@ -1197,11 +1149,9 @@ TAO_Log_Constraint_Visitor::struct_does_contain ( TAO_DynStruct_i dyn_struct; dyn_struct.init (*any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::NameValuePairSeq_var members = - dyn_struct.get_members (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dyn_struct.get_members (); CORBA::ULong length = members->length (); CORBA::TypeCode_var tc; @@ -1212,7 +1162,6 @@ TAO_Log_Constraint_Visitor::struct_does_contain ( tc = members[i].value.type (); kind = TAO_DynAnyFactory::unalias (tc.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // The literal and the struct member must be // of the same simple type. @@ -1237,7 +1186,6 @@ TAO_Log_Constraint_Visitor::struct_does_contain ( return 0; } ACE_ENDTRY; - ACE_CHECK_RETURN (0); return 0; } @@ -1254,19 +1202,15 @@ TAO_Log_Constraint_Visitor::union_does_contain ( TAO_DynUnion_i dyn_union; dyn_union.init (*any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; DynamicAny::DynAny_var cc = - dyn_union.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dyn_union.current_component (); - CORBA::Any_var member = cc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var member = cc->to_any (); CORBA::TypeCode_var tc = member->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // The literal and the union member must be // of the same simple type. @@ -1287,7 +1231,6 @@ TAO_Log_Constraint_Visitor::union_does_contain ( return 0; } ACE_ENDTRY; - ACE_CHECK_RETURN (0); } CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp index 122d35c486c..cc058cb2e49 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp @@ -45,14 +45,13 @@ TAO_Log_Flush_Handler::handle_timeout (const ACE_Time_Value&, const void *) { ACE_TRY_NEW_ENV { - log_->flush (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + log_->flush (); } ACE_CATCHANY { } ACE_ENDTRY; - + return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 4cbbd3b86b2..3503452940a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -43,34 +43,29 @@ TAO_Log_i::TAO_Log_i (CORBA::ORB_ptr orb, } void -TAO_Log_i::init (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::init (void) { this->log_ = logmgr_i_.create_log_reference (this->logid_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->recordstore_ = logmgr_i_.get_log_record_store (this->logid_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (this->recordstore_->open () ==-1) ACE_THROW (CORBA::UNKNOWN ()); // fetch the capacity alarm thresholds from the log record store DsLogAdmin::CapacityAlarmThresholdList_var thresholds = - this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_capacity_alarm_thresholds (); // initialize the internal representation this->thresholds_ = thresholds.in (); - this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->reset_capacity_alarm_threshold (); // fetch the log QoS from the log record store DsLogAdmin::QoSList_var qos = - this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_log_qos (); // initialize the internal representation. this->reset_log_qos (qos.in ()); @@ -78,18 +73,15 @@ TAO_Log_i::init (ACE_ENV_SINGLE_ARG_DECL) // fetch the week mask from the log record store DsLogAdmin::WeekMask_var week_mask = - this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_week_mask (); // initialize the internal representation this->reset_week_mask (week_mask.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // fetch the maximum record life from the log record store CORBA::ULong max_record_life = - this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_max_record_life (); // if set, activate the compaction handler if (max_record_life != 0) @@ -105,28 +97,27 @@ TAO_Log_i::~TAO_Log_i (void) } DsLogAdmin::LogMgr_ptr -TAO_Log_i::my_factory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Log_i::my_factory (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return DsLogAdmin::LogMgr::_duplicate (this->factory_.in ()); } DsLogAdmin::LogId -TAO_Log_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Log_i::id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return logid_; } DsLogAdmin::QoSList* -TAO_Log_i::get_log_qos (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::get_log_qos (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); // @@ The current revision of the specification (formal/03-07-01) // states that get_log_qos() returns a list of the QoS properties @@ -136,7 +127,7 @@ TAO_Log_i::get_log_qos (ACE_ENV_SINGLE_ARG_DECL) // have submitted a defect report to the OMG for clarification. // --jtc - return this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->recordstore_->get_log_qos (); } void @@ -149,7 +140,6 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK; // @@ The current revision of the specification (formal/03-07-01) // does not clearly define the semantics to follow when the QoSList @@ -164,8 +154,7 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos validate_log_qos (qos); DsLogAdmin::QoSList_var old_qos = - this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_log_qos (); // @@ The current revision of the specification (formal/03-07-01) is // unclear whether an AttributeValueChange event should be sent if a @@ -179,7 +168,6 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos return; this->recordstore_->set_log_qos (qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; reset_log_qos (qos); @@ -190,22 +178,20 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos old_qos.in (), qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } CORBA::ULong -TAO_Log_i::get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::get_max_record_life (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); return - this->recordstore_->get_max_record_life(ACE_ENV_SINGLE_ARG_PARAMETER); + this->recordstore_->get_max_record_life(); } void @@ -217,11 +203,9 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK; CORBA::ULong old_life = - this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_max_record_life (); // @@ The current revision of the specification (formal/03-07-01) is // unclear whether an AttributeValueChange event should be sent if a @@ -235,7 +219,6 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life return; this->recordstore_->set_max_record_life (life ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (life != 0) this->log_compaction_handler_.schedule(); @@ -249,21 +232,19 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life old_life, life ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } CORBA::ULongLong -TAO_Log_i::get_max_size (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::get_max_size (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); + return recordstore_->get_max_size (); } void @@ -276,11 +257,9 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK; CORBA::ULongLong old_size = - this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_max_size (); // @@ The current revision of the specification (formal/03-07-01) is // unclear whether an AttributeValueChange event should be sent if a @@ -297,15 +276,13 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size if (size != 0) { CORBA::ULongLong current_size = - this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_current_size (); if (size < current_size) ACE_THROW (DsLogAdmin::InvalidParam ()); } this->recordstore_->set_max_size (size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (notifier_) { @@ -314,7 +291,6 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size old_size, size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // @@ The current revision of the specification (formal/03-07-01) @@ -332,47 +308,43 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size // clarified when/if the OMG charters a RTF for the log service. // --jtc // - this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->reset_capacity_alarm_threshold (); } CORBA::ULongLong -TAO_Log_i::get_current_size (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::get_current_size (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->recordstore_->get_current_size (); } CORBA::ULongLong -TAO_Log_i::get_n_records (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::get_n_records (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->recordstore_->get_n_records (); } DsLogAdmin::LogFullActionType -TAO_Log_i::get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::get_log_full_action (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->get_log_full_action(ACE_ENV_SINGLE_ARG_PARAMETER); + return this->recordstore_->get_log_full_action(); } void @@ -385,14 +357,12 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK; if (action != DsLogAdmin::wrap && action != DsLogAdmin::halt) ACE_THROW (DsLogAdmin::InvalidLogFullAction ()); DsLogAdmin::LogFullActionType old_action = - this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_log_full_action (); // @@ The current revision of the specification (formal/03-07-01) is // unclear whether an AttributeValueChange event should be sent if a @@ -406,7 +376,6 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action return; this->recordstore_->set_log_full_action (action ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (notifier_) { @@ -415,7 +384,6 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action old_action, action ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // @@ The current revision of the specification (formal/03-07-01) @@ -433,21 +401,19 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action // clarified when/if the OMG charters a RTF for the log service. // --jtc // - this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->reset_capacity_alarm_threshold (); } DsLogAdmin::AdministrativeState -TAO_Log_i::get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::get_administrative_state (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->recordstore_->get_administrative_state (); } void @@ -459,11 +425,9 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK; DsLogAdmin::AdministrativeState old_state = - this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_administrative_state (); // @@ The current revision of the specification (formal/03-07-01) is // unclear whether an AttributeValueChange event should be sent if a @@ -477,7 +441,6 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state return; this->recordstore_->set_administrative_state (state ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (notifier_) { @@ -485,22 +448,20 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state this->logid_, state ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } DsLogAdmin::ForwardingState -TAO_Log_i::get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::get_forwarding_state (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); return - this->recordstore_->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER); + this->recordstore_->get_forwarding_state (); } void @@ -512,11 +473,9 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK; DsLogAdmin::ForwardingState old_state = - this->recordstore_->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_forwarding_state (); // @@ The current revision of the specification (formal/03-07-01) is // unclear whether an AttributeValueChange event should be sent if a @@ -530,7 +489,6 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state return; this->recordstore_->set_forwarding_state (state ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (notifier_) { @@ -538,12 +496,11 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state this->logid_, state ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } DsLogAdmin::OperationalState -TAO_Log_i::get_operational_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Log_i::get_operational_state (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // No locks are necessary, since op_state_ is set in ::init() and @@ -552,16 +509,15 @@ TAO_Log_i::get_operational_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } DsLogAdmin::TimeInterval -TAO_Log_i::get_interval (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::get_interval (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->recordstore_->get_interval (); } void @@ -575,7 +531,6 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK; // validate interval if (interval.start != 0) @@ -585,8 +540,7 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval } DsLogAdmin::TimeInterval old_interval = - this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_interval (); // @@ The current revision of the specification (formal/03-07-01) is // unclear whether an AttributeValueChange event should be sent if a @@ -600,7 +554,6 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval return; this->recordstore_->set_interval (interval ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (notifier_) { @@ -611,7 +564,6 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval old_interval.start, interval.start ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } if (interval.stop != old_interval.stop) @@ -621,26 +573,24 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval old_interval.stop, interval.stop ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } } DsLogAdmin::AvailabilityStatus -TAO_Log_i::get_availability_status (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::get_availability_status (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->get_availability_status_i (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->get_availability_status_i (); } DsLogAdmin::AvailabilityStatus -TAO_Log_i::get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::get_availability_status_i (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // The log is considered "on duty" if all the following are true: @@ -650,12 +600,10 @@ TAO_Log_i::get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL) // * current time falls within one (or more) of the log // scheduling times. - const CORBA::Boolean s = this->scheduled (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (this->avail_status_); + const CORBA::Boolean s = this->scheduled (); DsLogAdmin::AdministrativeState admin_state = - this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (this->avail_status_); + this->recordstore_->get_administrative_state (); if (this->op_state_ == DsLogAdmin::enabled && admin_state == DsLogAdmin::unlocked @@ -671,16 +619,15 @@ TAO_Log_i::get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL) } DsLogAdmin::CapacityAlarmThresholdList* -TAO_Log_i::get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::get_capacity_alarm_thresholds (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->recordstore_->get_capacity_alarm_thresholds (); } void @@ -695,19 +642,16 @@ TAO_Log_i::set_capacity_alarm_thresholds (const guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK; const CORBA::Boolean validated = TAO_Log_i::validate_capacity_alarm_thresholds (threshs ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!validated) ACE_THROW (DsLogAdmin::InvalidThreshold ()); DsLogAdmin::CapacityAlarmThresholdList_var old_threshs = - this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_capacity_alarm_thresholds (); // @@ The current revision of the specification (formal/03-07-01) is // unclear whether an AttributeValueChange event should be sent if a @@ -722,7 +666,6 @@ TAO_Log_i::set_capacity_alarm_thresholds (const this->recordstore_->set_capacity_alarm_thresholds (threshs ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (notifier_) { @@ -731,7 +674,6 @@ TAO_Log_i::set_capacity_alarm_thresholds (const old_threshs.in (), threshs ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } // @@ The current revision of the specification (formal/03-07-01) @@ -750,21 +692,19 @@ TAO_Log_i::set_capacity_alarm_thresholds (const // --jtc // this->thresholds_ = threshs; - this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->reset_capacity_alarm_threshold (); } DsLogAdmin::WeekMask* -TAO_Log_i::get_week_mask (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::get_week_mask (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - return this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->recordstore_->get_week_mask (); } void @@ -779,14 +719,11 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK; validate_week_mask (masks ACE_ENV_ARG_PARAMETER); - ACE_CHECK; DsLogAdmin::WeekMask_var old_masks = - this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_week_mask (); // @@ The current revision of the specification (formal/03-07-01) is // unclear whether an AttributeValueChange event should be sent if a @@ -800,10 +737,8 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks return; this->recordstore_->set_week_mask (masks ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->reset_week_mask (masks ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (notifier_) { @@ -812,7 +747,6 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks old_masks.in (), masks ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -829,7 +763,6 @@ TAO_Log_i::query (const char *grammar, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); return this->recordstore_->query (grammar, constraint, @@ -848,7 +781,6 @@ TAO_Log_i::retrieve (DsLogAdmin::TimeT from_time, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); return this->recordstore_->retrieve (from_time, how_many, @@ -868,13 +800,11 @@ TAO_Log_i::match (const char* grammar, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); const CORBA::ULong count = this->recordstore_->match (grammar, constraint ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); return count; } @@ -891,25 +821,21 @@ TAO_Log_i::delete_records (const char *grammar, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); const CORBA::ULong count = this->recordstore_->delete_records (grammar, constraint ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - if (count > 0) + if (count > 0) { if (avail_status_.log_full) { const CORBA::ULongLong current_size = - this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->recordstore_->get_current_size (); const CORBA::ULongLong max_size = - this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->recordstore_->get_max_size (); if (current_size < max_size) { @@ -917,10 +843,9 @@ TAO_Log_i::delete_records (const char *grammar, } } - this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->reset_capacity_alarm_threshold (); } - + return count; } @@ -933,23 +858,19 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); const CORBA::ULong count = this->recordstore_->delete_records_by_id (ids ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); if (count > 0) { if (avail_status_.log_full) { const CORBA::ULongLong current_size = - this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->recordstore_->get_current_size (); const CORBA::ULongLong max_size = - this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->recordstore_->get_max_size (); if (current_size < max_size) { @@ -957,8 +878,7 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids } } - this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->reset_capacity_alarm_threshold (); } return count; @@ -983,7 +903,6 @@ TAO_Log_i::write_records (const DsLogAdmin::Anys &records } this->write_recordlist (reclist ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -999,15 +918,12 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK; DsLogAdmin::LogFullActionType log_full_action = - this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_log_full_action (); DsLogAdmin::AdministrativeState admin_state = - this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_administrative_state (); // @@ The current revision of the specification (formal/03-07-01) // does not explicitly specify the preference of exceptions to be @@ -1019,8 +935,7 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist // specific LogLocked and LogDisabled exceptions will be thrown. DsLogAdmin::AvailabilityStatus avail_stat = - this->get_availability_status_i (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_availability_status_i (); if (admin_state == DsLogAdmin::locked) { @@ -1040,9 +955,8 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist for (CORBA::ULong i = 0; i < reclist.length (); i++) { // retval == 1 => log store reached max size. - + int retval = this->recordstore_->log (reclist[i] ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (retval == 1) { @@ -1057,9 +971,9 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist // the policy is to wrap. for this we need to delete a few // records. let the record store decide how many. - if (this->recordstore_->purge_old_records (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->recordstore_->purge_old_records () == -1) ACE_THROW (CORBA::PERSIST_STORE ()); - + // Now, we want to attempt to write the same record again // so decrement the index to balance the inc. in the for loop. --i; @@ -1067,9 +981,8 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist else if (retval == 0) { num_written++; - - this->check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + + this->check_capacity_alarm_threshold (); } else { @@ -1090,7 +1003,6 @@ TAO_Log_i::set_record_attribute (DsLogAdmin::RecordId id, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK; this->recordstore_->set_record_attribute (id, attr_list ACE_ENV_ARG_PARAMETER); @@ -1110,7 +1022,6 @@ TAO_Log_i::set_records_attribute (const char *grammar, guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); return this->recordstore_->set_records_attribute (grammar, constraint, @@ -1128,29 +1039,27 @@ TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id guard, this->recordstore_->lock (), CORBA::INTERNAL ()); - ACE_CHECK_RETURN (0); - + return this->recordstore_->get_record_attribute (id ACE_ENV_ARG_PARAMETER); } void -TAO_Log_i::flush (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::flush (void) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)) { /// XXX locks? - this->recordstore_->flush (ACE_ENV_SINGLE_ARG_PARAMETER); + this->recordstore_->flush (); } CORBA::Boolean -TAO_Log_i::scheduled (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::scheduled (void) ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::TimeInterval interval = - this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + this->recordstore_->get_interval (); TimeBase::TimeT current_time; ACE_Time_Value now = ACE_OS::gettimeofday (); @@ -1203,97 +1112,76 @@ TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log ACE_THROW_SPEC ((CORBA::SystemException)) { const DsLogAdmin::LogFullActionType log_full_action = - this->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_log_full_action (); log->set_log_full_action (log_full_action ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const CORBA::ULongLong max_size = - this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_max_size (); log->set_max_size (max_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; DsLogAdmin::QoSList_var log_qos = - this->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_log_qos (); log->set_log_qos (log_qos.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const CORBA::ULong max_record_life = - this->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_max_record_life (); log->set_max_record_life (max_record_life ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const DsLogAdmin::AdministrativeState adminstrative_state = - this->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_administrative_state (); log->set_administrative_state (adminstrative_state ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const DsLogAdmin::ForwardingState forwarding_state = - this->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_forwarding_state (); log->set_forwarding_state (forwarding_state ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const DsLogAdmin::TimeInterval interval = - this->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_interval (); log->set_interval (interval ACE_ENV_ARG_PARAMETER); - ACE_CHECK; DsLogAdmin::CapacityAlarmThresholdList_var capacity_list = - this->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_capacity_alarm_thresholds (); log->set_capacity_alarm_thresholds (capacity_list.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; DsLogAdmin::WeekMask_var week_mask = - this->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->get_week_mask (); log->set_week_mask (week_mask.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::remove_old_records (void) ACE_THROW_SPEC ((CORBA::SystemException)) { const CORBA::ULong count = - this->recordstore_->remove_old_records (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->remove_old_records (); if (count > 0) { if (avail_status_.log_full) { const CORBA::ULongLong current_size = - this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_current_size (); const CORBA::ULongLong max_size = - this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_max_size (); if (current_size < max_size) { @@ -1301,31 +1189,27 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL) } } - this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->reset_capacity_alarm_threshold (); } } void -TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::check_capacity_alarm_threshold (void) ACE_THROW_SPEC ((CORBA::SystemException)) { const CORBA::ULongLong max_size = - this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_max_size (); if (max_size != 0 && this->thresholds_.length () > 0) { const DsLogAdmin::LogFullActionType log_full_action = - this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - + this->recordstore_->get_log_full_action (); + CORBA::ULongLong current_size = ((log_full_action == DsLogAdmin::wrap) - ? this->recordstore_->get_gauge (ACE_ENV_SINGLE_ARG_PARAMETER) - : this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; - + ? this->recordstore_->get_gauge () + : this->recordstore_->get_current_size ()); + const CORBA::UShort percent = static_cast<CORBA::UShort> (((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U) / (double) ACE_UINT64_DBLCAST_ADAPTER (max_size))); @@ -1347,7 +1231,6 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL) percent, severity ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { @@ -1374,24 +1257,21 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL) } void -TAO_Log_i::reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL) +TAO_Log_i::reset_capacity_alarm_threshold (void) ACE_THROW_SPEC ((CORBA::SystemException)) { const CORBA::ULongLong max_size = - this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_max_size (); if (max_size != 0 && this->thresholds_.length() > 0) { const DsLogAdmin::LogFullActionType log_full_action = - this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_log_full_action (); if (log_full_action == DsLogAdmin::halt) { const CORBA::ULongLong current_size = - this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->recordstore_->get_current_size (); const CORBA::UShort percent = static_cast<CORBA::UShort> (((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U)) / @@ -1440,12 +1320,12 @@ TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos // I have submitted a defect report to the OMG for clarification. // // In the mean time, the last property found in the QoSList takes - // presidence. + // presidence. // --jtc DsLogAdmin::QoSType qostype = DsLogAdmin::QoSNone; - for (CORBA::ULong i = 0; i < qos.length (); ++i) + for (CORBA::ULong i = 0; i < qos.length (); ++i) { qostype = qos[i]; } @@ -1459,7 +1339,7 @@ TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos } void -TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos +TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS)) { @@ -1488,7 +1368,7 @@ TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos } void -TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks +TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks ACE_ENV_ARG_DECL_NOT_USED) { CORBA::ULong count = 0; @@ -1580,9 +1460,9 @@ operator==(const DsLogAdmin::CapacityAlarmThresholdList& rhs, return false; } - for (CORBA::ULong i = 0; i < length; ++i) + for (CORBA::ULong i = 0; i < length; ++i) { - if (rhs[i] != lhs[i]) + if (rhs[i] != lhs[i]) { return false; } @@ -1733,10 +1613,10 @@ operator==(const DsLogAdmin::WeekMask& rhs, { return false; } - + for (CORBA::ULong i = 0; i < length; ++i) { - if (rhs[i] != lhs[i]) + if (rhs[i] != lhs[i]) { return false; } diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 38d0ffa0e54..f49b44d0f53 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -62,7 +62,7 @@ public: ~TAO_Log_i (); /// Initlialize the Log. - void init (ACE_ENV_SINGLE_ARG_DECL); + void init (void); /** * @name DsLogAdmin::Log Methods @@ -71,16 +71,16 @@ public: */ //@{ /// Return the factory of the log. - DsLogAdmin::LogMgr_ptr my_factory (ACE_ENV_SINGLE_ARG_DECL) + DsLogAdmin::LogMgr_ptr my_factory (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the id of the log. - DsLogAdmin::LogId id (ACE_ENV_SINGLE_ARG_DECL) + DsLogAdmin::LogId id (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Get the list of the QoS properties supported by the log. DsLogAdmin::QoSList* - get_log_qos (ACE_ENV_SINGLE_ARG_DECL) + get_log_qos (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the list of the QoS properties supported by the log. @@ -91,7 +91,7 @@ public: /// Get the record life in seconds (0 infinite). CORBA::ULong - get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) + get_max_record_life (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the record life in seconds (0 infinite). @@ -102,7 +102,7 @@ public: /// Get the maximum size in octets. CORBA::ULongLong - get_max_size (ACE_ENV_SINGLE_ARG_DECL) + get_max_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the maximum size in octets. @@ -114,17 +114,17 @@ public: /// Get the current size of the log in octets. CORBA::ULongLong - get_current_size (ACE_ENV_SINGLE_ARG_DECL) + get_current_size (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the number of records in the log. CORBA::ULongLong - get_n_records (ACE_ENV_SINGLE_ARG_DECL) + get_n_records (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Get the action to be taken when the log reaches its maximum size. DsLogAdmin::LogFullActionType - get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) + get_log_full_action (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the action to be taken when the log reaches its maximum size. @@ -136,7 +136,7 @@ public: /// Get the administrative state of the log. DsLogAdmin::AdministrativeState - get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) + get_administrative_state (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the administrative state of the log. @@ -150,7 +150,7 @@ public: /// @@@ Of course! get_forwarding_state() is virtual in the base /// class dictated by the IDL! -Ossama virtual DsLogAdmin::ForwardingState - get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) + get_forwarding_state (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the forwarding state of the log. @@ -162,12 +162,12 @@ public: /// Get the operational state of the log. DsLogAdmin::OperationalState - get_operational_state (ACE_ENV_SINGLE_ARG_DECL) + get_operational_state (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Get the log duration DsLogAdmin::TimeInterval - get_interval (ACE_ENV_SINGLE_ARG_DECL) + get_interval (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the log duration. @@ -180,12 +180,12 @@ public: /// Get the availability status DsLogAdmin::AvailabilityStatus - get_availability_status (ACE_ENV_SINGLE_ARG_DECL) + get_availability_status (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Get the capacity alarm threshold DsLogAdmin::CapacityAlarmThresholdList* - get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) + get_capacity_alarm_thresholds (void) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -205,7 +205,7 @@ public: /// Get the weekly scheduling parameters DsLogAdmin::WeekMask* - get_week_mask (ACE_ENV_SINGLE_ARG_DECL) + get_week_mask (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the weekly scheduling parameters. @@ -315,25 +315,25 @@ public: /// Causes all pending events to be written to storage. Raises /// DsLogAdmin::UnsupportedQos void - flush (ACE_ENV_SINGLE_ARG_DECL) + flush (void) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)); //@} /// Remove records that have exceeded max_record_life_. - void remove_old_records (ACE_ENV_SINGLE_ARG_DECL) + void remove_old_records (void) ACE_THROW_SPEC ((CORBA::SystemException)); protected: /// Get the availability status /// @note must be called with locks held DsLogAdmin::AvailabilityStatus - get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL) + get_availability_status_i (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Tells if the Log is scheduled to run now. /// @note must be called with locks held - CORBA::Boolean scheduled (ACE_ENV_SINGLE_ARG_DECL) + CORBA::Boolean scheduled (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Copy the attributes of the log being passed. @@ -342,11 +342,11 @@ protected: ACE_THROW_SPEC ((CORBA::SystemException)); /// Check if threshold reached. - void check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL) + void check_capacity_alarm_threshold (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Reset capacity alarm threshold. - void reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL) + void reset_capacity_alarm_threshold (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Check that valid threshold values have been given. @@ -394,7 +394,7 @@ protected: /// The log's factory's object reference DsLogAdmin::LogMgr_var factory_; - /// The log's id + /// The log's id DsLogAdmin::LogId logid_; /// The log's operational state @@ -438,7 +438,7 @@ protected: static const ACE_Time_Value log_flush_interval_; }; -bool TAO_Log_Serv_Export +bool TAO_Log_Serv_Export operator==(const DsLogAdmin::CapacityAlarmThresholdList& rhs, const DsLogAdmin::CapacityAlarmThresholdList& lhs); @@ -489,11 +489,11 @@ operator!=(const DsLogAdmin::TimeInterval& rhs, bool TAO_Log_Serv_Export operator==(const DsLogAdmin::WeekMaskItem& rhs, const DsLogAdmin::WeekMaskItem& lhs); - + bool TAO_Log_Serv_Export operator!=(const DsLogAdmin::WeekMaskItem& rhs, const DsLogAdmin::WeekMaskItem& lhs); - + bool TAO_Log_Serv_Export operator==(const DsLogAdmin::WeekMask& rhs, const DsLogAdmin::WeekMask& lhs); diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index 97f1a9803f1..7e5fa4d9a17 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -24,12 +24,10 @@ TAO_Notify_LogConsumer::connect ( { // Activate the consumer with the default_POA_ CosNotifyComm::PushConsumer_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); @@ -37,22 +35,19 @@ TAO_Notify_LogConsumer::connect ( this->proxy_supplier_ = CosNotifyChannelAdmin::ProxyPushSupplier:: _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); proxy_supplier_->connect_any_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Notify_LogConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) +TAO_Notify_LogConsumer::disconnect (void) { this->proxy_supplier_-> - disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + disconnect_push_supplier(); } void @@ -107,11 +102,10 @@ TAO_Notify_LogConsumer::push // // I have submitted a defect report to the OMG for clarification. // --jtc - ACE_TRY + ACE_TRY { // log the RecordList. this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (DsLogAdmin::LogFull, ex) { @@ -134,7 +128,7 @@ TAO_Notify_LogConsumer::push void TAO_Notify_LogConsumer::disconnect_push_consumer - (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + (void) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h index c464e91f8d4..bd9e1802acc 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h @@ -62,7 +62,7 @@ public: void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL); /// Disconnect from NotifyLog. - virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL); + virtual void disconnect (void); protected: /// Destructor. diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index 32af058cd1c..30dd0c98c71 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -40,7 +40,6 @@ TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChan added[0].type_name = CORBA::string_dup ("*"); this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_NEW_THROW_EX (this->notifier_, TAO_NotifyLogNotification(this->event_channel_.in ()), @@ -58,29 +57,24 @@ TAO_NotifyLogFactory_i::activate (CORBA::ORB_ptr orb, ACE_ENV_ARG_DECL) { TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ()); PortableServer::ObjectId_var oid = this->factory_poa_->activate_object (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ()); CORBA::Object_var obj = this->factory_poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ()); // narrow and store the result.. this->log_mgr_ = DsLogAdmin::LogMgr::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ()); DsNotifyLogAdmin::NotifyLogFactory_var v_return = DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ()); return v_return._retn (); } @@ -111,17 +105,14 @@ TAO_NotifyLogFactory_i::create ( & thresholds, id_out ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ()); DsLogAdmin::LogId id = id_out; #if (TAO_HAS_MINIMUM_POA == 0) DsLogAdmin::Log_var log = this->create_log_reference (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ()); #else DsLogAdmin::Log_var log = this->create_log_object (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ()); #endif // narrow to NotifyLog @@ -130,7 +121,6 @@ TAO_NotifyLogFactory_i::create ( // @@ JTC - squelch exception? notifier_->object_creation (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ()); return notify_log._retn (); } @@ -162,16 +152,13 @@ TAO_NotifyLogFactory_i::create_with_id ( max_size, & thresholds ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ()); #if (TAO_HAS_MINIMUM_POA == 0) DsLogAdmin::Log_var log = this->create_log_reference (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ()); #else DsLogAdmin::Log_var log = this->create_log_object (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ()); #endif // narrow to NotifyLog @@ -180,7 +167,6 @@ TAO_NotifyLogFactory_i::create_with_id ( // @@ JTC - squelch exception? notifier_->object_creation (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ()); return notify_log._retn(); } @@ -207,29 +193,26 @@ TAO_NotifyLogFactory_i::create_log_servant (DsLogAdmin::LogId id id ), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); - notify_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + notify_log_i->init (); //initialise the LogConsumer object - notify_log_i->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + notify_log_i->activate (); return notify_log_i; } CosNotifyChannelAdmin::AdminID -TAO_NotifyLogFactory_i::MyID (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLogFactory_i::MyID (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return consumer_admin_->MyID (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer_admin_->MyID (); } CosNotifyChannelAdmin::EventChannel_ptr -TAO_NotifyLogFactory_i::MyChannel (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLogFactory_i::MyChannel (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -238,21 +221,21 @@ TAO_NotifyLogFactory_i::MyChannel (ACE_ENV_SINGLE_ARG_DECL) } CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_NotifyLogFactory_i::MyOperator (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLogFactory_i::MyOperator (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return consumer_admin_->MyOperator (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer_admin_->MyOperator (); } CosNotifyFilter::MappingFilter_ptr -TAO_NotifyLogFactory_i::priority_filter (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLogFactory_i::priority_filter (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return consumer_admin_->priority_filter (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer_admin_->priority_filter (); } void @@ -265,12 +248,12 @@ TAO_NotifyLogFactory_i::priority_filter (CosNotifyFilter::MappingFilter_ptr filt } CosNotifyFilter::MappingFilter_ptr -TAO_NotifyLogFactory_i::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLogFactory_i::lifetime_filter (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return consumer_admin_->lifetime_filter (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer_admin_->lifetime_filter (); } void @@ -283,21 +266,21 @@ TAO_NotifyLogFactory_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr filt } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_NotifyLogFactory_i::pull_suppliers (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLogFactory_i::pull_suppliers (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return consumer_admin_->pull_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer_admin_->pull_suppliers (); } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_NotifyLogFactory_i::push_suppliers (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLogFactory_i::push_suppliers (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return consumer_admin_->push_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer_admin_->push_suppliers (); } CosNotifyChannelAdmin::ProxySupplier_ptr @@ -343,7 +326,7 @@ TAO_NotifyLogFactory_i::obtain_push_supplier ( CORBA::SystemException )) { - return consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer_admin_->obtain_push_supplier (); } @@ -357,11 +340,11 @@ TAO_NotifyLogFactory_i::obtain_pull_supplier ( )) { - return consumer_admin_->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer_admin_->obtain_pull_supplier (); } void -TAO_NotifyLogFactory_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_NotifyLogFactory_i::destroy (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -383,12 +366,12 @@ TAO_NotifyLogFactory_i::subscription_change (const CosNotification::EventTypeSeq } CosNotification::QoSProperties* -TAO_NotifyLogFactory_i::get_qos (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLogFactory_i::get_qos (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return consumer_admin_->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer_admin_->get_qos (); } void @@ -442,21 +425,21 @@ TAO_NotifyLogFactory_i::get_filter (CosNotifyFilter::FilterID id ACE_ENV_ARG_DEC } CosNotifyFilter::FilterIDSeq* -TAO_NotifyLogFactory_i::get_all_filters (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLogFactory_i::get_all_filters (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return consumer_admin_->get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); + return consumer_admin_->get_all_filters (); } void -TAO_NotifyLogFactory_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLogFactory_i::remove_all_filters (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - consumer_admin_->remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); + consumer_admin_->remove_all_filters (); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h index bbe8127c077..c76098a88ac 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h @@ -104,22 +104,22 @@ public: // = Methods from CosNotifyChannelAdmin::ConsumerAdmin. - CosNotifyChannelAdmin::AdminID MyID (ACE_ENV_SINGLE_ARG_DECL) + CosNotifyChannelAdmin::AdminID MyID (void) ACE_THROW_SPEC (( CORBA::SystemException )); - CosNotifyChannelAdmin::EventChannel_ptr MyChannel (ACE_ENV_SINGLE_ARG_DECL) + CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void) ACE_THROW_SPEC (( CORBA::SystemException )); - CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (ACE_ENV_SINGLE_ARG_DECL) + CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void) ACE_THROW_SPEC (( CORBA::SystemException )); - CosNotifyFilter::MappingFilter_ptr priority_filter (ACE_ENV_SINGLE_ARG_DECL) + CosNotifyFilter::MappingFilter_ptr priority_filter (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -128,7 +128,7 @@ public: CORBA::SystemException )); - CosNotifyFilter::MappingFilter_ptr lifetime_filter (ACE_ENV_SINGLE_ARG_DECL) + CosNotifyFilter::MappingFilter_ptr lifetime_filter (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -137,11 +137,11 @@ public: CORBA::SystemException )); - CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (ACE_ENV_SINGLE_ARG_DECL) + CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (void) ACE_THROW_SPEC (( CORBA::SystemException )); - CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (ACE_ENV_SINGLE_ARG_DECL) + CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -183,7 +183,7 @@ public: CORBA::SystemException )); - void destroy (ACE_ENV_SINGLE_ARG_DECL) + void destroy (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -198,7 +198,7 @@ public: )); /// CosNotification::QoSAdmin. - CosNotification::QoSProperties* get_qos (ACE_ENV_SINGLE_ARG_DECL) + CosNotification::QoSProperties* get_qos (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -229,11 +229,11 @@ public: CosNotifyFilter::FilterNotFound, CORBA::SystemException )); - CosNotifyFilter::FilterIDSeq* get_all_filters (ACE_ENV_SINGLE_ARG_DECL) + CosNotifyFilter::FilterIDSeq* get_all_filters (void) ACE_THROW_SPEC (( CORBA::SystemException )); - void remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) + void remove_all_filters (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -241,7 +241,7 @@ public: protected: virtual CORBA::RepositoryId create_repositoryid (); - + virtual PortableServer::ServantBase* create_log_servant (DsLogAdmin::LogId id ACE_ENV_ARG_DECL); diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index 1a3762a4d51..f8feede1227 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -16,34 +16,30 @@ TAO_NotifyLogNotification::TAO_NotifyLogNotification ( event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec)) { ACE_DECLARE_NEW_CORBA_ENV; - + CosNotifyComm::PushSupplier_var objref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); ACE_ASSERT (!CORBA::is_nil (objref.in ())); CosNotifyChannelAdmin::AdminID adminID; - CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin = + CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin = this->event_channel_->new_for_suppliers (CosNotifyChannelAdmin::OR_OP, adminID); ACE_ASSERT (!CORBA::is_nil (supplier_admin.in ())); CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::ANY_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); proxy_consumer_->connect_any_push_supplier (objref.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } TAO_NotifyLogNotification::~TAO_NotifyLogNotification (void) @@ -56,7 +52,7 @@ TAO_NotifyLogNotification::send_notification (const CORBA::Any& any) ACE_THROW_SPEC (( CORBA::SystemException )) -{ +{ this->proxy_consumer_->push (any); } @@ -75,14 +71,14 @@ TAO_NotifyLogNotification::subscription_change void TAO_NotifyLogNotification::disconnect_push_supplier - (ACE_ENV_SINGLE_ARG_DECL) + (void) ACE_THROW_SPEC (( CORBA::SystemException )) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER); + this->proxy_consumer_->disconnect_push_consumer(); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index db13c800447..05c9b970d77 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -52,20 +52,16 @@ TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL) { DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory = DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); - CosNotification::QoSProperties* qos = get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); + CosNotification::QoSProperties* qos = get_qos (); - CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); + CosNotification::AdminProperties* admin = get_admin (); DsNotifyLogAdmin::NotifyLog_var log = notifyLogFactory->create (DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties> (*qos), static_cast<const CosNotification::AdminProperties> (*admin), id); this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); return log._retn (); } @@ -78,50 +74,42 @@ TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL) { DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory = DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); - CosNotification::QoSProperties* qos = get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); + CosNotification::QoSProperties* qos = get_qos (); - CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); + CosNotification::AdminProperties* admin = get_admin (); DsNotifyLogAdmin::NotifyLog_var log = notifyLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties> (*qos), static_cast<const CosNotification::AdminProperties> (*admin)); this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); return log._retn (); } void -TAO_NotifyLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLog_i::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Remove ourselves from the list of logs. this->logmgr_i_.remove (this->logid_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Deregister with POA. PortableServer::ObjectId_var id = this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->poa_->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLog_i::activate (void) { CosNotifyChannelAdmin::AdminID adminid = 0; @@ -130,18 +118,15 @@ TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL) this->consumer_admin_ = this->event_channel_->new_for_consumers (ifgop, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); CosNotifyFilter::FilterFactory_var ffact = - this->event_channel_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->event_channel_->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 ())); @@ -152,10 +137,8 @@ TAO_NotifyLog_i::activate (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; // Setup the CA to receive all type of events CosNotification::EventTypeSeq added(1); @@ -167,7 +150,6 @@ TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL) added[0].type_name = CORBA::string_dup ("*"); this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_NEW_THROW_EX (this->my_log_consumer_, TAO_Notify_LogConsumer (this), @@ -178,7 +160,7 @@ TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL) //IDL to C++ CosNotifyFilter::Filter_ptr -TAO_NotifyLog_i::get_filter (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLog_i::get_filter (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -200,7 +182,7 @@ TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */ } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_NotifyLog_i::MyFactory (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLog_i::MyFactory (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -210,30 +192,30 @@ TAO_NotifyLog_i::MyFactory (ACE_ENV_SINGLE_ARG_DECL) } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_NotifyLog_i::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLog_i::default_consumer_admin (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->event_channel_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->default_consumer_admin (); } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_NotifyLog_i::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLog_i::default_supplier_admin (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->event_channel_->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->default_supplier_admin (); } CosNotifyFilter::FilterFactory_ptr -TAO_NotifyLog_i::default_filter_factory (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLog_i::default_filter_factory (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->event_channel_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->default_filter_factory (); } CosNotifyChannelAdmin::ConsumerAdmin_ptr @@ -277,30 +259,30 @@ TAO_NotifyLog_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_AR } CosNotifyChannelAdmin::AdminIDSeq* -TAO_NotifyLog_i::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLog_i::get_all_consumeradmins (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->event_channel_->get_all_consumeradmins (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->get_all_consumeradmins (); } CosNotifyChannelAdmin::AdminIDSeq* -TAO_NotifyLog_i::get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLog_i::get_all_supplieradmins (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->event_channel_->get_all_supplieradmins (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->get_all_supplieradmins (); } CosNotification::AdminProperties* -TAO_NotifyLog_i::get_admin (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLog_i::get_admin (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->event_channel_->get_admin (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->get_admin (); } void @@ -314,7 +296,7 @@ TAO_NotifyLog_i::set_admin (const CosNotification::AdminProperties& admin ACE_EN } CosNotification::QoSProperties* -TAO_NotifyLog_i::get_qos (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLog_i::get_qos (void) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -349,12 +331,12 @@ TAO_NotifyLog_i::validate_qos ( } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_NotifyLog_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL) +TAO_NotifyLog_i::for_consumers (void) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->event_channel_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->for_consumers(); } CosEventChannelAdmin::SupplierAdmin_ptr @@ -365,7 +347,7 @@ TAO_NotifyLog_i::for_suppliers ( CORBA::SystemException )) { - return this->event_channel_->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->for_suppliers(); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h index 81218cf3962..d28cb229b6b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h @@ -83,16 +83,16 @@ public: /// Destroy the log object and all contained records. void - destroy (ACE_ENV_SINGLE_ARG_DECL) + destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Activate the NotifyLog. void - activate (ACE_ENV_SINGLE_ARG_DECL); + activate (void); // = Methods from CosNotifyChannelAdmin::EventChannel. CosNotifyFilter::Filter_ptr - get_filter (ACE_ENV_SINGLE_ARG_DECL) + get_filter (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -103,25 +103,25 @@ public: )); CosNotifyChannelAdmin::EventChannelFactory_ptr - MyFactory (ACE_ENV_SINGLE_ARG_DECL) + MyFactory (void) ACE_THROW_SPEC (( CORBA::SystemException )); CosNotifyChannelAdmin::ConsumerAdmin_ptr - default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) + default_consumer_admin (void) ACE_THROW_SPEC (( CORBA::SystemException )); CosNotifyChannelAdmin::SupplierAdmin_ptr - default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL) + default_supplier_admin (void) ACE_THROW_SPEC (( CORBA::SystemException )); CosNotifyFilter::FilterFactory_ptr - default_filter_factory (ACE_ENV_SINGLE_ARG_DECL) + default_filter_factory (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -155,19 +155,19 @@ public: )); CosNotifyChannelAdmin::AdminIDSeq* - get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL) + get_all_consumeradmins (void) ACE_THROW_SPEC (( CORBA::SystemException )); CosNotifyChannelAdmin::AdminIDSeq* - get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL) + get_all_supplieradmins (void) ACE_THROW_SPEC (( CORBA::SystemException )); CosNotification::AdminProperties* - get_admin (ACE_ENV_SINGLE_ARG_DECL) + get_admin (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -179,7 +179,7 @@ public: )); CosNotification::QoSProperties* - get_qos (ACE_ENV_SINGLE_ARG_DECL) + get_qos (void) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -199,13 +199,13 @@ public: // = Methods from DsEventLogAdmin::EventLog. CosEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (ACE_ENV_SINGLE_ARG_DECL) + for_consumers (void) ACE_THROW_SPEC (( CORBA::SystemException )); CosEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (ACE_ENV_SINGLE_ARG_DECL) + for_suppliers (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp index 08a2cfd036e..ec298fc21e1 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp @@ -53,12 +53,11 @@ TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DE this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_Rtec_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_Rtec_LogConsumer::disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->supplier_proxy_->disconnect_push_supplier ( diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h index 05fdb9d65f4..676f984c689 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h @@ -69,7 +69,7 @@ public: private: /// Disconnect from EventLog. - void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) + void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// This method will call TAO_Log_i::log() to write diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp index bffeb96ecf4..bb267fc1758 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp @@ -38,12 +38,10 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb, ACE_ENV_ARG_DECL) { TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); PortableServer::POA_var defPOA = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->_default_POA (); TAO_EC_Event_Channel_Attributes attr (defPOA.in (), defPOA.in ()); @@ -51,27 +49,23 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb, ACE_NEW_THROW_EX (impl, TAO_EC_Event_Channel (attr), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (-1); auto_ptr <TAO_EC_Event_Channel> ec (impl); - impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + impl->activate (); PortableServer::ObjectId_var oidec = poa_->activate_object (ec.get () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ec.release (); CORBA::Object_var objec = poa_->id_to_reference (oidec.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->event_channel_ = RtecEventChannelAdmin::EventChannel::_narrow (objec.in ()); - this->consumer_admin_ = this->event_channel_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER); + this->consumer_admin_ = this->event_channel_->for_consumers(); ACE_NEW_THROW_EX (this->notifier_, TAO_RTEventLogNotification(this->event_channel_.in ()), @@ -80,30 +74,26 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb, } RTEventLogAdmin::EventLogFactory_ptr -TAO_RTEventLogFactory_i::activate (ACE_ENV_SINGLE_ARG_DECL) +TAO_RTEventLogFactory_i::activate (void) { RTEventLogAdmin::EventLogFactory_var v_return; PortableServer::ObjectId_var oid = this->factory_poa_->activate_object (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (v_return._retn ()); CORBA::Object_var obj = this->factory_poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (v_return._retn ()); // narrow and store the result.. this->log_mgr_ = DsLogAdmin::LogMgr::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (v_return._retn ()); v_return = RTEventLogAdmin::EventLogFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (RTEventLogAdmin::EventLogFactory::_nil ()); return v_return._retn (); } @@ -127,17 +117,14 @@ TAO_RTEventLogFactory_i::create ( & thresholds, id_out ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ()); DsLogAdmin::LogId id = id_out; #if (TAO_HAS_MINIMUM_POA == 0) DsLogAdmin::Log_var log = this->create_log_reference (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ()); #else DsLogAdmin::Log_var log = this->create_log_object (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ()); #endif // narrow to EventLog @@ -146,7 +133,6 @@ TAO_RTEventLogFactory_i::create ( // @@ JTC - squelch exception? notifier_->object_creation (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ()); return event_log._retn(); } @@ -171,16 +157,13 @@ TAO_RTEventLogFactory_i::create_with_id ( max_size, & thresholds ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ()); #if (TAO_HAS_MINIMUM_POA == 0) DsLogAdmin::Log_var log = this->create_log_reference (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ()); #else DsLogAdmin::Log_var log = this->create_log_object (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ()); #endif // narrow to EventLog @@ -189,7 +172,6 @@ TAO_RTEventLogFactory_i::create_with_id ( // @@ JTC - squelch exception? notifier_->object_creation (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ()); return event_log._retn (); } @@ -216,14 +198,11 @@ TAO_RTEventLogFactory_i::create_log_servant (DsLogAdmin::LogId id id ), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); - event_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + event_log_i->init (); //initialise the LogConsumer object - event_log_i->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + event_log_i->activate (); return event_log_i; } diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h index d416bd028ec..335f2d86a52 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h @@ -68,7 +68,7 @@ public: /// Activate this servant RTEventLogAdmin::EventLogFactory_ptr - activate (ACE_ENV_SINGLE_ARG_DECL); + activate (void); /// Used to create a RTEventLog. RTEventLogAdmin::EventLog_ptr create ( @@ -110,7 +110,7 @@ public: protected: virtual CORBA::RepositoryId create_repositoryid (); - + virtual PortableServer::ServantBase* create_log_servant (DsLogAdmin::LogId id ACE_ENV_ARG_DECL); diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp index d3ceeb987e8..8c43975ff2f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp @@ -31,7 +31,7 @@ TAO_RTEventLogNotification::TAO_RTEventLogNotification ( { ACE_DECLARE_NEW_CORBA_ENV; - obtainProxyConsumer (ACE_ENV_SINGLE_ARG_PARAMETER); + obtainProxyConsumer (); } TAO_RTEventLogNotification::~TAO_RTEventLogNotification (void) @@ -40,14 +40,14 @@ TAO_RTEventLogNotification::~TAO_RTEventLogNotification (void) } void -TAO_RTEventLogNotification::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_RTEventLogNotification::disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // No-Op. } void -TAO_RTEventLogNotification::obtainProxyConsumer (ACE_ENV_SINGLE_ARG_DECL) +TAO_RTEventLogNotification::obtainProxyConsumer (void) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = event_channel_->for_suppliers(); @@ -55,7 +55,7 @@ TAO_RTEventLogNotification::obtainProxyConsumer (ACE_ENV_SINGLE_ARG_DECL) consumer_ = supplier_admin->obtain_push_consumer(); RtecEventComm::PushSupplier_var supplier = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + this->_this (); // Simple publication, but usually the helper classes in // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this. diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h index 785efe87c79..a2530fe0783 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h @@ -58,7 +58,7 @@ public: ~TAO_RTEventLogNotification (void); /// The skeleton methods. - virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -66,7 +66,7 @@ protected: /// Used to connect this PushSupplier to the EventChannel /// that will log these events. - void obtainProxyConsumer (ACE_ENV_SINGLE_ARG_DECL); + void obtainProxyConsumer (void); // Send the event on the event channel. virtual void send_notification (const CORBA::Any& any) diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index 3aacac1ff86..425c5807ad7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -54,15 +54,12 @@ TAO_RTEventLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL) { RTEventLogAdmin::EventLogFactory_var eventLogFactory = RTEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); RTEventLogAdmin::EventLog_var log = eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); copy_attributes (log.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); return log._retn (); } @@ -73,58 +70,50 @@ TAO_RTEventLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL) { RTEventLogAdmin::EventLogFactory_var eventLogFactory = RTEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); RTEventLogAdmin::EventLog_var log = eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); copy_attributes (log.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); return log._retn (); } void -TAO_RTEventLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL) +TAO_RTEventLog_i::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Remove ourselves from the list of logs. this->logmgr_i_.remove (this->logid_ - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_ENV_ARG_PARAMETER); // Deregister with POA. PortableServer::ObjectId_var id = this->log_poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->log_poa_->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -TAO_RTEventLog_i::activate (ACE_ENV_SINGLE_ARG_DECL) +TAO_RTEventLog_i::activate (void) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->event_channel_->for_consumers (); this->my_log_consumer_ = new TAO_Rtec_LogConsumer (this); this->my_log_consumer_->connect (consumer_admin.in ()); } RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_RTEventLog_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL) +TAO_RTEventLog_i::for_consumers (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->event_channel_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->for_consumers(); } RtecEventChannelAdmin::SupplierAdmin_ptr @@ -135,7 +124,7 @@ TAO_RTEventLog_i::for_suppliers ( CORBA::SystemException )) { - return this->event_channel_->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER); + return this->event_channel_->for_suppliers(); } RtecEventChannelAdmin::Observer_Handle diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h index 6dc0b4975b3..fca0ae6e58f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h @@ -81,20 +81,20 @@ public: /// Destroy the log object and all contained records. void - destroy (ACE_ENV_SINGLE_ARG_DECL) + destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Activate the RTEventLog. void - activate (ACE_ENV_SINGLE_ARG_DECL); + activate (void); // = The RtecEventChannelAdmin::EventChannel interface methods. RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (ACE_ENV_SINGLE_ARG_DECL) + for_consumers (void) ACE_THROW_SPEC ((CORBA::SystemException)); RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (ACE_ENV_SINGLE_ARG_DECL) + for_suppliers (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::Observer_Handle |