April 2010 - rhmessaging-commits - Jboss List Archives

rhmessaging commits: r3904 - mgmt/newdata/rosemary/python/rosemary.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-04-12 17:41:54 -0400 (Mon, 12 Apr 2010) New Revision: 3904 Modified: mgmt/newdata/rosemary/python/rosemary/sqlquery.py Log: Getting rid of selfself typo Modified: mgmt/newdata/rosemary/python/rosemary/sqlquery.py =================================================================== --- mgmt/newdata/rosemary/python/rosemary/sqlquery.py 2010-04-09 17:20:27 UTC (rev 3903) +++ mgmt/newdata/rosemary/python/rosemary/sqlquery.py 2010-04-12 21:41:54 UTC (rev 3904) @@ -74,7 +74,7 @@ return "limit %s offset %i" % (str(limit), offset) class GroupBy(object): - def emit(selfself, column): + def emit(self, column): column = getattr(column, "identifier", column) return "group by %s" % column

16 years

1
0
0 / 0

rhmessaging commits: r3903 - store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store.

by rhmessaging-commits＠lists.jboss.org

Author: tedross Date: 2010-04-09 13:20:27 -0400 (Fri, 09 Apr 2010) New Revision: 3903 Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h Log: Re-generated QMF files to use new isolated Mutex feature. Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.cpp 2010-04-09 03:54:13 UTC (rev 3902) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.cpp 2010-04-09 17:20:27 UTC (rev 3903) @@ -21,7 +21,6 @@ // This source file was created by a code generator. // Please do not edit. -#include "qpid/log/Statement.h" #include "qpid/management/Manageable.h" #include "qpid/management/Buffer.h" #include "qpid/types/Variant.h" @@ -34,6 +33,7 @@ using qpid::management::Manageable; using qpid::management::ManagementObject; using qpid::management::Args; +using qpid::management::Mutex; using std::string; string EventCreated::packageName = string ("com.redhat.rhm.store"); Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.cpp 2010-04-09 03:54:13 UTC (rev 3902) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.cpp 2010-04-09 17:20:27 UTC (rev 3903) @@ -21,7 +21,6 @@ // This source file was created by a code generator. // Please do not edit. -#include "qpid/log/Statement.h" #include "qpid/management/Manageable.h" #include "qpid/management/Buffer.h" #include "qpid/types/Variant.h" @@ -34,6 +33,7 @@ using qpid::management::Manageable; using qpid::management::ManagementObject; using qpid::management::Args; +using qpid::management::Mutex; using std::string; string EventEnqThresholdExceeded::packageName = string ("com.redhat.rhm.store"); Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.cpp 2010-04-09 03:54:13 UTC (rev 3902) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.cpp 2010-04-09 17:20:27 UTC (rev 3903) @@ -21,7 +21,6 @@ // This source file was created by a code generator. // Please do not edit. -#include "qpid/log/Statement.h" #include "qpid/management/Manageable.h" #include "qpid/management/Buffer.h" #include "qpid/types/Variant.h" @@ -34,6 +33,7 @@ using qpid::management::Manageable; using qpid::management::ManagementObject; using qpid::management::Args; +using qpid::management::Mutex; using std::string; string EventFull::packageName = string ("com.redhat.rhm.store"); Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.cpp 2010-04-09 03:54:13 UTC (rev 3902) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.cpp 2010-04-09 17:20:27 UTC (rev 3903) @@ -21,7 +21,6 @@ // This source file was created by a code generator. // Please do not edit. -#include "qpid/log/Statement.h" #include "qpid/management/Manageable.h" #include "qpid/management/Buffer.h" #include "qpid/types/Variant.h" @@ -34,6 +33,7 @@ using qpid::management::Manageable; using qpid::management::ManagementObject; using qpid::management::Args; +using qpid::management::Mutex; using std::string; string EventRecovered::packageName = string ("com.redhat.rhm.store"); Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2010-04-09 03:54:13 UTC (rev 3902) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2010-04-09 17:20:27 UTC (rev 3903) @@ -21,7 +21,6 @@ // This source file was created by a code generator. // Please do not edit. -#include "qpid/log/Statement.h" #include "qpid/management/Manageable.h" #include "qpid/management/Buffer.h" #include "qpid/types/Variant.h" @@ -37,6 +36,7 @@ using qpid::management::Manageable; using qpid::management::ManagementObject; using qpid::management::Args; +using qpid::management::Mutex; using std::string; string Journal::packageName = string ("com.redhat.rhm.store"); @@ -550,7 +550,7 @@ char *_tmpBuf = new char[_sBuf.length()]; memcpy(_tmpBuf, _sBuf.data(), _sBuf.length()); ::qpid::management::Buffer buf(_tmpBuf, _sBuf.length()); - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + Mutex::ScopedLock mutex(accessLock); { std::string _tbuf; @@ -583,7 +583,7 @@ char _msgChars[_bufSize]; ::qpid::management::Buffer buf(_msgChars, _bufSize); - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + Mutex::ScopedLock mutex(accessLock); configChanged = false; { @@ -621,7 +621,7 @@ char _msgChars[_bufSize]; ::qpid::management::Buffer buf(_msgChars, _bufSize); - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + Mutex::ScopedLock mutex(accessLock); instChanged = false; @@ -742,7 +742,7 @@ bool includeStatistics) { using namespace ::qpid::types; - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + Mutex::ScopedLock mutex(accessLock); if (includeProperties) { configChanged = false; @@ -823,7 +823,7 @@ void Journal::mapDecodeValues (const ::qpid::types::Variant::Map& _map) { ::qpid::types::Variant::Map::const_iterator _i; - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + Mutex::ScopedLock mutex(accessLock); if ((_i = _map.find("queueRef")) != _map.end()) { queueRef = _i->second; Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2010-04-09 03:54:13 UTC (rev 3902) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2010-04-09 17:20:27 UTC (rev 3903) @@ -166,131 +166,131 @@ // Accessor Methods inline void set_queueRef (const ::qpid::management::ObjectId& val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); queueRef = val; configChanged = true; } inline const ::qpid::management::ObjectId& get_queueRef() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return queueRef; } inline void set_name (const std::string& val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); name = val; configChanged = true; } inline const std::string& get_name() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return name; } inline void set_directory (const std::string& val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); directory = val; configChanged = true; } inline const std::string& get_directory() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return directory; } inline void set_baseFileName (const std::string& val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); baseFileName = val; configChanged = true; } inline const std::string& get_baseFileName() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return baseFileName; } inline void set_writePageSize (uint32_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); writePageSize = val; configChanged = true; } inline uint32_t get_writePageSize() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return writePageSize; } inline void set_writePages (uint32_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); writePages = val; configChanged = true; } inline uint32_t get_writePages() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return writePages; } inline void set_readPageSize (uint32_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); readPageSize = val; configChanged = true; } inline uint32_t get_readPageSize() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return readPageSize; } inline void set_readPages (uint32_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); readPages = val; configChanged = true; } inline uint32_t get_readPages() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return readPages; } inline void set_initialFileCount (uint16_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); initialFileCount = val; configChanged = true; } inline uint16_t get_initialFileCount() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return initialFileCount; } inline void set_autoExpand (uint8_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); autoExpand = val; configChanged = true; } inline uint8_t get_autoExpand() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return autoExpand; } inline void set_currentFileCount (uint16_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); currentFileCount = val; configChanged = true; } inline uint16_t get_currentFileCount() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return currentFileCount; } inline void set_maxFileCount (uint16_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); maxFileCount = val; configChanged = true; } inline uint16_t get_maxFileCount() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return maxFileCount; } inline void set_dataFileSize (uint32_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); dataFileSize = val; configChanged = true; } inline uint32_t get_dataFileSize() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return dataFileSize; } inline void inc_recordDepth (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); recordDepth += by; if (recordDepthHigh < recordDepth) recordDepthHigh = recordDepth; instChanged = true; } inline void dec_recordDepth (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); recordDepth -= by; if (recordDepthLow > recordDepth) recordDepthLow = recordDepth; @@ -353,42 +353,42 @@ instChanged = true; } inline void inc_outstandingAIOs (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); outstandingAIOs += by; if (outstandingAIOsHigh < outstandingAIOs) outstandingAIOsHigh = outstandingAIOs; instChanged = true; } inline void dec_outstandingAIOs (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); outstandingAIOs -= by; if (outstandingAIOsLow > outstandingAIOs) outstandingAIOsLow = outstandingAIOs; instChanged = true; } inline void inc_freeFileCount (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); freeFileCount += by; if (freeFileCountHigh < freeFileCount) freeFileCountHigh = freeFileCount; instChanged = true; } inline void dec_freeFileCount (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); freeFileCount -= by; if (freeFileCountLow > freeFileCount) freeFileCountLow = freeFileCount; instChanged = true; } inline void inc_availableFileCount (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); availableFileCount += by; if (availableFileCountHigh < availableFileCount) availableFileCountHigh = availableFileCount; instChanged = true; } inline void dec_availableFileCount (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); availableFileCount -= by; if (availableFileCountLow > availableFileCount) availableFileCountLow = availableFileCount; @@ -427,28 +427,28 @@ instChanged = true; } inline void inc_writePageCacheDepth (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); writePageCacheDepth += by; if (writePageCacheDepthHigh < writePageCacheDepth) writePageCacheDepthHigh = writePageCacheDepth; instChanged = true; } inline void dec_writePageCacheDepth (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); writePageCacheDepth -= by; if (writePageCacheDepthLow > writePageCacheDepth) writePageCacheDepthLow = writePageCacheDepth; instChanged = true; } inline void inc_readPageCacheDepth (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); readPageCacheDepth += by; if (readPageCacheDepthHigh < readPageCacheDepth) readPageCacheDepthHigh = readPageCacheDepth; instChanged = true; } inline void dec_readPageCacheDepth (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); readPageCacheDepth -= by; if (readPageCacheDepthLow > readPageCacheDepth) readPageCacheDepthLow = readPageCacheDepth; Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2010-04-09 03:54:13 UTC (rev 3902) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2010-04-09 17:20:27 UTC (rev 3903) @@ -21,7 +21,6 @@ // This source file was created by a code generator. // Please do not edit. -#include "qpid/log/Statement.h" #include "qpid/management/Manageable.h" #include "qpid/management/Buffer.h" #include "qpid/types/Variant.h" @@ -36,6 +35,7 @@ using qpid::management::Manageable; using qpid::management::ManagementObject; using qpid::management::Args; +using qpid::management::Mutex; using std::string; string Store::packageName = string ("com.redhat.rhm.store"); @@ -345,7 +345,7 @@ char *_tmpBuf = new char[_sBuf.length()]; memcpy(_tmpBuf, _sBuf.data(), _sBuf.length()); ::qpid::management::Buffer buf(_tmpBuf, _sBuf.length()); - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + Mutex::ScopedLock mutex(accessLock); { std::string _tbuf; @@ -376,7 +376,7 @@ char _msgChars[_bufSize]; ::qpid::management::Buffer buf(_msgChars, _bufSize); - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + Mutex::ScopedLock mutex(accessLock); configChanged = false; { @@ -412,7 +412,7 @@ char _msgChars[_bufSize]; ::qpid::management::Buffer buf(_msgChars, _bufSize); - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + Mutex::ScopedLock mutex(accessLock); instChanged = false; @@ -490,7 +490,7 @@ bool includeStatistics) { using namespace ::qpid::types; - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + Mutex::ScopedLock mutex(accessLock); if (includeProperties) { configChanged = false; @@ -541,7 +541,7 @@ void Store::mapDecodeValues (const ::qpid::types::Variant::Map& _map) { ::qpid::types::Variant::Map::const_iterator _i; - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + Mutex::ScopedLock mutex(accessLock); if ((_i = _map.find("brokerRef")) != _map.end()) { brokerRef = _i->second; Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2010-04-09 03:54:13 UTC (rev 3902) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2010-04-09 17:20:27 UTC (rev 3903) @@ -134,113 +134,113 @@ // Accessor Methods inline void set_brokerRef (const ::qpid::management::ObjectId& val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); brokerRef = val; configChanged = true; } inline const ::qpid::management::ObjectId& get_brokerRef() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return brokerRef; } inline void set_location (const std::string& val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); location = val; configChanged = true; } inline const std::string& get_location() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return location; } inline void set_defaultInitialFileCount (uint16_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); defaultInitialFileCount = val; configChanged = true; } inline uint16_t get_defaultInitialFileCount() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return defaultInitialFileCount; } inline void set_defaultDataFileSize (uint32_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); defaultDataFileSize = val; configChanged = true; } inline uint32_t get_defaultDataFileSize() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return defaultDataFileSize; } inline void set_tplIsInitialized (uint8_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); tplIsInitialized = val; configChanged = true; } inline uint8_t get_tplIsInitialized() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return tplIsInitialized; } inline void set_tplDirectory (const std::string& val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); tplDirectory = val; configChanged = true; } inline const std::string& get_tplDirectory() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return tplDirectory; } inline void set_tplWritePageSize (uint32_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); tplWritePageSize = val; configChanged = true; } inline uint32_t get_tplWritePageSize() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return tplWritePageSize; } inline void set_tplWritePages (uint32_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); tplWritePages = val; configChanged = true; } inline uint32_t get_tplWritePages() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return tplWritePages; } inline void set_tplInitialFileCount (uint16_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); tplInitialFileCount = val; configChanged = true; } inline uint16_t get_tplInitialFileCount() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return tplInitialFileCount; } inline void set_tplDataFileSize (uint32_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); tplDataFileSize = val; configChanged = true; } inline uint32_t get_tplDataFileSize() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return tplDataFileSize; } inline void set_tplCurrentFileCount (uint32_t val) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); tplCurrentFileCount = val; configChanged = true; } inline uint32_t get_tplCurrentFileCount() { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); return tplCurrentFileCount; } inline void inc_tplTransactionDepth (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); tplTransactionDepth += by; if (tplTransactionDepthHigh < tplTransactionDepth) tplTransactionDepthHigh = tplTransactionDepth; instChanged = true; } inline void dec_tplTransactionDepth (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); tplTransactionDepth -= by; if (tplTransactionDepthLow > tplTransactionDepth) tplTransactionDepthLow = tplTransactionDepth; @@ -271,14 +271,14 @@ instChanged = true; } inline void inc_tplOutstandingAIOs (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); tplOutstandingAIOs += by; if (tplOutstandingAIOsHigh < tplOutstandingAIOs) tplOutstandingAIOsHigh = tplOutstandingAIOs; instChanged = true; } inline void dec_tplOutstandingAIOs (uint32_t by = 1) { - ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + ::qpid::management::Mutex::ScopedLock mutex(accessLock); tplOutstandingAIOs -= by; if (tplOutstandingAIOsLow > tplOutstandingAIOs) tplOutstandingAIOsLow = tplOutstandingAIOs;

