diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-23 01:19:02 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-23 01:19:02 +0000 |
| commit | 67244a6b95bc70ec64022aefb377c30cc7f7b646 (patch) | |
| tree | 2b066abab476d8dac79f8a5998f2bad564c4530a | |
| parent | 45f0943909f4a513ae149e5b68e4ceed1a4c673f (diff) | |
| download | ATCD-67244a6b95bc70ec64022aefb377c30cc7f7b646.tar.gz | |
ChangeLogTag: Sun May 22 18:02:07 2005 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Log_i.cpp | 44 |
2 files changed, 47 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index bc0de386304..c70fb96ccca 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Sun May 22 18:02:07 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/orbsvcs/Log/Log_i.cpp (TAO_Log_i::delete_records): + * orbsvcs/orbsvcs/Log/Log_i.cpp (TAO_Log_i::remove_old_records): + + Like delete_records_by_id(), reset "log_full" if "current_size" + is less than "max_size". + Sun May 22 17:01:56 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/Log/Log_i.cpp (TAO_Log_i::scheduled): diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 8e8d7eac2f7..3ed1588812c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -820,9 +820,26 @@ TAO_Log_i::delete_records (const char *grammar, CORBA::ULong count = this->match_i (constraint, 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (count); + ACE_CHECK_RETURN (0); + + if (count > 0) + { + const CORBA::ULongLong current_size = + this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + const CORBA::ULongLong max_size = + this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + if (current_size < max_size) + { + avail_status_.log_full = 0; + } + } this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (0); return count; } @@ -835,17 +852,17 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids this->remove_old_records (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::ULong numdone (0); + CORBA::ULong count (0); for (CORBA::ULong i = 0; i < ids.length (); i++) { if (this->recordstore_.remove (ids [i]) == 0) { - numdone++; + count++; } } - if (numdone > 0) + if (count > 0) { const CORBA::ULongLong current_size = this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -864,7 +881,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); - return numdone; + return count; } void @@ -1285,6 +1302,23 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL) count++; } } + + if (count > 0) + { + const CORBA::ULongLong current_size = + this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + const CORBA::ULongLong max_size = + this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + if (current_size < max_size) + { + avail_status_.log_full = 0; + } + } + this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } |