diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-06-18 03:05:07 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-06-18 03:05:07 +0000 |
| commit | a6c7a130ef80a55b0400c18be8cdca155610e09b (patch) | |
| tree | cd3792df10b9e8e5c82225dea174a2792c6cc7b9 | |
| parent | 2ab7fc461bfe9ef9acf5fef718dcc40f60894cf2 (diff) | |
| download | ATCD-a6c7a130ef80a55b0400c18be8cdca155610e09b.tar.gz | |
ChangeLogTag: Fri Jun 17 19:54:46 2005 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | TAO/ChangeLog | 20 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/Log_i.cpp | 2 |
4 files changed, 23 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5a8b303022c..ca13824557b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,23 @@ +Fri Jun 17 19:54:46 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/orbsvcs/Log/LogRecordStore.h (LOG_DEFAULT_MAX_REC_LIST_LEN): + * orbsvcs/orbsvcs/Log/LogRecordStore_persist.h (LOG_DEFAULT_MAX_REC_LIST_LEN): + + Changed the maximum number of records that can be returned by + query() without using an iterator from 30 to 100. This should + probably be a parameter that is set specified when the service + is started, but until it is, 100 is a more reasonable default. + + From documentation available on line, the Orbix log service + implementation defaults to 100 records, the VisiBroker + implementation defaults to 1000. + + * orbsvcs/orbsvcs/Log/Log_i.cpp (query_i): + + The ACE_LACKS_LONGLONG_T case cast the 64 bit log record fields + "id" and "time" to 32 bits, but the format directive still used + %Q. Changed to "%d". + Fri Jun 17 19:02:11 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index 2e2acc5f898..7ae229e19c0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -31,7 +31,7 @@ #include "ace/Null_Mutex.h" #include "log_serv_export.h" -#define LOG_DEFAULT_MAX_REC_LIST_LEN 30 +#define LOG_DEFAULT_MAX_REC_LIST_LEN 100 /** * @class TAO_LogRecordStore diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h index b9c6239025c..67519082f4e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h @@ -36,7 +36,7 @@ #define PERSISTENT_LOG_FILE_NAME "LOG.DATA" -#define LOG_DEFAULT_MAX_REC_LIST_LEN 30 +#define LOG_DEFAULT_MAX_REC_LIST_LEN 100 /** * @class TAO_LogRecordStore diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index d42c5a05fcd..afe37e6ca5e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -662,7 +662,7 @@ TAO_Log_i::query_i (const char *constraint, { if (TAO_debug_level > 0) #if defined (ACE_LACKS_LONGLONG_T) - ACE_DEBUG ((LM_DEBUG,"Matched constraint! d = %Q, Time = %Q\n", + ACE_DEBUG ((LM_DEBUG,"Matched constraint! d = %d, Time = %d\n", ACE_U64_TO_U32 ((*iter).int_id_.id), ACE_U64_TO_U32 ((*iter).int_id_.time))); |