16 years

1
0
0 / 0

rhmessaging commits: r3902 - store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store.

by rhmessaging-commits＠lists.jboss.org

Author: tedross Date: 2010-04-08 23:54:13 -0400 (Thu, 08 Apr 2010) New Revision: 3902 Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/ArgsJournalExpand.h store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp Log: Updated generated files with the latest generator. Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/ArgsJournalExpand.h =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/ArgsJournalExpand.h 2010-04-08 16:38:12 UTC (rev 3901) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/ArgsJournalExpand.h 2010-04-09 03:54:13 UTC (rev 3902) @@ -25,8 +25,6 @@ // Please do not edit. #include "qpid/management/Args.h" -//#include "qpid/framing/FieldTable.h" -//#include "qpid/framing/Uuid.h" #include <string> namespace qmf { Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.cpp 2010-04-08 16:38:12 UTC (rev 3901) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.cpp 2010-04-09 03:54:13 UTC (rev 3902) @@ -23,8 +23,9 @@ #include "qpid/log/Statement.h" #include "qpid/management/Manageable.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/Buffer.h" +#include "qpid/management/Buffer.h" +#include "qpid/types/Variant.h" +#include "qpid/amqp_0_10/Codecs.h" #include "qpid/management/ManagementAgent.h" #include "EventCreated.h" @@ -65,8 +66,8 @@ { const int _bufSize = 65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); - ::qpid::framing::FieldTable ft; + ::qpid::management::Buffer buf(_msgChars, _bufSize); + ::qpid::types::Variant::Map ft; // Schema class header: buf.putOctet (CLASS_KIND_EVENT); @@ -77,22 +78,22 @@ // Arguments ft.clear(); - ft.setString (NAME, "jrnlId"); - ft.setInt (TYPE, TYPE_SSTR); - ft.setString (DESC, "Journal Id"); - buf.put (ft); + ft[NAME] = "jrnlId"; + ft[TYPE] = TYPE_SSTR; + ft[DESC] = "Journal Id"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "fileSize"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (DESC, "Journal file size in bytes"); - buf.put (ft); + ft[NAME] = "fileSize"; + ft[TYPE] = TYPE_U32; + ft[DESC] = "Journal file size in bytes"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "numFiles"); - ft.setInt (TYPE, TYPE_U16); - ft.setString (DESC, "Number of journal files"); - buf.put (ft); + ft[NAME] = "numFiles"; + ft[TYPE] = TYPE_U16; + ft[DESC] = "Number of journal files"; + buf.putMap(ft); { @@ -106,7 +107,7 @@ { const int _bufSize=65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::management::Buffer buf(_msgChars, _bufSize); buf.putShortString(jrnlId); buf.putLong(fileSize); Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.cpp 2010-04-08 16:38:12 UTC (rev 3901) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.cpp 2010-04-09 03:54:13 UTC (rev 3902) @@ -23,8 +23,9 @@ #include "qpid/log/Statement.h" #include "qpid/management/Manageable.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/Buffer.h" +#include "qpid/management/Buffer.h" +#include "qpid/types/Variant.h" +#include "qpid/amqp_0_10/Codecs.h" #include "qpid/management/ManagementAgent.h" #include "EventEnqThresholdExceeded.h" @@ -63,8 +64,8 @@ { const int _bufSize = 65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); - ::qpid::framing::FieldTable ft; + ::qpid::management::Buffer buf(_msgChars, _bufSize); + ::qpid::types::Variant::Map ft; // Schema class header: buf.putOctet (CLASS_KIND_EVENT); @@ -75,16 +76,16 @@ // Arguments ft.clear(); - ft.setString (NAME, "jrnlId"); - ft.setInt (TYPE, TYPE_SSTR); - ft.setString (DESC, "Journal Id"); - buf.put (ft); + ft[NAME] = "jrnlId"; + ft[TYPE] = TYPE_SSTR; + ft[DESC] = "Journal Id"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "what"); - ft.setInt (TYPE, TYPE_SSTR); - ft.setString (DESC, "Description of event"); - buf.put (ft); + ft[NAME] = "what"; + ft[TYPE] = TYPE_SSTR; + ft[DESC] = "Description of event"; + buf.putMap(ft); { @@ -98,7 +99,7 @@ { const int _bufSize=65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::management::Buffer buf(_msgChars, _bufSize); buf.putShortString(jrnlId); buf.putShortString(what); Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.cpp 2010-04-08 16:38:12 UTC (rev 3901) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.cpp 2010-04-09 03:54:13 UTC (rev 3902) @@ -23,8 +23,9 @@ #include "qpid/log/Statement.h" #include "qpid/management/Manageable.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/Buffer.h" +#include "qpid/management/Buffer.h" +#include "qpid/types/Variant.h" +#include "qpid/amqp_0_10/Codecs.h" #include "qpid/management/ManagementAgent.h" #include "EventFull.h" @@ -63,8 +64,8 @@ { const int _bufSize = 65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); - ::qpid::framing::FieldTable ft; + ::qpid::management::Buffer buf(_msgChars, _bufSize); + ::qpid::types::Variant::Map ft; // Schema class header: buf.putOctet (CLASS_KIND_EVENT); @@ -75,16 +76,16 @@ // Arguments ft.clear(); - ft.setString (NAME, "jrnlId"); - ft.setInt (TYPE, TYPE_SSTR); - ft.setString (DESC, "Journal Id"); - buf.put (ft); + ft[NAME] = "jrnlId"; + ft[TYPE] = TYPE_SSTR; + ft[DESC] = "Journal Id"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "what"); - ft.setInt (TYPE, TYPE_SSTR); - ft.setString (DESC, "Description of event"); - buf.put (ft); + ft[NAME] = "what"; + ft[TYPE] = TYPE_SSTR; + ft[DESC] = "Description of event"; + buf.putMap(ft); { @@ -98,7 +99,7 @@ { const int _bufSize=65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::management::Buffer buf(_msgChars, _bufSize); buf.putShortString(jrnlId); buf.putShortString(what); Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.cpp 2010-04-08 16:38:12 UTC (rev 3901) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.cpp 2010-04-09 03:54:13 UTC (rev 3902) @@ -23,8 +23,9 @@ #include "qpid/log/Statement.h" #include "qpid/management/Manageable.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/Buffer.h" +#include "qpid/management/Buffer.h" +#include "qpid/types/Variant.h" +#include "qpid/amqp_0_10/Codecs.h" #include "qpid/management/ManagementAgent.h" #include "EventRecovered.h" @@ -73,8 +74,8 @@ { const int _bufSize = 65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); - ::qpid::framing::FieldTable ft; + ::qpid::management::Buffer buf(_msgChars, _bufSize); + ::qpid::types::Variant::Map ft; // Schema class header: buf.putOctet (CLASS_KIND_EVENT); @@ -85,46 +86,46 @@ // Arguments ft.clear(); - ft.setString (NAME, "jrnlId"); - ft.setInt (TYPE, TYPE_SSTR); - ft.setString (DESC, "Journal Id"); - buf.put (ft); + ft[NAME] = "jrnlId"; + ft[TYPE] = TYPE_SSTR; + ft[DESC] = "Journal Id"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "fileSize"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (DESC, "Journal file size in bytes"); - buf.put (ft); + ft[NAME] = "fileSize"; + ft[TYPE] = TYPE_U32; + ft[DESC] = "Journal file size in bytes"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "numFiles"); - ft.setInt (TYPE, TYPE_U16); - ft.setString (DESC, "Number of journal files"); - buf.put (ft); + ft[NAME] = "numFiles"; + ft[TYPE] = TYPE_U16; + ft[DESC] = "Number of journal files"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "numEnq"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (DESC, "Number of recovered enqueues"); - buf.put (ft); + ft[NAME] = "numEnq"; + ft[TYPE] = TYPE_U32; + ft[DESC] = "Number of recovered enqueues"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "numTxn"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (DESC, "Number of recovered transactions"); - buf.put (ft); + ft[NAME] = "numTxn"; + ft[TYPE] = TYPE_U32; + ft[DESC] = "Number of recovered transactions"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "numTxnEnq"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (DESC, "Number of recovered transactional enqueues"); - buf.put (ft); + ft[NAME] = "numTxnEnq"; + ft[TYPE] = TYPE_U32; + ft[DESC] = "Number of recovered transactional enqueues"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "numTxnDeq"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (DESC, "Number of recovered transactional dequeues"); - buf.put (ft); + ft[NAME] = "numTxnDeq"; + ft[TYPE] = TYPE_U32; + ft[DESC] = "Number of recovered transactional dequeues"; + buf.putMap(ft); { @@ -138,7 +139,7 @@ { const int _bufSize=65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::management::Buffer buf(_msgChars, _bufSize); buf.putShortString(jrnlId); buf.putLong(fileSize); Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2010-04-08 16:38:12 UTC (rev 3901) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2010-04-09 03:54:13 UTC (rev 3902) @@ -23,8 +23,9 @@ #include "qpid/log/Statement.h" #include "qpid/management/Manageable.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/Buffer.h" +#include "qpid/management/Buffer.h" +#include "qpid/types/Variant.h" +#include "qpid/amqp_0_10/Codecs.h" #include "qpid/management/ManagementAgent.h" #include "Journal.h" #include "ArgsJournalExpand.h" @@ -123,8 +124,8 @@ { const int _bufSize=65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); - ::qpid::framing::FieldTable ft; + ::qpid::management::Buffer buf(_msgChars, _bufSize); + ::qpid::types::Variant::Map ft; // Schema class header: buf.putOctet (CLASS_KIND_TABLE); @@ -137,347 +138,347 @@ // Properties ft.clear(); - ft.setString (NAME, "queueRef"); - ft.setInt (TYPE, TYPE_REF); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - buf.put (ft); + ft[NAME] = "queueRef"; + ft[TYPE] = TYPE_REF; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "name"); - ft.setInt (TYPE, TYPE_SSTR); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 1); - ft.setInt (IS_OPTIONAL, 0); - buf.put (ft); + ft[NAME] = "name"; + ft[TYPE] = TYPE_SSTR; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 1; + ft[IS_OPTIONAL] = 0; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "directory"); - ft.setInt (TYPE, TYPE_SSTR); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (DESC, "Directory containing journal files"); - buf.put (ft); + ft[NAME] = "directory"; + ft[TYPE] = TYPE_SSTR; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[DESC] = "Directory containing journal files"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "baseFileName"); - ft.setInt (TYPE, TYPE_SSTR); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (DESC, "Base filename prefix for journal"); - buf.put (ft); + ft[NAME] = "baseFileName"; + ft[TYPE] = TYPE_SSTR; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[DESC] = "Base filename prefix for journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "writePageSize"); - ft.setInt (TYPE, TYPE_U32); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "byte"); - ft.setString (DESC, "Page size in write-page-cache"); - buf.put (ft); + ft[NAME] = "writePageSize"; + ft[TYPE] = TYPE_U32; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "byte"; + ft[DESC] = "Page size in write-page-cache"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "writePages"); - ft.setInt (TYPE, TYPE_U32); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "wpage"); - ft.setString (DESC, "Number of pages in write-page-cache"); - buf.put (ft); + ft[NAME] = "writePages"; + ft[TYPE] = TYPE_U32; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "wpage"; + ft[DESC] = "Number of pages in write-page-cache"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "readPageSize"); - ft.setInt (TYPE, TYPE_U32); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "byte"); - ft.setString (DESC, "Page size in read-page-cache"); - buf.put (ft); + ft[NAME] = "readPageSize"; + ft[TYPE] = TYPE_U32; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "byte"; + ft[DESC] = "Page size in read-page-cache"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "readPages"); - ft.setInt (TYPE, TYPE_U32); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "rpage"); - ft.setString (DESC, "Number of pages in read-page-cache"); - buf.put (ft); + ft[NAME] = "readPages"; + ft[TYPE] = TYPE_U32; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "rpage"; + ft[DESC] = "Number of pages in read-page-cache"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "initialFileCount"); - ft.setInt (TYPE, TYPE_U16); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "file"); - ft.setString (DESC, "Number of files initially allocated to this journal"); - buf.put (ft); + ft[NAME] = "initialFileCount"; + ft[TYPE] = TYPE_U16; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "file"; + ft[DESC] = "Number of files initially allocated to this journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "autoExpand"); - ft.setInt (TYPE, TYPE_BOOL); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (DESC, "Auto-expand enabled"); - buf.put (ft); + ft[NAME] = "autoExpand"; + ft[TYPE] = TYPE_BOOL; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[DESC] = "Auto-expand enabled"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "currentFileCount"); - ft.setInt (TYPE, TYPE_U16); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "file"); - ft.setString (DESC, "Number of files currently allocated to this journal"); - buf.put (ft); + ft[NAME] = "currentFileCount"; + ft[TYPE] = TYPE_U16; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "file"; + ft[DESC] = "Number of files currently allocated to this journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "maxFileCount"); - ft.setInt (TYPE, TYPE_U16); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "file"); - ft.setString (DESC, "Max number of files allowed for this journal"); - buf.put (ft); + ft[NAME] = "maxFileCount"; + ft[TYPE] = TYPE_U16; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "file"; + ft[DESC] = "Max number of files allowed for this journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "dataFileSize"); - ft.setInt (TYPE, TYPE_U32); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "byte"); - ft.setString (DESC, "Size of each journal data file"); - buf.put (ft); + ft[NAME] = "dataFileSize"; + ft[TYPE] = TYPE_U32; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "byte"; + ft[DESC] = "Size of each journal data file"; + buf.putMap(ft); // Statistics ft.clear(); - ft.setString (NAME, "recordDepth"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "record"); - ft.setString (DESC, "Number of currently enqueued records (durable messages)"); - buf.put (ft); + ft[NAME] = "recordDepth"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "record"; + ft[DESC] = "Number of currently enqueued records (durable messages)"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "recordDepthHigh"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "record"); - ft.setString (DESC, "Number of currently enqueued records (durable messages) (High)"); - buf.put (ft); + ft[NAME] = "recordDepthHigh"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "record"; + ft[DESC] = "Number of currently enqueued records (durable messages) (High)"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "recordDepthLow"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "record"); - ft.setString (DESC, "Number of currently enqueued records (durable messages) (Low)"); - buf.put (ft); + ft[NAME] = "recordDepthLow"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "record"; + ft[DESC] = "Number of currently enqueued records (durable messages) (Low)"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "enqueues"); - ft.setInt (TYPE, TYPE_U64); - ft.setString (UNIT, "record"); - ft.setString (DESC, "Total enqueued records on journal"); - buf.put (ft); + ft[NAME] = "enqueues"; + ft[TYPE] = TYPE_U64; + ft[UNIT] = "record"; + ft[DESC] = "Total enqueued records on journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "dequeues"); - ft.setInt (TYPE, TYPE_U64); - ft.setString (UNIT, "record"); - ft.setString (DESC, "Total dequeued records on journal"); - buf.put (ft); + ft[NAME] = "dequeues"; + ft[TYPE] = TYPE_U64; + ft[UNIT] = "record"; + ft[DESC] = "Total dequeued records on journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "txn"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "record"); - ft.setString (DESC, "Total open transactions (xids) on journal"); - buf.put (ft); + ft[NAME] = "txn"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "record"; + ft[DESC] = "Total open transactions (xids) on journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "txnEnqueues"); - ft.setInt (TYPE, TYPE_U64); - ft.setString (UNIT, "record"); - ft.setString (DESC, "Total transactional enqueued records on journal"); - buf.put (ft); + ft[NAME] = "txnEnqueues"; + ft[TYPE] = TYPE_U64; + ft[UNIT] = "record"; + ft[DESC] = "Total transactional enqueued records on journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "txnDequeues"); - ft.setInt (TYPE, TYPE_U64); - ft.setString (UNIT, "record"); - ft.setString (DESC, "Total transactional dequeued records on journal"); - buf.put (ft); + ft[NAME] = "txnDequeues"; + ft[TYPE] = TYPE_U64; + ft[UNIT] = "record"; + ft[DESC] = "Total transactional dequeued records on journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "txnCommits"); - ft.setInt (TYPE, TYPE_U64); - ft.setString (UNIT, "record"); - ft.setString (DESC, "Total transactional commit records on journal"); - buf.put (ft); + ft[NAME] = "txnCommits"; + ft[TYPE] = TYPE_U64; + ft[UNIT] = "record"; + ft[DESC] = "Total transactional commit records on journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "txnAborts"); - ft.setInt (TYPE, TYPE_U64); - ft.setString (UNIT, "record"); - ft.setString (DESC, "Total transactional abort records on journal"); - buf.put (ft); + ft[NAME] = "txnAborts"; + ft[TYPE] = TYPE_U64; + ft[UNIT] = "record"; + ft[DESC] = "Total transactional abort records on journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "outstandingAIOs"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "aio_op"); - ft.setString (DESC, "Number of currently outstanding AIO requests in Async IO system"); - buf.put (ft); + ft[NAME] = "outstandingAIOs"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "aio_op"; + ft[DESC] = "Number of currently outstanding AIO requests in Async IO system"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "outstandingAIOsHigh"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "aio_op"); - ft.setString (DESC, "Number of currently outstanding AIO requests in Async IO system (High)"); - buf.put (ft); + ft[NAME] = "outstandingAIOsHigh"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "aio_op"; + ft[DESC] = "Number of currently outstanding AIO requests in Async IO system (High)"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "outstandingAIOsLow"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "aio_op"); - ft.setString (DESC, "Number of currently outstanding AIO requests in Async IO system (Low)"); - buf.put (ft); + ft[NAME] = "outstandingAIOsLow"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "aio_op"; + ft[DESC] = "Number of currently outstanding AIO requests in Async IO system (Low)"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "freeFileCount"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "file"; + ft[DESC] = "Number of files free on this journal. Includes free files trapped in holes."; + buf.putMap(ft); ft.clear(); - 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[NAME] = "freeFileCountHigh"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "file"; + ft[DESC] = "Number of files free on this journal. Includes free files trapped in holes. (High)"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "freeFileCountLow"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "file"; + ft[DESC] = "Number of files free on this journal. Includes free files trapped in holes. (Low)"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "availableFileCount"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "file"; + ft[DESC] = "Number of files available to be written. Excluding holes"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "availableFileCountHigh"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "file"; + ft[DESC] = "Number of files available to be written. Excluding holes (High)"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "availableFileCountLow"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "file"; + ft[DESC] = "Number of files available to be written. Excluding holes (Low)"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "writeWaitFailures"; + ft[TYPE] = TYPE_U64; + ft[UNIT] = "record"; + ft[DESC] = "AIO Wait failures on write"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "writeBusyFailures"; + ft[TYPE] = TYPE_U64; + ft[UNIT] = "record"; + ft[DESC] = "AIO Busy failures on write"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "readRecordCount"; + ft[TYPE] = TYPE_U64; + ft[UNIT] = "record"; + ft[DESC] = "Records read from the journal"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "readBusyFailures"; + ft[TYPE] = TYPE_U64; + ft[UNIT] = "record"; + ft[DESC] = "AIO Busy failures on read"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "writePageCacheDepth"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "wpage"; + ft[DESC] = "Current depth of write-page-cache"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "writePageCacheDepthHigh"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "wpage"; + ft[DESC] = "Current depth of write-page-cache (High)"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "writePageCacheDepthLow"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "wpage"; + ft[DESC] = "Current depth of write-page-cache (Low)"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "readPageCacheDepth"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "rpage"; + ft[DESC] = "Current depth of read-page-cache"; + buf.putMap(ft); ft.clear(); - 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[NAME] = "readPageCacheDepthHigh"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "rpage"; + ft[DESC] = "Current depth of read-page-cache (High)"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "readPageCacheDepthLow"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "rpage"); - ft.setString (DESC, "Current depth of read-page-cache (Low)"); - buf.put (ft); + ft[NAME] = "readPageCacheDepthLow"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "rpage"; + ft[DESC] = "Current depth of read-page-cache (Low)"; + buf.putMap(ft); // Methods ft.clear(); - ft.setString (NAME, "expand"); - ft.setInt (ARGCOUNT, 1); - ft.setString (DESC, "Increase number of files allocated for this journal"); - buf.put (ft); + ft[NAME] = "expand"; + ft[ARGCOUNT] = 1; + ft[DESC] = "Increase number of files allocated for this journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "by"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (DIR, "I"); - ft.setString (DESC, "Number of files to increase journal size by"); - buf.put (ft); + ft[NAME] = "by"; + ft[TYPE] = TYPE_U32; + ft[DIR] = "I"; + ft[DESC] = "Number of files to increase journal size by"; + buf.putMap(ft); { @@ -548,7 +549,7 @@ { char *_tmpBuf = new char[_sBuf.length()]; memcpy(_tmpBuf, _sBuf.data(), _sBuf.length()); - ::qpid::framing::Buffer buf(_tmpBuf, _sBuf.length()); + ::qpid::management::Buffer buf(_tmpBuf, _sBuf.length()); ::qpid::sys::Mutex::ScopedLock mutex(accessLock); { @@ -580,7 +581,7 @@ { const int _bufSize=65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::management::Buffer buf(_msgChars, _bufSize); ::qpid::sys::Mutex::ScopedLock mutex(accessLock); configChanged = false; @@ -618,7 +619,7 @@ { const int _bufSize=65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::management::Buffer buf(_msgChars, _bufSize); ::qpid::sys::Mutex::ScopedLock mutex(accessLock); instChanged = false; @@ -696,12 +697,12 @@ const int _bufSize=65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer outBuf(_msgChars, _bufSize); + ::qpid::management::Buffer outBuf(_msgChars, _bufSize); char *_tmpBuf = new char[inStr.length()]; memcpy(_tmpBuf, inStr.data(), inStr.length()); - ::qpid::framing::Buffer inBuf(_tmpBuf, inStr.length()); + ::qpid::management::Buffer inBuf(_tmpBuf, inStr.length()); if (methodName == "expand") { _matched = true; Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2010-04-08 16:38:12 UTC (rev 3901) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2010-04-09 03:54:13 UTC (rev 3902) @@ -23,8 +23,9 @@ #include "qpid/log/Statement.h" #include "qpid/management/Manageable.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/Buffer.h" +#include "qpid/management/Buffer.h" +#include "qpid/types/Variant.h" +#include "qpid/amqp_0_10/Codecs.h" #include "qpid/management/ManagementAgent.h" #include "Store.h" @@ -107,8 +108,8 @@ { const int _bufSize=65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); - ::qpid::framing::FieldTable ft; + ::qpid::management::Buffer buf(_msgChars, _bufSize); + ::qpid::types::Variant::Map ft; // Schema class header: buf.putOctet (CLASS_KIND_TABLE); @@ -121,174 +122,174 @@ // Properties ft.clear(); - ft.setString (NAME, "brokerRef"); - ft.setInt (TYPE, TYPE_REF); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 1); - ft.setInt (IS_OPTIONAL, 0); - buf.put (ft); + ft[NAME] = "brokerRef"; + ft[TYPE] = TYPE_REF; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 1; + ft[IS_OPTIONAL] = 0; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "location"); - ft.setInt (TYPE, TYPE_SSTR); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (DESC, "Logical directory on disk"); - buf.put (ft); + ft[NAME] = "location"; + ft[TYPE] = TYPE_SSTR; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[DESC] = "Logical directory on disk"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "defaultInitialFileCount"); - ft.setInt (TYPE, TYPE_U16); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "file"); - ft.setString (DESC, "Default number of files initially allocated to each journal"); - buf.put (ft); + ft[NAME] = "defaultInitialFileCount"; + ft[TYPE] = TYPE_U16; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "file"; + ft[DESC] = "Default number of files initially allocated to each journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "defaultDataFileSize"); - ft.setInt (TYPE, TYPE_U32); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "RdPg"); - ft.setString (DESC, "Default size of each journal data file"); - buf.put (ft); + ft[NAME] = "defaultDataFileSize"; + ft[TYPE] = TYPE_U32; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "RdPg"; + ft[DESC] = "Default size of each journal data file"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplIsInitialized"); - ft.setInt (TYPE, TYPE_BOOL); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (DESC, "Transaction prepared list has been initialized by a transactional prepare"); - buf.put (ft); + ft[NAME] = "tplIsInitialized"; + ft[TYPE] = TYPE_BOOL; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[DESC] = "Transaction prepared list has been initialized by a transactional prepare"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplDirectory"); - ft.setInt (TYPE, TYPE_SSTR); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (DESC, "Transaction prepared list directory"); - buf.put (ft); + ft[NAME] = "tplDirectory"; + ft[TYPE] = TYPE_SSTR; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[DESC] = "Transaction prepared list directory"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplWritePageSize"); - ft.setInt (TYPE, TYPE_U32); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "byte"); - ft.setString (DESC, "Page size in transaction prepared list write-page-cache"); - buf.put (ft); + ft[NAME] = "tplWritePageSize"; + ft[TYPE] = TYPE_U32; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "byte"; + ft[DESC] = "Page size in transaction prepared list write-page-cache"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplWritePages"); - ft.setInt (TYPE, TYPE_U32); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "wpage"); - ft.setString (DESC, "Number of pages in transaction prepared list write-page-cache"); - buf.put (ft); + ft[NAME] = "tplWritePages"; + ft[TYPE] = TYPE_U32; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "wpage"; + ft[DESC] = "Number of pages in transaction prepared list write-page-cache"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplInitialFileCount"); - ft.setInt (TYPE, TYPE_U16); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "file"); - ft.setString (DESC, "Number of files initially allocated to transaction prepared list journal"); - buf.put (ft); + ft[NAME] = "tplInitialFileCount"; + ft[TYPE] = TYPE_U16; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "file"; + ft[DESC] = "Number of files initially allocated to transaction prepared list journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplDataFileSize"); - ft.setInt (TYPE, TYPE_U32); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "byte"); - ft.setString (DESC, "Size of each journal data file in transaction prepared list journal"); - buf.put (ft); + ft[NAME] = "tplDataFileSize"; + ft[TYPE] = TYPE_U32; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "byte"; + ft[DESC] = "Size of each journal data file in transaction prepared list journal"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplCurrentFileCount"); - ft.setInt (TYPE, TYPE_U32); - ft.setInt (ACCESS, ACCESS_RO); - ft.setInt (IS_INDEX, 0); - ft.setInt (IS_OPTIONAL, 0); - ft.setString (UNIT, "file"); - ft.setString (DESC, "Number of files currently allocated to transaction prepared list journal"); - buf.put (ft); + ft[NAME] = "tplCurrentFileCount"; + ft[TYPE] = TYPE_U32; + ft[ACCESS] = ACCESS_RO; + ft[IS_INDEX] = 0; + ft[IS_OPTIONAL] = 0; + ft[UNIT] = "file"; + ft[DESC] = "Number of files currently allocated to transaction prepared list journal"; + buf.putMap(ft); // Statistics ft.clear(); - ft.setString (NAME, "tplTransactionDepth"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "txn"); - ft.setString (DESC, "Number of currently enqueued prepared transactions"); - buf.put (ft); + ft[NAME] = "tplTransactionDepth"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "txn"; + ft[DESC] = "Number of currently enqueued prepared transactions"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplTransactionDepthHigh"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "txn"); - ft.setString (DESC, "Number of currently enqueued prepared transactions (High)"); - buf.put (ft); + ft[NAME] = "tplTransactionDepthHigh"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "txn"; + ft[DESC] = "Number of currently enqueued prepared transactions (High)"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplTransactionDepthLow"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "txn"); - ft.setString (DESC, "Number of currently enqueued prepared transactions (Low)"); - buf.put (ft); + ft[NAME] = "tplTransactionDepthLow"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "txn"; + ft[DESC] = "Number of currently enqueued prepared transactions (Low)"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplTxnPrepares"); - ft.setInt (TYPE, TYPE_U64); - ft.setString (UNIT, "record"); - ft.setString (DESC, "Total transaction prepares on transaction prepared list"); - buf.put (ft); + ft[NAME] = "tplTxnPrepares"; + ft[TYPE] = TYPE_U64; + ft[UNIT] = "record"; + ft[DESC] = "Total transaction prepares on transaction prepared list"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplTxnCommits"); - ft.setInt (TYPE, TYPE_U64); - ft.setString (UNIT, "record"); - ft.setString (DESC, "Total transaction commits on transaction prepared list"); - buf.put (ft); + ft[NAME] = "tplTxnCommits"; + ft[TYPE] = TYPE_U64; + ft[UNIT] = "record"; + ft[DESC] = "Total transaction commits on transaction prepared list"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplTxnAborts"); - ft.setInt (TYPE, TYPE_U64); - ft.setString (UNIT, "record"); - ft.setString (DESC, "Total transaction aborts on transaction prepared list"); - buf.put (ft); + ft[NAME] = "tplTxnAborts"; + ft[TYPE] = TYPE_U64; + ft[UNIT] = "record"; + ft[DESC] = "Total transaction aborts on transaction prepared list"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplOutstandingAIOs"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "aio_op"); - ft.setString (DESC, "Number of currently outstanding AIO requests in Async IO system"); - buf.put (ft); + ft[NAME] = "tplOutstandingAIOs"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "aio_op"; + ft[DESC] = "Number of currently outstanding AIO requests in Async IO system"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplOutstandingAIOsHigh"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "aio_op"); - ft.setString (DESC, "Number of currently outstanding AIO requests in Async IO system (High)"); - buf.put (ft); + ft[NAME] = "tplOutstandingAIOsHigh"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "aio_op"; + ft[DESC] = "Number of currently outstanding AIO requests in Async IO system (High)"; + buf.putMap(ft); ft.clear(); - ft.setString (NAME, "tplOutstandingAIOsLow"); - ft.setInt (TYPE, TYPE_U32); - ft.setString (UNIT, "aio_op"); - ft.setString (DESC, "Number of currently outstanding AIO requests in Async IO system (Low)"); - buf.put (ft); + ft[NAME] = "tplOutstandingAIOsLow"; + ft[TYPE] = TYPE_U32; + ft[UNIT] = "aio_op"; + ft[DESC] = "Number of currently outstanding AIO requests in Async IO system (Low)"; + buf.putMap(ft); // Methods @@ -343,7 +344,7 @@ { char *_tmpBuf = new char[_sBuf.length()]; memcpy(_tmpBuf, _sBuf.data(), _sBuf.length()); - ::qpid::framing::Buffer buf(_tmpBuf, _sBuf.length()); + ::qpid::management::Buffer buf(_tmpBuf, _sBuf.length()); ::qpid::sys::Mutex::ScopedLock mutex(accessLock); { @@ -373,7 +374,7 @@ { const int _bufSize=65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::management::Buffer buf(_msgChars, _bufSize); ::qpid::sys::Mutex::ScopedLock mutex(accessLock); configChanged = false; @@ -409,7 +410,7 @@ { const int _bufSize=65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::management::Buffer buf(_msgChars, _bufSize); ::qpid::sys::Mutex::ScopedLock mutex(accessLock); instChanged = false; @@ -459,7 +460,7 @@ const int _bufSize=65536; char _msgChars[_bufSize]; - ::qpid::framing::Buffer outBuf(_msgChars, _bufSize); + ::qpid::management::Buffer outBuf(_msgChars, _bufSize);

