[rhmessaging-commits] rhmessaging commits: r2130 - in store/trunk: cpp/lib/gen/qpid/management and 1 other directories.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Wed Jun 4 19:18:47 EDT 2008
Author: tedross
Date: 2008-06-04 19:18:47 -0400 (Wed, 04 Jun 2008)
New Revision: 2130
Modified:
store/trunk/cpp/lib/JournalImpl.cpp
store/trunk/cpp/lib/JournalImpl.h
store/trunk/cpp/lib/gen/qpid/management/Journal.cpp
store/trunk/cpp/lib/gen/qpid/management/Journal.h
store/trunk/cpp/lib/gen/qpid/management/Store.cpp
store/trunk/cpp/lib/gen/qpid/management/Store.h
store/trunk/specs/management-schema.xml
Log:
Cleaned up element names in journal management class
Modified: store/trunk/cpp/lib/JournalImpl.cpp
===================================================================
--- store/trunk/cpp/lib/JournalImpl.cpp 2008-06-04 21:20:00 UTC (rev 2129)
+++ store/trunk/cpp/lib/JournalImpl.cpp 2008-06-04 23:18:47 UTC (rev 2130)
@@ -79,10 +79,10 @@
(new qpid::management::Journal((qpid::management::Manageable*) this));
_mgmtObject->set_name(journalId);
- _mgmtObject->set_journalDirectory(journalDirectory);
- _mgmtObject->set_journalBaseFileName(journalBaseFilename);
- _mgmtObject->set_journalReadPageSize(JRNL_RMGR_PAGE_SIZE * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE);
- _mgmtObject->set_journalReadPages(JRNL_RMGR_PAGES);
+ _mgmtObject->set_directory(journalDirectory);
+ _mgmtObject->set_baseFileName(journalBaseFilename);
+ _mgmtObject->set_readPageSize(JRNL_RMGR_PAGE_SIZE * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE);
+ _mgmtObject->set_readPages(JRNL_RMGR_PAGES);
agent->addObject(_mgmtObject);
}
@@ -145,9 +145,9 @@
{
_mgmtObject->set_initialFileCount(_num_jfiles);
_mgmtObject->set_dataFileSize(_jfsize_sblks * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE);
- _mgmtObject->set_journalCurrentFileCount(_num_jfiles);
- _mgmtObject->set_journalWritePageSize(wcache_pgsize_sblks * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE);
- _mgmtObject->set_journalWritePages(wcache_num_pages);
+ _mgmtObject->set_currentFileCount(_num_jfiles);
+ _mgmtObject->set_writePageSize(wcache_pgsize_sblks * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE);
+ _mgmtObject->set_writePages(wcache_num_pages);
}
}
@@ -207,10 +207,10 @@
{
_mgmtObject->set_initialFileCount(_num_jfiles);
_mgmtObject->set_dataFileSize(_jfsize_sblks * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE);
- _mgmtObject->set_journalCurrentFileCount(_num_jfiles);
- _mgmtObject->set_journalRecordDepth(_emap.size());
- _mgmtObject->set_journalWritePageSize(wcache_pgsize_sblks * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE);
- _mgmtObject->set_journalWritePages(wcache_num_pages);
+ _mgmtObject->set_currentFileCount(_num_jfiles);
+ _mgmtObject->set_recordDepth(_emap.size());
+ _mgmtObject->set_writePageSize(wcache_pgsize_sblks * JRNL_SBLK_SIZE * JRNL_DBLK_SIZE);
+ _mgmtObject->set_writePages(wcache_num_pages);
}
}
@@ -299,8 +299,8 @@
if (_mgmtObject.get() != 0)
{
- _mgmtObject->inc_journalRecordEnqueues();
- _mgmtObject->inc_journalRecordDepth();
+ _mgmtObject->inc_recordEnqueues();
+ _mgmtObject->inc_recordDepth();
}
}
@@ -312,8 +312,8 @@
if (_mgmtObject.get() != 0)
{
- _mgmtObject->inc_journalRecordEnqueues();
- _mgmtObject->inc_journalRecordDepth();
+ _mgmtObject->inc_recordEnqueues();
+ _mgmtObject->inc_recordDepth();
}
}
@@ -325,8 +325,8 @@
if (_mgmtObject.get() != 0)
{
- _mgmtObject->inc_journalRecordEnqueues();
- _mgmtObject->inc_journalRecordDepth();
+ _mgmtObject->inc_recordEnqueues();
+ _mgmtObject->inc_recordDepth();
}
}
@@ -338,8 +338,8 @@
if (_mgmtObject.get() != 0)
{
- _mgmtObject->inc_journalRecordEnqueues();
- _mgmtObject->inc_journalRecordDepth();
+ _mgmtObject->inc_recordEnqueues();
+ _mgmtObject->inc_recordDepth();
}
}
@@ -350,8 +350,8 @@
if (_mgmtObject.get() != 0)
{
- _mgmtObject->inc_journalRecordDequeues();
- _mgmtObject->dec_journalRecordDepth();
+ _mgmtObject->inc_recordDequeues();
+ _mgmtObject->dec_recordDepth();
}
}
@@ -362,8 +362,8 @@
if (_mgmtObject.get() != 0)
{
- _mgmtObject->inc_journalRecordDequeues();
- _mgmtObject->dec_journalRecordDepth();
+ _mgmtObject->inc_recordDequeues();
+ _mgmtObject->dec_recordDepth();
}
}
Modified: store/trunk/cpp/lib/JournalImpl.h
===================================================================
--- store/trunk/cpp/lib/JournalImpl.h 2008-06-04 21:20:00 UTC (rev 2129)
+++ store/trunk/cpp/lib/JournalImpl.h 2008-06-04 23:18:47 UTC (rev 2130)
@@ -196,10 +196,10 @@
// Management instrumentation callbacks overridden from jcntl
inline void instr_incr_outstanding_aio_cnt() {
- if (_mgmtObject.get() != 0) _mgmtObject->inc_journalOutstandingAIOs();
+ if (_mgmtObject.get() != 0) _mgmtObject->inc_outstandingAIOs();
}
inline void instr_decr_outstanding_aio_cnt() {
- if (_mgmtObject.get() != 0) _mgmtObject->dec_journalOutstandingAIOs();
+ if (_mgmtObject.get() != 0) _mgmtObject->dec_outstandingAIOs();
}
}; // class JournalImpl
Modified: store/trunk/cpp/lib/gen/qpid/management/Journal.cpp
===================================================================
--- store/trunk/cpp/lib/gen/qpid/management/Journal.cpp 2008-06-04 21:20:00 UTC (rev 2129)
+++ store/trunk/cpp/lib/gen/qpid/management/Journal.cpp 2008-06-04 23:18:47 UTC (rev 2130)
@@ -36,7 +36,7 @@
string Journal::packageName = string ("mrgstore");
string Journal::className = string ("journal");
uint8_t Journal::md5Sum[16] =
- {0xcd,0x98,0xdb,0x90,0xd7,0x0,0xc5,0x9f,0x17,0x0,0x50,0x0,0xfc,0xc2,0x45,0x86};
+ {0x0,0xdf,0x9a,0xf7,0x4,0x98,0x29,0x54,0xde,0x42,0xc5,0xf5,0xf5,0x13,0xab,0xa5};
Journal::Journal (Manageable* _core) :
ManagementObject(_core)
@@ -45,31 +45,31 @@
initialFileCount = 0;
dataFileSize = 0;
- journalCurrentFileCount = 0;
- journalRecordDepth = 0;
- journalRecordDepthHigh = 0;
- journalRecordDepthLow = 0;
- journalRecordEnqueues = 0;
- journalRecordDequeues = 0;
- journalOutstandingAIOs = 0;
- journalOutstandingAIOsHigh = 0;
- journalOutstandingAIOsLow = 0;
- journalFreeFileCount = 0;
- journalFreeFileCountHigh = 0;
- journalFreeFileCountLow = 0;
- journalAvailableFileCount = 0;
- journalAvailableFileCountHigh = 0;
- journalAvailableFileCountLow = 0;
- journalWriteWaitFailures = 0;
- journalWriteBusyFailures = 0;
- journalReadRecordCount = 0;
- journalReadBusyFailures = 0;
- journalWritePageCacheDepth = 0;
- journalWritePageCacheDepthHigh = 0;
- journalWritePageCacheDepthLow = 0;
- journalReadPageCacheDepth = 0;
- journalReadPageCacheDepthHigh = 0;
- journalReadPageCacheDepthLow = 0;
+ currentFileCount = 0;
+ recordDepth = 0;
+ recordDepthHigh = 0;
+ recordDepthLow = 0;
+ recordEnqueues = 0;
+ recordDequeues = 0;
+ outstandingAIOs = 0;
+ outstandingAIOsHigh = 0;
+ outstandingAIOsLow = 0;
+ freeFileCount = 0;
+ freeFileCountHigh = 0;
+ freeFileCountLow = 0;
+ availableFileCount = 0;
+ availableFileCountHigh = 0;
+ availableFileCountLow = 0;
+ writeWaitFailures = 0;
+ writeBusyFailures = 0;
+ readRecordCount = 0;
+ readBusyFailures = 0;
+ writePageCacheDepth = 0;
+ writePageCacheDepthHigh = 0;
+ writePageCacheDepthLow = 0;
+ readPageCacheDepth = 0;
+ readPageCacheDepthHigh = 0;
+ readPageCacheDepthLow = 0;
}
@@ -120,7 +120,7 @@
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalDirectory");
+ ft.setString (NAME, "directory");
ft.setInt (TYPE, TYPE_SSTR);
ft.setInt (ACCESS, ACCESS_RO);
ft.setInt (INDEX, 0);
@@ -128,7 +128,7 @@
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalBaseFileName");
+ ft.setString (NAME, "baseFileName");
ft.setInt (TYPE, TYPE_SSTR);
ft.setInt (ACCESS, ACCESS_RO);
ft.setInt (INDEX, 0);
@@ -136,7 +136,7 @@
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalWritePageSize");
+ ft.setString (NAME, "writePageSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
ft.setInt (INDEX, 0);
@@ -145,7 +145,7 @@
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalWritePages");
+ ft.setString (NAME, "writePages");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
ft.setInt (INDEX, 0);
@@ -154,7 +154,7 @@
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalReadPageSize");
+ ft.setString (NAME, "readPageSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
ft.setInt (INDEX, 0);
@@ -163,7 +163,7 @@
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalReadPages");
+ ft.setString (NAME, "readPages");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
ft.setInt (INDEX, 0);
@@ -188,175 +188,175 @@
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalCurrentFileCount");
+ ft.setString (NAME, "currentFileCount");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files currently allocated to this journal");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalRecordDepth");
+ ft.setString (NAME, "recordDepth");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "record");
ft.setString (DESC, "Number of enqueued records (durable messages)");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalRecordDepthHigh");
+ ft.setString (NAME, "recordDepthHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "record");
ft.setString (DESC, "Number of enqueued records (durable messages) (High)");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalRecordDepthLow");
+ ft.setString (NAME, "recordDepthLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "record");
ft.setString (DESC, "Number of enqueued records (durable messages) (Low)");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalRecordEnqueues");
+ ft.setString (NAME, "recordEnqueues");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "Total enqueued records on journal");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalRecordDequeues");
+ ft.setString (NAME, "recordDequeues");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "Total dequeued records on journal");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalOutstandingAIOs");
+ ft.setString (NAME, "outstandingAIOs");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "aio_op");
ft.setString (DESC, "Number of outstanding AIO requests in Async IO system");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalOutstandingAIOsHigh");
+ ft.setString (NAME, "outstandingAIOsHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "aio_op");
ft.setString (DESC, "Number of outstanding AIO requests in Async IO system (High)");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalOutstandingAIOsLow");
+ ft.setString (NAME, "outstandingAIOsLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "aio_op");
ft.setString (DESC, "Number of outstanding AIO requests in Async IO system (Low)");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalFreeFileCount");
+ ft.setString (NAME, "freeFileCount");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files free on this journal. Includes free files trapped in holes.");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalFreeFileCountHigh");
+ ft.setString (NAME, "freeFileCountHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files free on this journal. Includes free files trapped in holes. (High)");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalFreeFileCountLow");
+ ft.setString (NAME, "freeFileCountLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files free on this journal. Includes free files trapped in holes. (Low)");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalAvailableFileCount");
+ ft.setString (NAME, "availableFileCount");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files available to be written. Excluding holes");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalAvailableFileCountHigh");
+ ft.setString (NAME, "availableFileCountHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files available to be written. Excluding holes (High)");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalAvailableFileCountLow");
+ ft.setString (NAME, "availableFileCountLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files available to be written. Excluding holes (Low)");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalWriteWaitFailures");
+ ft.setString (NAME, "writeWaitFailures");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "AIO Wait failures on write");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalWriteBusyFailures");
+ ft.setString (NAME, "writeBusyFailures");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "AIO Busy failures on write");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalReadRecordCount");
+ ft.setString (NAME, "readRecordCount");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "Records read from the journal");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalReadBusyFailures");
+ ft.setString (NAME, "readBusyFailures");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "AIO Busy failures on read");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalWritePageCacheDepth");
+ ft.setString (NAME, "writePageCacheDepth");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "wpage");
ft.setString (DESC, "Current depth of write-page-cache");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalWritePageCacheDepthHigh");
+ ft.setString (NAME, "writePageCacheDepthHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "wpage");
ft.setString (DESC, "Current depth of write-page-cache (High)");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalWritePageCacheDepthLow");
+ ft.setString (NAME, "writePageCacheDepthLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "wpage");
ft.setString (DESC, "Current depth of write-page-cache (Low)");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalReadPageCacheDepth");
+ ft.setString (NAME, "readPageCacheDepth");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "rpage");
ft.setString (DESC, "Current depth of read-page-cache");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalReadPageCacheDepthHigh");
+ ft.setString (NAME, "readPageCacheDepthHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "rpage");
ft.setString (DESC, "Current depth of read-page-cache (High)");
buf.put (ft);
ft = FieldTable ();
- ft.setString (NAME, "journalReadPageCacheDepthLow");
+ ft.setString (NAME, "readPageCacheDepthLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "rpage");
ft.setString (DESC, "Current depth of read-page-cache (Low)");
@@ -382,7 +382,7 @@
}
-void Journal::writeConfig (Buffer& buf)
+void Journal::writeProperties (Buffer& buf)
{
sys::Mutex::ScopedLock mutex(accessLock);
configChanged = false;
@@ -390,64 +390,65 @@
writeTimestamps (buf);
buf.putShortString (name);
buf.putLongLong (queueRef);
- buf.putShortString (journalDirectory);
- buf.putShortString (journalBaseFileName);
- buf.putLong (journalWritePageSize);
- buf.putLong (journalWritePages);
- buf.putLong (journalReadPageSize);
- buf.putLong (journalReadPages);
+ buf.putShortString (directory);
+ buf.putShortString (baseFileName);
+ buf.putLong (writePageSize);
+ buf.putLong (writePages);
+ buf.putLong (readPageSize);
+ buf.putLong (readPages);
}
-void Journal::writeInstrumentation (Buffer& buf, bool skipHeaders)
+void Journal::writeStatistics (Buffer& buf, bool skipHeaders)
{
sys::Mutex::ScopedLock mutex(accessLock);
instChanged = false;
+
if (!skipHeaders)
writeTimestamps (buf);
buf.putShort (initialFileCount);
buf.putLong (dataFileSize);
- buf.putLong (journalCurrentFileCount);
- buf.putLong (journalRecordDepth);
- buf.putLong (journalRecordDepthHigh);
- buf.putLong (journalRecordDepthLow);
- buf.putLongLong (journalRecordEnqueues);
- buf.putLongLong (journalRecordDequeues);
- buf.putLong (journalOutstandingAIOs);
- buf.putLong (journalOutstandingAIOsHigh);
- buf.putLong (journalOutstandingAIOsLow);
- buf.putLong (journalFreeFileCount);
- buf.putLong (journalFreeFileCountHigh);
- buf.putLong (journalFreeFileCountLow);
- buf.putLong (journalAvailableFileCount);
- buf.putLong (journalAvailableFileCountHigh);
- buf.putLong (journalAvailableFileCountLow);
- buf.putLongLong (journalWriteWaitFailures);
- buf.putLongLong (journalWriteBusyFailures);
- buf.putLongLong (journalReadRecordCount);
- buf.putLongLong (journalReadBusyFailures);
- buf.putLong (journalWritePageCacheDepth);
- buf.putLong (journalWritePageCacheDepthHigh);
- buf.putLong (journalWritePageCacheDepthLow);
- buf.putLong (journalReadPageCacheDepth);
- buf.putLong (journalReadPageCacheDepthHigh);
- buf.putLong (journalReadPageCacheDepthLow);
+ buf.putLong (currentFileCount);
+ buf.putLong (recordDepth);
+ buf.putLong (recordDepthHigh);
+ buf.putLong (recordDepthLow);
+ buf.putLongLong (recordEnqueues);
+ buf.putLongLong (recordDequeues);
+ buf.putLong (outstandingAIOs);
+ buf.putLong (outstandingAIOsHigh);
+ buf.putLong (outstandingAIOsLow);
+ buf.putLong (freeFileCount);
+ buf.putLong (freeFileCountHigh);
+ buf.putLong (freeFileCountLow);
+ buf.putLong (availableFileCount);
+ buf.putLong (availableFileCountHigh);
+ buf.putLong (availableFileCountLow);
+ buf.putLongLong (writeWaitFailures);
+ buf.putLongLong (writeBusyFailures);
+ buf.putLongLong (readRecordCount);
+ buf.putLongLong (readBusyFailures);
+ buf.putLong (writePageCacheDepth);
+ buf.putLong (writePageCacheDepthHigh);
+ buf.putLong (writePageCacheDepthLow);
+ buf.putLong (readPageCacheDepth);
+ buf.putLong (readPageCacheDepthHigh);
+ buf.putLong (readPageCacheDepthLow);
// Maintenance of hi-lo statistics
- journalRecordDepthHigh = journalRecordDepth;
- journalRecordDepthLow = journalRecordDepth;
- journalOutstandingAIOsHigh = journalOutstandingAIOs;
- journalOutstandingAIOsLow = journalOutstandingAIOs;
- journalFreeFileCountHigh = journalFreeFileCount;
- journalFreeFileCountLow = journalFreeFileCount;
- journalAvailableFileCountHigh = journalAvailableFileCount;
- journalAvailableFileCountLow = journalAvailableFileCount;
- journalWritePageCacheDepthHigh = journalWritePageCacheDepth;
- journalWritePageCacheDepthLow = journalWritePageCacheDepth;
- journalReadPageCacheDepthHigh = journalReadPageCacheDepth;
- journalReadPageCacheDepthLow = journalReadPageCacheDepth;
+ recordDepthHigh = recordDepth;
+ recordDepthLow = recordDepth;
+ outstandingAIOsHigh = outstandingAIOs;
+ outstandingAIOsLow = outstandingAIOs;
+ freeFileCountHigh = freeFileCount;
+ freeFileCountLow = freeFileCount;
+ availableFileCountHigh = availableFileCount;
+ availableFileCountLow = availableFileCount;
+ writePageCacheDepthHigh = writePageCacheDepth;
+ writePageCacheDepthLow = writePageCacheDepth;
+ readPageCacheDepthHigh = readPageCacheDepth;
+ readPageCacheDepthLow = readPageCacheDepth;
}
Modified: store/trunk/cpp/lib/gen/qpid/management/Journal.h
===================================================================
--- store/trunk/cpp/lib/gen/qpid/management/Journal.h 2008-06-04 21:20:00 UTC (rev 2129)
+++ store/trunk/cpp/lib/gen/qpid/management/Journal.h 2008-06-04 23:18:47 UTC (rev 2130)
@@ -43,50 +43,50 @@
// Properties
std::string name;
uint64_t queueRef;
- std::string journalDirectory;
- std::string journalBaseFileName;
- uint32_t journalWritePageSize;
- uint32_t journalWritePages;
- uint32_t journalReadPageSize;
- uint32_t journalReadPages;
+ std::string directory;
+ std::string baseFileName;
+ uint32_t writePageSize;
+ uint32_t writePages;
+ uint32_t readPageSize;
+ uint32_t readPages;
// Statistics
uint16_t initialFileCount;
uint32_t dataFileSize;
- uint32_t journalCurrentFileCount;
- uint32_t journalRecordDepth;
- uint32_t journalRecordDepthHigh;
- uint32_t journalRecordDepthLow;
- uint64_t journalRecordEnqueues;
- uint64_t journalRecordDequeues;
- uint32_t journalOutstandingAIOs;
- uint32_t journalOutstandingAIOsHigh;
- uint32_t journalOutstandingAIOsLow;
- uint32_t journalFreeFileCount;
- uint32_t journalFreeFileCountHigh;
- uint32_t journalFreeFileCountLow;
- uint32_t journalAvailableFileCount;
- uint32_t journalAvailableFileCountHigh;
- uint32_t journalAvailableFileCountLow;
- uint64_t journalWriteWaitFailures;
- uint64_t journalWriteBusyFailures;
- uint64_t journalReadRecordCount;
- uint64_t journalReadBusyFailures;
- uint32_t journalWritePageCacheDepth;
- uint32_t journalWritePageCacheDepthHigh;
- uint32_t journalWritePageCacheDepthLow;
- uint32_t journalReadPageCacheDepth;
- uint32_t journalReadPageCacheDepthHigh;
- uint32_t journalReadPageCacheDepthLow;
+ uint32_t currentFileCount;
+ uint32_t recordDepth;
+ uint32_t recordDepthHigh;
+ uint32_t recordDepthLow;
+ uint64_t recordEnqueues;
+ uint64_t recordDequeues;
+ uint32_t outstandingAIOs;
+ uint32_t outstandingAIOsHigh;
+ uint32_t outstandingAIOsLow;
+ uint32_t freeFileCount;
+ uint32_t freeFileCountHigh;
+ uint32_t freeFileCountLow;
+ uint32_t availableFileCount;
+ uint32_t availableFileCountHigh;
+ uint32_t availableFileCountLow;
+ uint64_t writeWaitFailures;
+ uint64_t writeBusyFailures;
+ uint64_t readRecordCount;
+ uint64_t readBusyFailures;
+ uint32_t writePageCacheDepth;
+ uint32_t writePageCacheDepthHigh;
+ uint32_t writePageCacheDepthLow;
+ uint32_t readPageCacheDepth;
+ uint32_t readPageCacheDepthHigh;
+ uint32_t readPageCacheDepthLow;
// Private Methods
- static void writeSchema (qpid::framing::Buffer& buf);
- void writeConfig (qpid::framing::Buffer& buf);
- void writeInstrumentation (qpid::framing::Buffer& buf,
- bool skipHeaders = false);
- void doMethod (std::string methodName,
- qpid::framing::Buffer& inBuf,
- qpid::framing::Buffer& outBuf);
+ static void writeSchema (qpid::framing::Buffer& buf);
+ void writeProperties (qpid::framing::Buffer& buf);
+ void writeStatistics (qpid::framing::Buffer& buf,
+ bool skipHeaders = false);
+ void doMethod (std::string methodName,
+ qpid::framing::Buffer& inBuf,
+ qpid::framing::Buffer& outBuf);
writeSchemaCall_t getWriteSchemaCall (void) { return writeSchema; }
@@ -119,34 +119,34 @@
queueRef = val;
configChanged = true;
}
- inline void set_journalDirectory (std::string val){
+ inline void set_directory (std::string val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalDirectory = val;
+ directory = val;
configChanged = true;
}
- inline void set_journalBaseFileName (std::string val){
+ inline void set_baseFileName (std::string val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalBaseFileName = val;
+ baseFileName = val;
configChanged = true;
}
- inline void set_journalWritePageSize (uint32_t val){
+ inline void set_writePageSize (uint32_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalWritePageSize = val;
+ writePageSize = val;
configChanged = true;
}
- inline void set_journalWritePages (uint32_t val){
+ inline void set_writePages (uint32_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalWritePages = val;
+ writePages = val;
configChanged = true;
}
- inline void set_journalReadPageSize (uint32_t val){
+ inline void set_readPageSize (uint32_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalReadPageSize = val;
+ readPageSize = val;
configChanged = true;
}
- inline void set_journalReadPages (uint32_t val){
+ inline void set_readPages (uint32_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalReadPages = val;
+ readPages = val;
configChanged = true;
}
inline void set_initialFileCount (uint16_t val){
@@ -159,291 +159,290 @@
dataFileSize = val;
instChanged = true;
}
- inline void set_journalCurrentFileCount (uint32_t val){
+ inline void set_currentFileCount (uint32_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalCurrentFileCount = val;
+ currentFileCount = val;
instChanged = true;
}
- inline void inc_journalRecordDepth (uint32_t by = 1){
+ inline void inc_recordDepth (uint32_t by = 1){
if (by == 1)
- ++journalRecordDepth;
+ ++recordDepth;
else
- journalRecordDepth += by;
- if (journalRecordDepthHigh < journalRecordDepth)
- journalRecordDepthHigh = journalRecordDepth;
+ recordDepth += by;
+ if (recordDepthHigh < recordDepth)
+ recordDepthHigh = recordDepth;
instChanged = true;
}
- inline void dec_journalRecordDepth (uint32_t by = 1){
+ inline void dec_recordDepth (uint32_t by = 1){
if (by == 1)
- journalRecordDepth--;
+ recordDepth--;
else
- journalRecordDepth -= by;
- if (journalRecordDepthLow > journalRecordDepth)
- journalRecordDepthLow = journalRecordDepth;
+ recordDepth -= by;
+ if (recordDepthLow > recordDepth)
+ recordDepthLow = recordDepth;
instChanged = true;
}
- inline void set_journalRecordDepth (uint32_t val){
+ inline void set_recordDepth (uint32_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalRecordDepth = val;
- if (journalRecordDepthLow > val)
- journalRecordDepthLow = val;
- if (journalRecordDepthHigh < val)
- journalRecordDepthHigh = val;
+ recordDepth = val;
+ if (recordDepthLow > val)
+ recordDepthLow = val;
+ if (recordDepthHigh < val)
+ recordDepthHigh = val;
instChanged = true;
}
- inline void inc_journalRecordEnqueues (uint64_t by = 1){
+ inline void inc_recordEnqueues (uint64_t by = 1){
if (by == 1)
- ++journalRecordEnqueues;
+ ++recordEnqueues;
else
- journalRecordEnqueues += by;
+ recordEnqueues += by;
instChanged = true;
}
- inline void dec_journalRecordEnqueues (uint64_t by = 1){
+ inline void dec_recordEnqueues (uint64_t by = 1){
if (by == 1)
- journalRecordEnqueues--;
+ recordEnqueues--;
else
- journalRecordEnqueues -= by;
+ recordEnqueues -= by;
instChanged = true;
}
- inline void set_journalRecordEnqueues (uint64_t val){
+ inline void set_recordEnqueues (uint64_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalRecordEnqueues = val;
+ recordEnqueues = val;
instChanged = true;
}
- inline void inc_journalRecordDequeues (uint64_t by = 1){
+ inline void inc_recordDequeues (uint64_t by = 1){
if (by == 1)
- ++journalRecordDequeues;
+ ++recordDequeues;
else
- journalRecordDequeues += by;
+ recordDequeues += by;
instChanged = true;
}
- inline void dec_journalRecordDequeues (uint64_t by = 1){
+ inline void dec_recordDequeues (uint64_t by = 1){
if (by == 1)
- journalRecordDequeues--;
+ recordDequeues--;
else
- journalRecordDequeues -= by;
+ recordDequeues -= by;
instChanged = true;
}
- inline void set_journalRecordDequeues (uint64_t val){
+ inline void set_recordDequeues (uint64_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalRecordDequeues = val;
+ recordDequeues = val;
instChanged = true;
}
- inline void inc_journalOutstandingAIOs (uint32_t by = 1){
+ inline void inc_outstandingAIOs (uint32_t by = 1){
if (by == 1)
- ++journalOutstandingAIOs;
+ ++outstandingAIOs;
else
- journalOutstandingAIOs += by;
- if (journalOutstandingAIOsHigh < journalOutstandingAIOs)
- journalOutstandingAIOsHigh = journalOutstandingAIOs;
+ outstandingAIOs += by;
+ if (outstandingAIOsHigh < outstandingAIOs)
+ outstandingAIOsHigh = outstandingAIOs;
instChanged = true;
}
- inline void dec_journalOutstandingAIOs (uint32_t by = 1){
+ inline void dec_outstandingAIOs (uint32_t by = 1){
if (by == 1)
- journalOutstandingAIOs--;
+ outstandingAIOs--;
else
- journalOutstandingAIOs -= by;
- if (journalOutstandingAIOsLow > journalOutstandingAIOs)
- journalOutstandingAIOsLow = journalOutstandingAIOs;
+ outstandingAIOs -= by;
+ if (outstandingAIOsLow > outstandingAIOs)
+ outstandingAIOsLow = outstandingAIOs;
instChanged = true;
}
- inline void set_journalOutstandingAIOs (uint32_t val){
+ inline void set_outstandingAIOs (uint32_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalOutstandingAIOs = val;
- if (journalOutstandingAIOsLow > val)
- journalOutstandingAIOsLow = val;
- if (journalOutstandingAIOsHigh < val)
- journalOutstandingAIOsHigh = val;
+ outstandingAIOs = val;
+ if (outstandingAIOsLow > val)
+ outstandingAIOsLow = val;
+ if (outstandingAIOsHigh < val)
+ outstandingAIOsHigh = val;
instChanged = true;
}
- inline void inc_journalFreeFileCount (uint32_t by = 1){
+ inline void inc_freeFileCount (uint32_t by = 1){
if (by == 1)
- ++journalFreeFileCount;
+ ++freeFileCount;
else
- journalFreeFileCount += by;
- if (journalFreeFileCountHigh < journalFreeFileCount)
- journalFreeFileCountHigh = journalFreeFileCount;
+ freeFileCount += by;
+ if (freeFileCountHigh < freeFileCount)
+ freeFileCountHigh = freeFileCount;
instChanged = true;
}
- inline void dec_journalFreeFileCount (uint32_t by = 1){
+ inline void dec_freeFileCount (uint32_t by = 1){
if (by == 1)
- journalFreeFileCount--;
+ freeFileCount--;
else
- journalFreeFileCount -= by;
- if (journalFreeFileCountLow > journalFreeFileCount)
- journalFreeFileCountLow = journalFreeFileCount;
+ freeFileCount -= by;
+ if (freeFileCountLow > freeFileCount)
+ freeFileCountLow = freeFileCount;
instChanged = true;
}
- inline void set_journalFreeFileCount (uint32_t val){
+ inline void set_freeFileCount (uint32_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalFreeFileCount = val;
- if (journalFreeFileCountLow > val)
- journalFreeFileCountLow = val;
- if (journalFreeFileCountHigh < val)
- journalFreeFileCountHigh = val;
+ freeFileCount = val;
+ if (freeFileCountLow > val)
+ freeFileCountLow = val;
+ if (freeFileCountHigh < val)
+ freeFileCountHigh = val;
instChanged = true;
}
- inline void inc_journalAvailableFileCount (uint32_t by = 1){
+ inline void inc_availableFileCount (uint32_t by = 1){
if (by == 1)
- ++journalAvailableFileCount;
+ ++availableFileCount;
else
- journalAvailableFileCount += by;
- if (journalAvailableFileCountHigh < journalAvailableFileCount)
- journalAvailableFileCountHigh = journalAvailableFileCount;
+ availableFileCount += by;
+ if (availableFileCountHigh < availableFileCount)
+ availableFileCountHigh = availableFileCount;
instChanged = true;
}
- inline void dec_journalAvailableFileCount (uint32_t by = 1){
+ inline void dec_availableFileCount (uint32_t by = 1){
if (by == 1)
- journalAvailableFileCount--;
+ availableFileCount--;
else
- journalAvailableFileCount -= by;
- if (journalAvailableFileCountLow > journalAvailableFileCount)
- journalAvailableFileCountLow = journalAvailableFileCount;
+ availableFileCount -= by;
+ if (availableFileCountLow > availableFileCount)
+ availableFileCountLow = availableFileCount;
instChanged = true;
}
- inline void set_journalAvailableFileCount (uint32_t val){
+ inline void set_availableFileCount (uint32_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalAvailableFileCount = val;
- if (journalAvailableFileCountLow > val)
- journalAvailableFileCountLow = val;
- if (journalAvailableFileCountHigh < val)
- journalAvailableFileCountHigh = val;
+ availableFileCount = val;
+ if (availableFileCountLow > val)
+ availableFileCountLow = val;
+ if (availableFileCountHigh < val)
+ availableFileCountHigh = val;
instChanged = true;
}
- inline void inc_journalWriteWaitFailures (uint64_t by = 1){
+ inline void inc_writeWaitFailures (uint64_t by = 1){
if (by == 1)
- ++journalWriteWaitFailures;
+ ++writeWaitFailures;
else
- journalWriteWaitFailures += by;
+ writeWaitFailures += by;
instChanged = true;
}
- inline void dec_journalWriteWaitFailures (uint64_t by = 1){
+ inline void dec_writeWaitFailures (uint64_t by = 1){
if (by == 1)
- journalWriteWaitFailures--;
+ writeWaitFailures--;
else
- journalWriteWaitFailures -= by;
+ writeWaitFailures -= by;
instChanged = true;
}
- inline void set_journalWriteWaitFailures (uint64_t val){
+ inline void set_writeWaitFailures (uint64_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalWriteWaitFailures = val;
+ writeWaitFailures = val;
instChanged = true;
}
- inline void inc_journalWriteBusyFailures (uint64_t by = 1){
+ inline void inc_writeBusyFailures (uint64_t by = 1){
if (by == 1)
- ++journalWriteBusyFailures;
+ ++writeBusyFailures;
else
- journalWriteBusyFailures += by;
+ writeBusyFailures += by;
instChanged = true;
}
- inline void dec_journalWriteBusyFailures (uint64_t by = 1){
+ inline void dec_writeBusyFailures (uint64_t by = 1){
if (by == 1)
- journalWriteBusyFailures--;
+ writeBusyFailures--;
else
- journalWriteBusyFailures -= by;
+ writeBusyFailures -= by;
instChanged = true;
}
- inline void set_journalWriteBusyFailures (uint64_t val){
+ inline void set_writeBusyFailures (uint64_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalWriteBusyFailures = val;
+ writeBusyFailures = val;
instChanged = true;
}
- inline void inc_journalReadRecordCount (uint64_t by = 1){
+ inline void inc_readRecordCount (uint64_t by = 1){
if (by == 1)
- ++journalReadRecordCount;
+ ++readRecordCount;
else
- journalReadRecordCount += by;
+ readRecordCount += by;
instChanged = true;
}
- inline void dec_journalReadRecordCount (uint64_t by = 1){
+ inline void dec_readRecordCount (uint64_t by = 1){
if (by == 1)
- journalReadRecordCount--;
+ readRecordCount--;
else
- journalReadRecordCount -= by;
+ readRecordCount -= by;
instChanged = true;
}
- inline void set_journalReadRecordCount (uint64_t val){
+ inline void set_readRecordCount (uint64_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalReadRecordCount = val;
+ readRecordCount = val;
instChanged = true;
}
- inline void inc_journalReadBusyFailures (uint64_t by = 1){
+ inline void inc_readBusyFailures (uint64_t by = 1){
if (by == 1)
- ++journalReadBusyFailures;
+ ++readBusyFailures;
else
- journalReadBusyFailures += by;
+ readBusyFailures += by;
instChanged = true;
}
- inline void dec_journalReadBusyFailures (uint64_t by = 1){
+ inline void dec_readBusyFailures (uint64_t by = 1){
if (by == 1)
- journalReadBusyFailures--;
+ readBusyFailures--;
else
- journalReadBusyFailures -= by;
+ readBusyFailures -= by;
instChanged = true;
}
- inline void set_journalReadBusyFailures (uint64_t val){
+ inline void set_readBusyFailures (uint64_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalReadBusyFailures = val;
+ readBusyFailures = val;
instChanged = true;
}
- inline void inc_journalWritePageCacheDepth (uint32_t by = 1){
+ inline void inc_writePageCacheDepth (uint32_t by = 1){
if (by == 1)
- ++journalWritePageCacheDepth;
+ ++writePageCacheDepth;
else
- journalWritePageCacheDepth += by;
- if (journalWritePageCacheDepthHigh < journalWritePageCacheDepth)
- journalWritePageCacheDepthHigh = journalWritePageCacheDepth;
+ writePageCacheDepth += by;
+ if (writePageCacheDepthHigh < writePageCacheDepth)
+ writePageCacheDepthHigh = writePageCacheDepth;
instChanged = true;
}
- inline void dec_journalWritePageCacheDepth (uint32_t by = 1){
+ inline void dec_writePageCacheDepth (uint32_t by = 1){
if (by == 1)
- journalWritePageCacheDepth--;
+ writePageCacheDepth--;
else
- journalWritePageCacheDepth -= by;
- if (journalWritePageCacheDepthLow > journalWritePageCacheDepth)
- journalWritePageCacheDepthLow = journalWritePageCacheDepth;
+ writePageCacheDepth -= by;
+ if (writePageCacheDepthLow > writePageCacheDepth)
+ writePageCacheDepthLow = writePageCacheDepth;
instChanged = true;
}
- inline void set_journalWritePageCacheDepth (uint32_t val){
+ inline void set_writePageCacheDepth (uint32_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalWritePageCacheDepth = val;
- if (journalWritePageCacheDepthLow > val)
- journalWritePageCacheDepthLow = val;
- if (journalWritePageCacheDepthHigh < val)
- journalWritePageCacheDepthHigh = val;
+ writePageCacheDepth = val;
+ if (writePageCacheDepthLow > val)
+ writePageCacheDepthLow = val;
+ if (writePageCacheDepthHigh < val)
+ writePageCacheDepthHigh = val;
instChanged = true;
}
- inline void inc_journalReadPageCacheDepth (uint32_t by = 1){
+ inline void inc_readPageCacheDepth (uint32_t by = 1){
if (by == 1)
- ++journalReadPageCacheDepth;
+ ++readPageCacheDepth;
else
- journalReadPageCacheDepth += by;
- if (journalReadPageCacheDepthHigh < journalReadPageCacheDepth)
- journalReadPageCacheDepthHigh = journalReadPageCacheDepth;
+ readPageCacheDepth += by;
+ if (readPageCacheDepthHigh < readPageCacheDepth)
+ readPageCacheDepthHigh = readPageCacheDepth;
instChanged = true;
}
- inline void dec_journalReadPageCacheDepth (uint32_t by = 1){
+ inline void dec_readPageCacheDepth (uint32_t by = 1){
if (by == 1)
- journalReadPageCacheDepth--;
+ readPageCacheDepth--;
else
- journalReadPageCacheDepth -= by;
- if (journalReadPageCacheDepthLow > journalReadPageCacheDepth)
- journalReadPageCacheDepthLow = journalReadPageCacheDepth;
+ readPageCacheDepth -= by;
+ if (readPageCacheDepthLow > readPageCacheDepth)
+ readPageCacheDepthLow = readPageCacheDepth;
instChanged = true;
}
- inline void set_journalReadPageCacheDepth (uint32_t val){
+ inline void set_readPageCacheDepth (uint32_t val){
sys::Mutex::ScopedLock mutex(accessLock);
- journalReadPageCacheDepth = val;
- if (journalReadPageCacheDepthLow > val)
- journalReadPageCacheDepthLow = val;
- if (journalReadPageCacheDepthHigh < val)
- journalReadPageCacheDepthHigh = val;
+ readPageCacheDepth = val;
+ if (readPageCacheDepthLow > val)
+ readPageCacheDepthLow = val;
+ if (readPageCacheDepthHigh < val)
+ readPageCacheDepthHigh = val;
instChanged = true;
}
};
}}
-
#endif /*!_MANAGEMENT_JOURNAL_*/
Modified: store/trunk/cpp/lib/gen/qpid/management/Store.cpp
===================================================================
--- store/trunk/cpp/lib/gen/qpid/management/Store.cpp 2008-06-04 21:20:00 UTC (rev 2129)
+++ store/trunk/cpp/lib/gen/qpid/management/Store.cpp 2008-06-04 23:18:47 UTC (rev 2130)
@@ -127,7 +127,7 @@
}
-void Store::writeConfig (Buffer& buf)
+void Store::writeProperties (Buffer& buf)
{
sys::Mutex::ScopedLock mutex(accessLock);
configChanged = false;
@@ -141,11 +141,12 @@
}
-void Store::writeInstrumentation (Buffer& buf, bool skipHeaders)
+void Store::writeStatistics (Buffer& buf, bool skipHeaders)
{
sys::Mutex::ScopedLock mutex(accessLock);
instChanged = false;
+
if (!skipHeaders)
writeTimestamps (buf);
Modified: store/trunk/cpp/lib/gen/qpid/management/Store.h
===================================================================
--- store/trunk/cpp/lib/gen/qpid/management/Store.h 2008-06-04 21:20:00 UTC (rev 2129)
+++ store/trunk/cpp/lib/gen/qpid/management/Store.h 2008-06-04 23:18:47 UTC (rev 2130)
@@ -50,13 +50,13 @@
// Statistics
// Private Methods
- static void writeSchema (qpid::framing::Buffer& buf);
- void writeConfig (qpid::framing::Buffer& buf);
- void writeInstrumentation (qpid::framing::Buffer& buf,
- bool skipHeaders = false);
- void doMethod (std::string methodName,
- qpid::framing::Buffer& inBuf,
- qpid::framing::Buffer& outBuf);
+ static void writeSchema (qpid::framing::Buffer& buf);
+ void writeProperties (qpid::framing::Buffer& buf);
+ void writeStatistics (qpid::framing::Buffer& buf,
+ bool skipHeaders = false);
+ void doMethod (std::string methodName,
+ qpid::framing::Buffer& inBuf,
+ qpid::framing::Buffer& outBuf);
writeSchemaCall_t getWriteSchemaCall (void) { return writeSchema; }
// Stub for getInstChanged. There are no inst elements
@@ -108,6 +108,5 @@
};
}}
-
#endif /*!_MANAGEMENT_STORE_*/
Modified: store/trunk/specs/management-schema.xml
===================================================================
--- store/trunk/specs/management-schema.xml 2008-06-04 21:20:00 UTC (rev 2129)
+++ store/trunk/specs/management-schema.xml 2008-06-04 23:18:47 UTC (rev 2130)
@@ -12,34 +12,34 @@
</class>
<class name="Journal">
- <property name="name" type="sstr" access="RO" index="y"/>
- <property name="queueRef" type="objId" access="RO" references="qpid.Queue" isGeneralReference="y"/>
- <property name="journalDirectory" type="sstr" access="RO" desc="Directory containing journal files"/>
- <property name="journalBaseFileName" type="sstr" access="RO" desc="Base filename prefix for journal"/>
- <property name="journalWritePageSize" type="uint32" access="RO" unit="byte" desc="Page size in write-page-cache"/>
- <property name="journalWritePages" type="uint32" access="RO" unit="wpage" desc="Number of pages in write-page-cache"/>
- <property name="journalReadPageSize" type="uint32" access="RO" unit="byte" desc="Page size in read-page-cache"/>
- <property name="journalReadPages" type="uint32" access="RO" unit="rpage" desc="Number of pages in read-page-cache"/>
+ <property name="name" type="sstr" access="RO" index="y"/>
+ <property name="queueRef" type="objId" access="RO" references="qpid.Queue" isGeneralReference="y"/>
+ <property name="directory" type="sstr" access="RO" desc="Directory containing journal files"/>
+ <property name="baseFileName" type="sstr" access="RO" desc="Base filename prefix for journal"/>
+ <property name="writePageSize" type="uint32" access="RO" unit="byte" desc="Page size in write-page-cache"/>
+ <property name="writePages" type="uint32" access="RO" unit="wpage" desc="Number of pages in write-page-cache"/>
+ <property name="readPageSize" type="uint32" access="RO" unit="byte" desc="Page size in read-page-cache"/>
+ <property name="readPages" type="uint32" access="RO" unit="rpage" desc="Number of pages in read-page-cache"/>
- <statistic name="initialFileCount" type="uint16" unit="file" desc="Number of files initially allocated to this journal"/>
- <statistic name="dataFileSize" type="uint32" unit="byte" desc="Size of each journal data file"/>
- <statistic name="journalCurrentFileCount" type="uint32" unit="file" desc="Number of files currently allocated to this journal"/>
- <statistic name="journalRecordDepth" type="hilo32" unit="record" desc="Number of enqueued records (durable messages)"/>
- <statistic name="journalRecordEnqueues" type="count64" unit="record" desc="Total enqueued records on journal"/>
- <statistic name="journalRecordDequeues" type="count64" unit="record" desc="Total dequeued records on journal"/>
- <statistic name="journalOutstandingAIOs" type="hilo32" unit="aio_op" desc="Number of outstanding AIO requests in Async IO system"/>
+ <statistic name="initialFileCount" type="uint16" unit="file" desc="Number of files initially allocated to this journal"/>
+ <statistic name="dataFileSize" type="uint32" unit="byte" desc="Size of each journal data file"/>
+ <statistic name="currentFileCount" type="uint32" unit="file" desc="Number of files currently allocated to this journal"/>
+ <statistic name="recordDepth" type="hilo32" unit="record" desc="Number of enqueued records (durable messages)"/>
+ <statistic name="recordEnqueues" type="count64" unit="record" desc="Total enqueued records on journal"/>
+ <statistic name="recordDequeues" type="count64" unit="record" desc="Total dequeued records on journal"/>
+ <statistic name="outstandingAIOs" type="hilo32" unit="aio_op" desc="Number of outstanding AIO requests in Async IO system"/>
<!--
The following are not yet "wired up" in JournalImpl.cpp
-->
- <statistic name="journalFreeFileCount" type="hilo32" unit="file" desc="Number of files free on this journal. Includes free files trapped in holes."/>
- <statistic name="journalAvailableFileCount" type="hilo32" unit="file" desc="Number of files available to be written. Excluding holes"/>
- <statistic name="journalWriteWaitFailures" type="count64" unit="record" desc="AIO Wait failures on write"/>
- <statistic name="journalWriteBusyFailures" type="count64" unit="record" desc="AIO Busy failures on write"/>
- <statistic name="journalReadRecordCount" type="count64" unit="record" desc="Records read from the journal"/>
- <statistic name="journalReadBusyFailures" type="count64" unit="record" desc="AIO Busy failures on read"/>
- <statistic name="journalWritePageCacheDepth" type="hilo32" unit="wpage" desc="Current depth of write-page-cache"/>
- <statistic name="journalReadPageCacheDepth" type="hilo32" unit="rpage" desc="Current depth of read-page-cache"/>
+ <statistic name="freeFileCount" type="hilo32" unit="file" desc="Number of files free on this journal. Includes free files trapped in holes."/>
+ <statistic name="availableFileCount" type="hilo32" unit="file" desc="Number of files available to be written. Excluding holes"/>
+ <statistic name="writeWaitFailures" type="count64" unit="record" desc="AIO Wait failures on write"/>
+ <statistic name="writeBusyFailures" type="count64" unit="record" desc="AIO Busy failures on write"/>
+ <statistic name="readRecordCount" type="count64" unit="record" desc="Records read from the journal"/>
+ <statistic name="readBusyFailures" type="count64" unit="record" desc="AIO Busy failures on read"/>
+ <statistic name="writePageCacheDepth" type="hilo32" unit="wpage" desc="Current depth of write-page-cache"/>
+ <statistic name="readPageCacheDepth" type="hilo32" unit="rpage" desc="Current depth of read-page-cache"/>
<method name="expand" desc="Increase number of files allocated for this journal">
<arg name="by" type="uint32" dir="I" desc="Number of files to increase journal size by"/>
More information about the rhmessaging-commits
mailing list