diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Log/Log_i.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Log_i.h | 127 |
1 files changed, 51 insertions, 76 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 38d0ffa0e54..60caca26dfc 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,78 +71,73 @@ 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. - void set_log_qos (const DsLogAdmin::QoSList & qos - ACE_ENV_ARG_DECL) + void set_log_qos (const DsLogAdmin::QoSList & qos) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)); /// 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). void - set_max_record_life (CORBA::ULong life - ACE_ENV_ARG_DECL) + set_max_record_life (CORBA::ULong life) ACE_THROW_SPEC ((CORBA::SystemException)); /// 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. void - set_max_size (CORBA::ULongLong size - ACE_ENV_ARG_DECL) + set_max_size (CORBA::ULongLong size) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)); /// 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. void - set_log_full_action (DsLogAdmin::LogFullActionType action - ACE_ENV_ARG_DECL) + set_log_full_action (DsLogAdmin::LogFullActionType action) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidLogFullAction)); /// 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. void - set_administrative_state (DsLogAdmin::AdministrativeState state - ACE_ENV_ARG_DECL) + set_administrative_state (DsLogAdmin::AdministrativeState state) ACE_THROW_SPEC ((CORBA::SystemException)); /// Get the forwarding state of the log. @@ -150,42 +145,40 @@ 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. /// @@ Note: is it ok to make this method virtual? void - set_forwarding_state (DsLogAdmin::ForwardingState state - ACE_ENV_ARG_DECL) + set_forwarding_state (DsLogAdmin::ForwardingState state) ACE_THROW_SPEC ((CORBA::SystemException)); /// 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. void - set_interval (const DsLogAdmin::TimeInterval & interval - ACE_ENV_ARG_DECL) + set_interval (const DsLogAdmin::TimeInterval & interval) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval)); /// 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)); /** @@ -198,20 +191,18 @@ public: */ void set_capacity_alarm_thresholds - (const DsLogAdmin::CapacityAlarmThresholdList & threshs - ACE_ENV_ARG_DECL) + (const DsLogAdmin::CapacityAlarmThresholdList & threshs) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidThreshold)); /// 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. void - set_week_mask (const DsLogAdmin::WeekMask & masks - ACE_ENV_ARG_DECL) + set_week_mask (const DsLogAdmin::WeekMask & masks) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval, @@ -222,8 +213,7 @@ public: DsLogAdmin::RecordList* query (const char * grammar, const char * c, - DsLogAdmin::Iterator_out i - ACE_ENV_ARG_DECL) + DsLogAdmin::Iterator_out i) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)); @@ -233,15 +223,13 @@ public: DsLogAdmin::RecordList* retrieve (DsLogAdmin::TimeT from_time, CORBA::Long how_many, - DsLogAdmin::Iterator_out i - ACE_ENV_ARG_DECL) + DsLogAdmin::Iterator_out i) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns the number of records matching constraint <c>. CORBA::ULong match (const char * grammar, - const char * c - ACE_ENV_ARG_DECL) + const char * c) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)); @@ -249,23 +237,20 @@ public: /// Delete records matching constraint <c>. CORBA::ULong delete_records (const char * grammar, - const char * c - ACE_ENV_ARG_DECL) + const char * c) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)); /// Delete records matching ids in <ids> CORBA::ULong - delete_records_by_id (const DsLogAdmin::RecordIdList & ids - ACE_ENV_ARG_DECL) + delete_records_by_id (const DsLogAdmin::RecordIdList & ids) ACE_THROW_SPEC ((CORBA::SystemException)); /// Write records to the log storage. void - write_records (const DsLogAdmin::Anys & records - ACE_ENV_ARG_DECL) + write_records (const DsLogAdmin::Anys & records) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogFull, DsLogAdmin::LogOffDuty, @@ -275,8 +260,7 @@ public: /// Write a list of record ids to storage. Raises DsLogAdmin::LogFull /// and DsLogAdmin::LogLocked void - write_recordlist (const DsLogAdmin::RecordList & list - ACE_ENV_ARG_DECL) + write_recordlist (const DsLogAdmin::RecordList & list) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogFull, DsLogAdmin::LogOffDuty, @@ -286,8 +270,7 @@ public: /// Set single record attributes. void set_record_attribute (DsLogAdmin::RecordId id, - const DsLogAdmin::NVList & attr_list - ACE_ENV_ARG_DECL) + const DsLogAdmin::NVList & attr_list) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId, DsLogAdmin::InvalidAttribute)); @@ -297,8 +280,7 @@ public: CORBA::ULong set_records_attribute (const char * grammar, const char * c, - const DsLogAdmin::NVList & attr_list - ACE_ENV_ARG_DECL) + const DsLogAdmin::NVList & attr_list) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint, @@ -307,61 +289,56 @@ public: /// Get the attributes of the record with id <id>. Raises /// DsLogAdmin::InvalidRecordId DsLogAdmin::NVList* - get_record_attribute (DsLogAdmin::RecordId id - ACE_ENV_ARG_DECL) + get_record_attribute (DsLogAdmin::RecordId id) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId)); /// 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. - void copy_attributes (DsLogAdmin::Log_ptr log - ACE_ENV_ARG_DECL) + void copy_attributes (DsLogAdmin::Log_ptr log) 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. static CORBA::Boolean validate_capacity_alarm_thresholds ( - const DsLogAdmin::CapacityAlarmThresholdList & threshs - ACE_ENV_ARG_DECL) + const DsLogAdmin::CapacityAlarmThresholdList & threshs) ACE_THROW_SPEC ((CORBA::SystemException)); /// Reset Log QoS - void reset_log_qos (const DsLogAdmin::QoSList& qos - ACE_ENV_ARG_DECL); + void reset_log_qos (const DsLogAdmin::QoSList& qos); /// Validate log QoS - void validate_log_qos (const DsLogAdmin::QoSList& qos - ACE_ENV_ARG_DECL) + void validate_log_qos (const DsLogAdmin::QoSList& qos) ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS)); /// Reset Week Mask @@ -370,16 +347,14 @@ protected: /// week mask list when the log service starts, and to reinitialize /// them when they are changed. /// - void reset_week_mask (const DsLogAdmin::WeekMask& masks - ACE_ENV_ARG_DECL); + void reset_week_mask (const DsLogAdmin::WeekMask& masks); /// Validate Week Mask /// /// Used to check whether week mask is valid. If not, throws an /// InvalidTime, InvalidTimeInterval, or InvalidMask exception. /// - void validate_week_mask (const DsLogAdmin::WeekMask& masks - ACE_ENV_ARG_DECL) + void validate_week_mask (const DsLogAdmin::WeekMask& masks) ACE_THROW_SPEC ((DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval, DsLogAdmin::InvalidMask)); @@ -394,7 +369,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 +413,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 +464,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); |