16 years

1
0
0 / 0

rhmessaging commits: r3901 - mgmt/newdata/cumin/python/cumin/messaging.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-04-08 12:38:12 -0400 (Thu, 08 Apr 2010) New Revision: 3901 Added: mgmt/newdata/cumin/python/cumin/messaging/subscription.strings Modified: mgmt/newdata/cumin/python/cumin/messaging/subscription.py Log: Added Subscription Overview tab Modified: mgmt/newdata/cumin/python/cumin/messaging/subscription.py =================================================================== --- mgmt/newdata/cumin/python/cumin/messaging/subscription.py 2010-04-08 15:38:29 UTC (rev 3900) +++ mgmt/newdata/cumin/python/cumin/messaging/subscription.py 2010-04-08 16:38:12 UTC (rev 3901) @@ -1,7 +1,10 @@ from cumin.objectframe import * from cumin.objectselector import * +from cumin.stat import * from cumin.util import * +strings = StringCatalog(__file__) + class SubscriptionSelector(ObjectSelector): def __init__(self, app, name, queue): cls = app.rosemary.org_apache_qpid_broker.Subscription @@ -23,3 +26,21 @@ cls = app.rosemary.org_apache_qpid_broker.Subscription super(SubscriptionFrame, self).__init__(app, name, cls) + + overview = SubscriptionStats(app, "overview", self.object) + self.view.add_tab(overview) + +class SubscriptionStats(Widget): + def __init__(self, app, name, subscription): + super(SubscriptionStats, self).__init__(app, name) + + stats = StatSet(app, "stats", subscription) + stats.attrs = ("delivered",) + self.add_child(stats) + + chart = StatFlashChart(app, "delivered", subscription) + chart.stats = ("delivered",) + self.add_child(chart) + + def render_title(self, session): + return "Overview" Added: mgmt/newdata/cumin/python/cumin/messaging/subscription.strings =================================================================== --- mgmt/newdata/cumin/python/cumin/messaging/subscription.strings (rev 0) +++ mgmt/newdata/cumin/python/cumin/messaging/subscription.strings 2010-04-08 16:38:12 UTC (rev 3901) @@ -0,0 +1,15 @@ +[SubscriptionStats.html] +<table class="twocol"> + <tbody> + <tr> + <td> + <h2>Statistics</h2> + {stats} + </td> + <td> + {delivered} + </td> + </tr> + </tbody> +</table> +

16 years

1
0
0 / 0

rhmessaging commits: r3900 - mgmt/newdata/cumin/python/cumin/inventory.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-04-08 11:38:29 -0400 (Thu, 08 Apr 2010) New Revision: 3900 Modified: mgmt/newdata/cumin/python/cumin/inventory/system.py Log: First crack at adding System Overview tab Modified: mgmt/newdata/cumin/python/cumin/inventory/system.py =================================================================== --- mgmt/newdata/cumin/python/cumin/inventory/system.py 2010-04-08 15:21:20 UTC (rev 3899) +++ mgmt/newdata/cumin/python/cumin/inventory/system.py 2010-04-08 15:38:29 UTC (rev 3900) @@ -36,6 +36,12 @@ super(SystemFrame, self).__init__(app, name, cls) + self.icon_href = "resource?name=system-36.png" + + overview = SystemStats(app, "overview", self.object) + self.view.add_tab(overview) + + class TopSystemSet(TopTable): def __init__(self, app, name): super(TopSystemSet, self).__init__(app, name) @@ -97,7 +103,7 @@ self.add_child(slot_vis) def render_title(self, session): - return "Statistics" + return "Overview" def render_slot_job_url(self, session): #job = Identifiable("XXX")

16 years

1
0
0 / 0

rhmessaging commits: r3899 - mgmt/newdata/cumin/python/cumin/messaging.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-04-08 11:21:20 -0400 (Thu, 08 Apr 2010) New Revision: 3899 Modified: mgmt/newdata/cumin/python/cumin/messaging/connection.py Log: Change name of Connections Statistics tab to Overview Modified: mgmt/newdata/cumin/python/cumin/messaging/connection.py =================================================================== --- mgmt/newdata/cumin/python/cumin/messaging/connection.py 2010-04-07 18:19:35 UTC (rev 3898) +++ mgmt/newdata/cumin/python/cumin/messaging/connection.py 2010-04-08 15:21:20 UTC (rev 3899) @@ -108,7 +108,7 @@ self.add_child(chart) def render_title(self, session): - return "Statistics" + return "Overview" class SendReceiveRateChart(StatFlashChart): def render_title(self, session):

16 years

1
0
0 / 0

rhmessaging commits: r3898 - mgmt/newdata/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-04-07 14:19:35 -0400 (Wed, 07 Apr 2010) New Revision: 3898 Modified: mgmt/newdata/cumin/python/cumin/stat.py Log: Fix y axis labels for flash charts Modified: mgmt/newdata/cumin/python/cumin/stat.py =================================================================== --- mgmt/newdata/cumin/python/cumin/stat.py 2010-04-07 15:00:47 UTC (rev 3897) +++ mgmt/newdata/cumin/python/cumin/stat.py 2010-04-07 18:19:35 UTC (rev 3898) @@ -767,20 +767,22 @@ svalue = str(value) label["text"] = svalue - else: - label["text"] = "" - label["y"] = int(i * y_step) + label["y"] = int(i * y_step) + labels.append(label) - labels.append(label) return labels def get_y_axis(self, max_value, min_value): - y_intervals = 6 absy = max_value - min_value + y_intervals = min(6, absy) + y_steps = int(absy / y_intervals) + y_label_steps = 2 + if absy <= 2: + y_label_steps = 1 - if int(max_value) < 3: - y_steps = 3 + #if int(max_value) < 3: + # y_steps = 3 # .swf won't show grid lines without a y_axis on the left y_axis = { @@ -798,7 +800,7 @@ "tick-length": 0, "stroke": 1, "colour": "#BBBBBB", - "labels": {"colour": "#AAAAAA", "labels": self.get_y_labels(absy, y_intervals, 2)}} + "labels": {"colour": "#AAAAAA", "labels": self.get_y_labels(absy, y_intervals, y_label_steps)}} return y_axis, y_axis_right

16 years

1
0
0 / 0

rhmessaging commits: r3897 - mgmt/newdata/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-04-07 11:00:47 -0400 (Wed, 07 Apr 2010) New Revision: 3897 Modified: mgmt/newdata/cumin/python/cumin/stat.py Log: Less convoluted way to get RosemaryObject attributes to StatChart Modified: mgmt/newdata/cumin/python/cumin/stat.py =================================================================== --- mgmt/newdata/cumin/python/cumin/stat.py 2010-04-07 14:28:04 UTC (rev 3896) +++ mgmt/newdata/cumin/python/cumin/stat.py 2010-04-07 15:00:47 UTC (rev 3897) @@ -104,26 +104,15 @@ self.fullpageable = True - def get_object_id(self, session): - object = self.object.get(session) - return object._id - - def get_package_name(self, session): - object = self.object.get(session) - return object._class._package._name - - def get_object_class(self, session): - object = self.object.get(session) - return object._class._name - def get_href_params(self, session): + object = self.object.get(session) params = list() - params.append("id=%i" % self.get_object_id(session)) + params.append("id=%i" % object._id) params.append("chart_id=%s" % self.render_id(session, None)) params.append("duration=%s" % self.duration.get(session)) - params.append("rpkg=%s" % self.get_package_name(session)) - params.append("rcls=%s" % self.get_object_class(session)) + params.append("rpkg=%s" % object._class._package._name) + params.append("rcls=%s" % object._class._name) for stat in self.stats: params.append("stat=%s" % stat) @@ -151,37 +140,6 @@ cls = object._class return getattr(cls, self.stats[0]).title - def render_stats(self, session): - object = self.object.get(session) - cls = object._class - - writer = Writer() - - for name in self.stats: - stat = getattr(cls, name) - self.stats_tmpl.render(writer, session, stat) - - return writer.to_string() - - def render_stat_mode(self, session, stat): - return self.mode - - def render_stat_color(self, session, stat): - return "rgb(255,0,0)" - - def render_stat_value(self, session, stat): - object = self.object.get(session) - - if self.mode == "rate": - html = stat.rate_html(object) - else: - html = stat.value_html(object) - - return html - - def render_stat_name(self, session, stat): - return stat.name - def render_width(self, session): return 360 @@ -538,27 +496,27 @@ class ObjectAttribute(Attribute): def get(self, session): - rpackage = self.widget.rosemary_package.get(session) - rclass = self.widget.rosemary_class.get(session) - rosemary_package = self.app.rosemary._packages_by_name[rpackage] - rosemary_class = rosemary_package._classes_by_name[rclass] + obj = super(FlashFullPage.ObjectAttribute, self).get(session) + if not obj: + rpackage = self.widget.rosemary_package.get(session) + rclass = self.widget.rosemary_class.get(session) + rosemary_package = self.app.rosemary._packages_by_name[rpackage] + rosemary_class = rosemary_package._classes_by_name[rclass] - return rosemary_class + id = self.widget.id.get(session) + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() - class GenericChart(StatFlashChart): - def render_title(self, session): - cls = self.object.get(session) - return getattr(cls, self.stats[0]).title + try: + obj = rosemary_class.get_object(cursor, id) + finally: + cursor.close() - def get_object_id(self, session): - return self.parent.id.get(session) - - def get_package_name(self, session): - return self.parent.rosemary_package.get(session) - - def get_object_class(self, session): - return self.parent.rosemary_class.get(session) - + self.set(session, obj) + + return obj + + class GenericChart(StatFlashChart): def render_width(self, session): return self.parent.container_width.get(session)

16 years

1
0
0 / 0

rhmessaging commits: r3896 - mgmt/newdata/cumin/python/cumin/messaging.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-04-07 10:28:04 -0400 (Wed, 07 Apr 2010) New Revision: 3896 Modified: mgmt/newdata/cumin/python/cumin/messaging/queue.py Log: Use RosemaryClass get_selection method instead of old get_objects method to see if there are any Jounral entries for this queue Modified: mgmt/newdata/cumin/python/cumin/messaging/queue.py =================================================================== --- mgmt/newdata/cumin/python/cumin/messaging/queue.py 2010-04-06 20:30:40 UTC (rev 3895) +++ mgmt/newdata/cumin/python/cumin/messaging/queue.py 2010-04-07 14:28:04 UTC (rev 3896) @@ -534,7 +534,7 @@ cursor = conn.cursor() try: - journals = cls.select_objects(cursor, _queueRef_id=queue._id) + journals = cls.get_selection(cursor, _queueRef_id=queue._id) finally: cursor.close()

16 years

1
0
0 / 0

rhmessaging commits: r3895 - mgmt/newdata/cumin/python/cumin.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-04-06 16:30:40 -0400 (Tue, 06 Apr 2010) New Revision: 3895 Modified: mgmt/newdata/cumin/python/cumin/model.py Log: Avoid limit by _qmf_update_time when getting incremental data for rate chart Modified: mgmt/newdata/cumin/python/cumin/model.py =================================================================== --- mgmt/newdata/cumin/python/cumin/model.py 2010-04-06 20:04:09 UTC (rev 3894) +++ mgmt/newdata/cumin/python/cumin/model.py 2010-04-06 20:30:40 UTC (rev 3895) @@ -755,10 +755,9 @@ self.query.filters = list() SqlComparisonFilter(self.query, parent_col, self.parent_id, "=") - if delta: - secs = 60*60 - when = "now() - interval '%i seconds'" % int(secs + secs2) - SqlComparisonFilter(self.query, updated_col, when, ">=") + if not delta: + when = "now() - interval '%i seconds'" % int(secs + secs2) + SqlComparisonFilter(self.query, updated_col, when, ">=") when2 = "" if secs2: when2 = "now() - interval '%i seconds'" % int(secs2)

16 years

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

rhmessaging-commits April 2010