Author: tedross Date: 2010-03-31 17:13:51 -0400 (Wed, 31 Mar 2010) New Revision: 3888 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/EventCreated.h store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.h store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.h store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.cpp store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.h 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: Regenerated the QMF files for trunk updates. 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-03-31 18:19:14 UTC (rev 3887) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/ArgsJournalExpand.h 2010-03-31 21:13:51 UTC (rev 3888) @@ -25,8 +25,8 @@ // Please do not edit. #include "qpid/management/Args.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/Uuid.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-03-31 18:19:14 UTC (rev 3887) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.cpp 2010-03-31 21:13:51 UTC (rev 3888) @@ -22,13 +22,13 @@ // Please do not edit. #include "qpid/log/Statement.h" +#include "qpid/management/Manageable.h" #include "qpid/framing/FieldTable.h" -#include "qpid/management/Manageable.h" +#include "qpid/framing/Buffer.h" #include "qpid/management/ManagementAgent.h" #include "EventCreated.h" using namespace qmf::com::redhat::rhm::store; -using namespace qpid::framing; using qpid::management::ManagementAgent; using qpid::management::Manageable; using qpid::management::ManagementObject; @@ -61,16 +61,18 @@ agent->registerEvent(packageName, eventName, md5Sum, writeSchema); } -void EventCreated::writeSchema (Buffer& buf) +void EventCreated::writeSchema (std::string& schema) { - FieldTable ft; + const int _bufSize = 65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::framing::FieldTable ft; // Schema class header: buf.putOctet (CLASS_KIND_EVENT); buf.putShortString (packageName); // Package Name buf.putShortString (eventName); // Event Name buf.putBin128 (md5Sum); // Schema Hash - buf.putOctet (0); // No Superclass buf.putShort (3); // Argument Count // Arguments @@ -93,12 +95,35 @@ buf.put (ft); + { + uint32_t _len = buf.getPosition(); + buf.reset(); + buf.getRawData(schema, _len); + } } -void EventCreated::encode(::qpid::framing::Buffer& buf) const +void EventCreated::encode(std::string& _sBuf) const { + const int _bufSize=65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + buf.putShortString(jrnlId); buf.putLong(fileSize); buf.putShort(numFiles); + + uint32_t _bufLen = buf.getPosition(); + buf.reset(); + + buf.getRawData(_sBuf, _bufLen); } + +void EventCreated::mapEncode(::qpid::types::Variant::Map& map) const +{ + using namespace ::qpid::types; + map["jrnlId"] = ::qpid::types::Variant(jrnlId); + map["fileSize"] = ::qpid::types::Variant(fileSize); + map["numFiles"] = ::qpid::types::Variant(numFiles); + +} Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.h =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.h 2010-03-31 18:19:14 UTC (rev 3887) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.h 2010-03-31 21:13:51 UTC (rev 3888) @@ -25,8 +25,6 @@ // Please do not edit. #include "qpid/management/ManagementEvent.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/Uuid.h" namespace qmf { namespace com { @@ -38,10 +36,10 @@ class EventCreated : public ::qpid::management::ManagementEvent { private: - static void writeSchema (::qpid::framing::Buffer& buf); + static void writeSchema (std::string& schema); static std::string packageName; static std::string eventName; - static uint8_t md5Sum[16]; + static uint8_t md5Sum[MD5_LEN]; const std::string& jrnlId; const uint32_t fileSize; @@ -61,7 +59,8 @@ std::string& getEventName() const { return eventName; } uint8_t* getMd5Sum() const { return md5Sum; } uint8_t getSeverity() const { return 5; } - void encode(::qpid::framing::Buffer& buffer) const; + void encode(std::string& buffer) const; + void mapEncode(::qpid::types::Variant::Map& map) const; }; }}}}} 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-03-31 18:19:14 UTC (rev 3887) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.cpp 2010-03-31 21:13:51 UTC (rev 3888) @@ -22,13 +22,13 @@ // Please do not edit. #include "qpid/log/Statement.h" +#include "qpid/management/Manageable.h" #include "qpid/framing/FieldTable.h" -#include "qpid/management/Manageable.h" +#include "qpid/framing/Buffer.h" #include "qpid/management/ManagementAgent.h" #include "EventEnqThresholdExceeded.h" using namespace qmf::com::redhat::rhm::store; -using namespace qpid::framing; using qpid::management::ManagementAgent; using qpid::management::Manageable; using qpid::management::ManagementObject; @@ -59,16 +59,18 @@ agent->registerEvent(packageName, eventName, md5Sum, writeSchema); } -void EventEnqThresholdExceeded::writeSchema (Buffer& buf) +void EventEnqThresholdExceeded::writeSchema (std::string& schema) { - FieldTable ft; + const int _bufSize = 65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::framing::FieldTable ft; // Schema class header: buf.putOctet (CLASS_KIND_EVENT); buf.putShortString (packageName); // Package Name buf.putShortString (eventName); // Event Name buf.putBin128 (md5Sum); // Schema Hash - buf.putOctet (0); // No Superclass buf.putShort (2); // Argument Count // Arguments @@ -85,11 +87,33 @@ buf.put (ft); + { + uint32_t _len = buf.getPosition(); + buf.reset(); + buf.getRawData(schema, _len); + } } -void EventEnqThresholdExceeded::encode(::qpid::framing::Buffer& buf) const +void EventEnqThresholdExceeded::encode(std::string& _sBuf) const { + const int _bufSize=65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + buf.putShortString(jrnlId); buf.putShortString(what); + + uint32_t _bufLen = buf.getPosition(); + buf.reset(); + + buf.getRawData(_sBuf, _bufLen); } + +void EventEnqThresholdExceeded::mapEncode(::qpid::types::Variant::Map& map) const +{ + using namespace ::qpid::types; + map["jrnlId"] = ::qpid::types::Variant(jrnlId); + map["what"] = ::qpid::types::Variant(what); + +} Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.h =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.h 2010-03-31 18:19:14 UTC (rev 3887) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.h 2010-03-31 21:13:51 UTC (rev 3888) @@ -25,8 +25,6 @@ // Please do not edit. #include "qpid/management/ManagementEvent.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/Uuid.h" namespace qmf { namespace com { @@ -38,10 +36,10 @@ class EventEnqThresholdExceeded : public ::qpid::management::ManagementEvent { private: - static void writeSchema (::qpid::framing::Buffer& buf); + static void writeSchema (std::string& schema); static std::string packageName; static std::string eventName; - static uint8_t md5Sum[16]; + static uint8_t md5Sum[MD5_LEN]; const std::string& jrnlId; const std::string& what; @@ -59,7 +57,8 @@ std::string& getEventName() const { return eventName; } uint8_t* getMd5Sum() const { return md5Sum; } uint8_t getSeverity() const { return 4; } - void encode(::qpid::framing::Buffer& buffer) const; + void encode(std::string& buffer) const; + void mapEncode(::qpid::types::Variant::Map& map) const; }; }}}}} 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-03-31 18:19:14 UTC (rev 3887) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.cpp 2010-03-31 21:13:51 UTC (rev 3888) @@ -22,13 +22,13 @@ // Please do not edit. #include "qpid/log/Statement.h" +#include "qpid/management/Manageable.h" #include "qpid/framing/FieldTable.h" -#include "qpid/management/Manageable.h" +#include "qpid/framing/Buffer.h" #include "qpid/management/ManagementAgent.h" #include "EventFull.h" using namespace qmf::com::redhat::rhm::store; -using namespace qpid::framing; using qpid::management::ManagementAgent; using qpid::management::Manageable; using qpid::management::ManagementObject; @@ -59,16 +59,18 @@ agent->registerEvent(packageName, eventName, md5Sum, writeSchema); } -void EventFull::writeSchema (Buffer& buf) +void EventFull::writeSchema (std::string& schema) { - FieldTable ft; + const int _bufSize = 65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::framing::FieldTable ft; // Schema class header: buf.putOctet (CLASS_KIND_EVENT); buf.putShortString (packageName); // Package Name buf.putShortString (eventName); // Event Name buf.putBin128 (md5Sum); // Schema Hash - buf.putOctet (0); // No Superclass buf.putShort (2); // Argument Count // Arguments @@ -85,11 +87,33 @@ buf.put (ft); + { + uint32_t _len = buf.getPosition(); + buf.reset(); + buf.getRawData(schema, _len); + } } -void EventFull::encode(::qpid::framing::Buffer& buf) const +void EventFull::encode(std::string& _sBuf) const { + const int _bufSize=65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + buf.putShortString(jrnlId); buf.putShortString(what); + + uint32_t _bufLen = buf.getPosition(); + buf.reset(); + + buf.getRawData(_sBuf, _bufLen); } + +void EventFull::mapEncode(::qpid::types::Variant::Map& map) const +{ + using namespace ::qpid::types; + map["jrnlId"] = ::qpid::types::Variant(jrnlId); + map["what"] = ::qpid::types::Variant(what); + +} Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.h =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.h 2010-03-31 18:19:14 UTC (rev 3887) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.h 2010-03-31 21:13:51 UTC (rev 3888) @@ -25,8 +25,6 @@ // Please do not edit. #include "qpid/management/ManagementEvent.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/Uuid.h" namespace qmf { namespace com { @@ -38,10 +36,10 @@ class EventFull : public ::qpid::management::ManagementEvent { private: - static void writeSchema (::qpid::framing::Buffer& buf); + static void writeSchema (std::string& schema); static std::string packageName; static std::string eventName; - static uint8_t md5Sum[16]; + static uint8_t md5Sum[MD5_LEN]; const std::string& jrnlId; const std::string& what; @@ -59,7 +57,8 @@ std::string& getEventName() const { return eventName; } uint8_t* getMd5Sum() const { return md5Sum; } uint8_t getSeverity() const { return 3; } - void encode(::qpid::framing::Buffer& buffer) const; + void encode(std::string& buffer) const; + void mapEncode(::qpid::types::Variant::Map& map) const; }; }}}}} 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-03-31 18:19:14 UTC (rev 3887) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.cpp 2010-03-31 21:13:51 UTC (rev 3888) @@ -22,13 +22,13 @@ // Please do not edit. #include "qpid/log/Statement.h" +#include "qpid/management/Manageable.h" #include "qpid/framing/FieldTable.h" -#include "qpid/management/Manageable.h" +#include "qpid/framing/Buffer.h" #include "qpid/management/ManagementAgent.h" #include "EventRecovered.h" using namespace qmf::com::redhat::rhm::store; -using namespace qpid::framing; using qpid::management::ManagementAgent; using qpid::management::Manageable; using qpid::management::ManagementObject; @@ -69,16 +69,18 @@ agent->registerEvent(packageName, eventName, md5Sum, writeSchema); } -void EventRecovered::writeSchema (Buffer& buf) +void EventRecovered::writeSchema (std::string& schema) { - FieldTable ft; + const int _bufSize = 65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::framing::FieldTable ft; // Schema class header: buf.putOctet (CLASS_KIND_EVENT); buf.putShortString (packageName); // Package Name buf.putShortString (eventName); // Event Name buf.putBin128 (md5Sum); // Schema Hash - buf.putOctet (0); // No Superclass buf.putShort (7); // Argument Count // Arguments @@ -125,10 +127,19 @@ buf.put (ft); + { + uint32_t _len = buf.getPosition(); + buf.reset(); + buf.getRawData(schema, _len); + } } -void EventRecovered::encode(::qpid::framing::Buffer& buf) const +void EventRecovered::encode(std::string& _sBuf) const { + const int _bufSize=65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + buf.putShortString(jrnlId); buf.putLong(fileSize); buf.putShort(numFiles); @@ -137,4 +148,22 @@ buf.putLong(numTxnEnq); buf.putLong(numTxnDeq); + + uint32_t _bufLen = buf.getPosition(); + buf.reset(); + + buf.getRawData(_sBuf, _bufLen); } + +void EventRecovered::mapEncode(::qpid::types::Variant::Map& map) const +{ + using namespace ::qpid::types; + map["jrnlId"] = ::qpid::types::Variant(jrnlId); + map["fileSize"] = ::qpid::types::Variant(fileSize); + map["numFiles"] = ::qpid::types::Variant(numFiles); + map["numEnq"] = ::qpid::types::Variant(numEnq); + map["numTxn"] = ::qpid::types::Variant(numTxn); + map["numTxnEnq"] = ::qpid::types::Variant(numTxnEnq); + map["numTxnDeq"] = ::qpid::types::Variant(numTxnDeq); + +} Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.h =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.h 2010-03-31 18:19:14 UTC (rev 3887) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.h 2010-03-31 21:13:51 UTC (rev 3888) @@ -25,8 +25,6 @@ // Please do not edit. #include "qpid/management/ManagementEvent.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/Uuid.h" namespace qmf { namespace com { @@ -38,10 +36,10 @@ class EventRecovered : public ::qpid::management::ManagementEvent { private: - static void writeSchema (::qpid::framing::Buffer& buf); + static void writeSchema (std::string& schema); static std::string packageName; static std::string eventName; - static uint8_t md5Sum[16]; + static uint8_t md5Sum[MD5_LEN]; const std::string& jrnlId; const uint32_t fileSize; @@ -69,7 +67,8 @@ std::string& getEventName() const { return eventName; } uint8_t* getMd5Sum() const { return md5Sum; } uint8_t getSeverity() const { return 5; } - void encode(::qpid::framing::Buffer& buffer) const; + void encode(std::string& buffer) const; + void mapEncode(::qpid::types::Variant::Map& map) const; }; }}}}} 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-03-31 18:19:14 UTC (rev 3887) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2010-03-31 21:13:51 UTC (rev 3888) @@ -22,8 +22,9 @@ // Please do not edit. #include "qpid/log/Statement.h" +#include "qpid/management/Manageable.h" #include "qpid/framing/FieldTable.h" -#include "qpid/management/Manageable.h" +#include "qpid/framing/Buffer.h" #include "qpid/management/ManagementAgent.h" #include "Journal.h" #include "ArgsJournalExpand.h" @@ -31,7 +32,6 @@ #include <iostream> using namespace qmf::com::redhat::rhm::store; -using namespace qpid::framing; using qpid::management::ManagementAgent; using qpid::management::Manageable; using qpid::management::ManagementObject; @@ -40,7 +40,7 @@ string Journal::packageName = string ("com.redhat.rhm.store"); string Journal::className = string ("journal"); -uint8_t Journal::md5Sum[16] = +uint8_t Journal::md5Sum[MD5_LEN] = {0x9,0xc2,0xe2,0xfc,0xcc,0x2e,0x72,0xaa,0x3f,0xce,0x36,0x28,0xce,0x81,0xc,0xd4}; Journal::Journal (ManagementAgent*, Manageable* _core) : @@ -119,9 +119,12 @@ agent->registerClass(packageName, className, md5Sum, writeSchema); } -void Journal::writeSchema (Buffer& buf) +void Journal::writeSchema (std::string& schema) { - FieldTable ft; + const int _bufSize=65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::framing::FieldTable ft; // Schema class header: buf.putOctet (CLASS_KIND_TABLE); @@ -477,10 +480,15 @@ buf.put (ft); + { + uint32_t _len = buf.getPosition(); + buf.reset(); + buf.getRawData(schema, _len); + } } -void Journal::aggregatePerThreadStats(struct PerThreadStats* totals) +void Journal::aggregatePerThreadStats(struct PerThreadStats* totals) const { totals->enqueues = 0; totals->dequeues = 0; @@ -514,6 +522,7 @@ } + uint32_t Journal::writePropertiesSize() const { uint32_t size = writeTimestampsSize(); @@ -535,12 +544,21 @@ return size; } -void Journal::readProperties (Buffer& buf) +void Journal::readProperties (const std::string& _sBuf) { + char *_tmpBuf = new char[_sBuf.length()]; + memcpy(_tmpBuf, _sBuf.data(), _sBuf.length()); + ::qpid::framing::Buffer buf(_tmpBuf, _sBuf.length()); ::qpid::sys::Mutex::ScopedLock mutex(accessLock); - readTimestamps(buf); - queueRef.decode(buf); + { + std::string _tbuf; + buf.getRawData(_tbuf, writeTimestampsSize()); + readTimestamps(_tbuf); + } + + + {std::string _s; buf.getRawData(_s, queueRef.encodedSize()); queueRef.decode(_s);}; buf.getShortString(name); buf.getShortString(directory); buf.getShortString(baseFileName); @@ -554,16 +572,28 @@ maxFileCount = buf.getShort(); dataFileSize = buf.getLong(); + + delete [] _tmpBuf; } -void Journal::writeProperties (Buffer& buf) const +void Journal::writeProperties (std::string& _sBuf) const { + const int _bufSize=65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::sys::Mutex::ScopedLock mutex(accessLock); configChanged = false; - writeTimestamps (buf); + { + std::string _tbuf; + writeTimestamps(_tbuf); + buf.putRawData(_tbuf); + } - queueRef.encode(buf); + + + {std::string _s; queueRef.encode(_s); buf.putRawData(_s);}; buf.putShortString(name); buf.putShortString(directory); buf.putShortString(baseFileName); @@ -577,10 +607,19 @@ buf.putShort(maxFileCount); buf.putLong(dataFileSize); + + uint32_t _bufLen = buf.getPosition(); + buf.reset(); + + buf.getRawData(_sBuf, _bufLen); } -void Journal::writeStatistics (Buffer& buf, bool skipHeaders) +void Journal::writeStatistics (std::string& _sBuf, bool skipHeaders) { + const int _bufSize=65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::sys::Mutex::ScopedLock mutex(accessLock); instChanged = false; @@ -589,8 +628,12 @@ aggregatePerThreadStats(&totals); - if (!skipHeaders) - writeTimestamps (buf); + if (!skipHeaders) { + std::string _tbuf; + writeTimestamps (_tbuf); + buf.putRawData(_tbuf); + } + buf.putLong(recordDepth); buf.putLong(recordDepthHigh); buf.putLong(recordDepthLow); @@ -637,25 +680,50 @@ readPageCacheDepthLow = readPageCacheDepth; + + uint32_t _bufLen = buf.getPosition(); + buf.reset(); + + buf.getRawData(_sBuf, _bufLen); } -void Journal::doMethod (string& methodName, Buffer& inBuf, Buffer& outBuf) +void Journal::doMethod (string& methodName, const string& inStr, string& outStr) { Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD; std::string text; + bool _matched = false; + const int _bufSize=65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer outBuf(_msgChars, _bufSize); + + + char *_tmpBuf = new char[inStr.length()]; + memcpy(_tmpBuf, inStr.data(), inStr.length()); + ::qpid::framing::Buffer inBuf(_tmpBuf, inStr.length()); + if (methodName == "expand") { + _matched = true; ArgsJournalExpand ioArgs; ioArgs.i_by = inBuf.getLong(); status = coreObject->ManagementMethod (METHOD_EXPAND, ioArgs, text); outBuf.putLong (status); outBuf.putMediumString(::qpid::management::Manageable::StatusText (status, text)); - return; } - outBuf.putLong(status); - outBuf.putShortString(Manageable::StatusText(status, text)); + delete [] _tmpBuf; + + + if (!_matched) { + outBuf.putLong(status); + outBuf.putShortString(Manageable::StatusText(status, text)); + } + + uint32_t _bufLen = outBuf.getPosition(); + outBuf.reset(); + + outBuf.getRawData(outStr, _bufLen); } std::string Journal::getKey() const @@ -666,3 +734,156 @@ return key.str(); } + + +void Journal::mapEncodeValues (::qpid::types::Variant::Map& _map, + bool includeProperties, + bool includeStatistics) +{ + using namespace ::qpid::types; + ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + + if (includeProperties) { + configChanged = false; + _map["queueRef"] = ::qpid::types::Variant(queueRef); + _map["name"] = ::qpid::types::Variant(name); + _map["directory"] = ::qpid::types::Variant(directory); + _map["baseFileName"] = ::qpid::types::Variant(baseFileName); + _map["writePageSize"] = ::qpid::types::Variant(writePageSize); + _map["writePages"] = ::qpid::types::Variant(writePages); + _map["readPageSize"] = ::qpid::types::Variant(readPageSize); + _map["readPages"] = ::qpid::types::Variant(readPages); + _map["initialFileCount"] = ::qpid::types::Variant(initialFileCount); + _map["autoExpand"] = ::qpid::types::Variant(autoExpand); + _map["currentFileCount"] = ::qpid::types::Variant(currentFileCount); + _map["maxFileCount"] = ::qpid::types::Variant(maxFileCount); + _map["dataFileSize"] = ::qpid::types::Variant(dataFileSize); + + } + + if (includeStatistics) { + instChanged = false; + + + struct PerThreadStats totals; + aggregatePerThreadStats(&totals); + + + + _map["recordDepth"] = ::qpid::types::Variant(recordDepth); + _map["recordDepthHigh"] = ::qpid::types::Variant(recordDepthHigh); + _map["recordDepthLow"] = ::qpid::types::Variant(recordDepthLow); + _map["enqueues"] = ::qpid::types::Variant(totals.enqueues); + _map["dequeues"] = ::qpid::types::Variant(totals.dequeues); + _map["txn"] = ::qpid::types::Variant(totals.txn); + _map["txnEnqueues"] = ::qpid::types::Variant(totals.txnEnqueues); + _map["txnDequeues"] = ::qpid::types::Variant(totals.txnDequeues); + _map["txnCommits"] = ::qpid::types::Variant(totals.txnCommits); + _map["txnAborts"] = ::qpid::types::Variant(totals.txnAborts); + _map["outstandingAIOs"] = ::qpid::types::Variant(outstandingAIOs); + _map["outstandingAIOsHigh"] = ::qpid::types::Variant(outstandingAIOsHigh); + _map["outstandingAIOsLow"] = ::qpid::types::Variant(outstandingAIOsLow); + _map["freeFileCount"] = ::qpid::types::Variant(freeFileCount); + _map["freeFileCountHigh"] = ::qpid::types::Variant(freeFileCountHigh); + _map["freeFileCountLow"] = ::qpid::types::Variant(freeFileCountLow); + _map["availableFileCount"] = ::qpid::types::Variant(availableFileCount); + _map["availableFileCountHigh"] = ::qpid::types::Variant(availableFileCountHigh); + _map["availableFileCountLow"] = ::qpid::types::Variant(availableFileCountLow); + _map["writeWaitFailures"] = ::qpid::types::Variant(totals.writeWaitFailures); + _map["writeBusyFailures"] = ::qpid::types::Variant(totals.writeBusyFailures); + _map["readRecordCount"] = ::qpid::types::Variant(totals.readRecordCount); + _map["readBusyFailures"] = ::qpid::types::Variant(totals.readBusyFailures); + _map["writePageCacheDepth"] = ::qpid::types::Variant(writePageCacheDepth); + _map["writePageCacheDepthHigh"] = ::qpid::types::Variant(writePageCacheDepthHigh); + _map["writePageCacheDepthLow"] = ::qpid::types::Variant(writePageCacheDepthLow); + _map["readPageCacheDepth"] = ::qpid::types::Variant(readPageCacheDepth); + _map["readPageCacheDepthHigh"] = ::qpid::types::Variant(readPageCacheDepthHigh); + _map["readPageCacheDepthLow"] = ::qpid::types::Variant(readPageCacheDepthLow); + + + // Maintenance of hi-lo statistics + recordDepthHigh = recordDepth; + recordDepthLow = recordDepth; + outstandingAIOsHigh = outstandingAIOs; + outstandingAIOsLow = outstandingAIOs; + freeFileCountHigh = freeFileCount; + freeFileCountLow = freeFileCount; + availableFileCountHigh = availableFileCount; + availableFileCountLow = availableFileCount; + writePageCacheDepthHigh = writePageCacheDepth; + writePageCacheDepthLow = writePageCacheDepth; + readPageCacheDepthHigh = readPageCacheDepth; + readPageCacheDepthLow = readPageCacheDepth; + + + } +} + +void Journal::mapDecodeValues (const ::qpid::types::Variant::Map& _map) +{ + ::qpid::types::Variant::Map::const_iterator _i; + ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + + if ((_i = _map.find("queueRef")) != _map.end()) { + queueRef = _i->second; + } + if ((_i = _map.find("name")) != _map.end()) { + name = (_i->second).getString(); + } + if ((_i = _map.find("directory")) != _map.end()) { + directory = (_i->second).getString(); + } + if ((_i = _map.find("baseFileName")) != _map.end()) { + baseFileName = (_i->second).getString(); + } + if ((_i = _map.find("writePageSize")) != _map.end()) { + writePageSize = _i->second; + } + if ((_i = _map.find("writePages")) != _map.end()) { + writePages = _i->second; + } + if ((_i = _map.find("readPageSize")) != _map.end()) { + readPageSize = _i->second; + } + if ((_i = _map.find("readPages")) != _map.end()) { + readPages = _i->second; + } + if ((_i = _map.find("initialFileCount")) != _map.end()) { + initialFileCount = _i->second; + } + if ((_i = _map.find("autoExpand")) != _map.end()) { + autoExpand = _i->second; + } + if ((_i = _map.find("currentFileCount")) != _map.end()) { + currentFileCount = _i->second; + } + if ((_i = _map.find("maxFileCount")) != _map.end()) { + maxFileCount = _i->second; + } + if ((_i = _map.find("dataFileSize")) != _map.end()) { + dataFileSize = _i->second; + } + +} + +void Journal::doMethod (string& methodName, const ::qpid::types::Variant::Map& inMap, ::qpid::types::Variant::Map& outMap) +{ + Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD; + std::string text; + + + if (methodName == "expand") { + ArgsJournalExpand ioArgs; + ::qpid::types::Variant::Map::const_iterator _i; + if ((_i = inMap.find("by")) != inMap.end()) { + ioArgs.i_by = _i->second; + } + status = coreObject->ManagementMethod (METHOD_EXPAND, ioArgs, text); + outMap["_status_code"] = (uint32_t) status; + outMap["_status_text"] = ::qpid::management::Manageable::StatusText(status, text); + return; + } + + outMap["_status_code"] = (uint32_t) status; + outMap["_status_text"] = Manageable::StatusText(status, text); +} 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-03-31 18:19:14 UTC (rev 3887) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2010-03-31 21:13:51 UTC (rev 3888) @@ -25,8 +25,6 @@ // Please do not edit. #include "qpid/management/ManagementObject.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/Uuid.h" namespace qpid { namespace management { @@ -47,7 +45,7 @@ static std::string packageName; static std::string className; - static uint8_t md5Sum[16]; + static uint8_t md5Sum[MD5_LEN]; // Properties @@ -126,18 +124,28 @@ return threadStats; } - void aggregatePerThreadStats(struct PerThreadStats*); + void aggregatePerThreadStats(struct PerThreadStats*) const; public: - static void writeSchema(::qpid::framing::Buffer& buf); + static void writeSchema(std::string& schema); + void mapEncodeValues(::qpid::types::Variant::Map& map, + bool includeProperties=true, + bool includeStatistics=true); + void mapDecodeValues(const ::qpid::types::Variant::Map& map); + void doMethod(std::string& methodName, + const ::qpid::types::Variant::Map& inMap, + ::qpid::types::Variant::Map& outMap); + std::string getKey() const; + uint32_t writePropertiesSize() const; - void readProperties(::qpid::framing::Buffer& buf); - void writeProperties(::qpid::framing::Buffer& buf) const; - void writeStatistics(::qpid::framing::Buffer& buf, bool skipHeaders = false); + void readProperties(const std::string& buf); + void writeProperties(std::string& buf) const; + void writeStatistics(std::string& buf, bool skipHeaders = false); void doMethod(std::string& methodName, - ::qpid::framing::Buffer& inBuf, - ::qpid::framing::Buffer& outBuf); - std::string getKey() const; + const std::string& inBuf, + std::string& outBuf); + + writeSchemaCall_t getWriteSchemaCall() { return writeSchema; } 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-03-31 18:19:14 UTC (rev 3887) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2010-03-31 21:13:51 UTC (rev 3888) @@ -22,15 +22,15 @@ // Please do not edit. #include "qpid/log/Statement.h" +#include "qpid/management/Manageable.h" #include "qpid/framing/FieldTable.h" -#include "qpid/management/Manageable.h" +#include "qpid/framing/Buffer.h" #include "qpid/management/ManagementAgent.h" #include "Store.h" #include <iostream> using namespace qmf::com::redhat::rhm::store; -using namespace qpid::framing; using qpid::management::ManagementAgent; using qpid::management::Manageable; using qpid::management::ManagementObject; @@ -39,7 +39,7 @@ string Store::packageName = string ("com.redhat.rhm.store"); string Store::className = string ("store"); -uint8_t Store::md5Sum[16] = +uint8_t Store::md5Sum[MD5_LEN] = {0x18,0xd,0xd4,0x15,0xd3,0x9a,0xf,0xbe,0x3a,0x40,0xe1,0x1b,0x9e,0x5b,0x7e,0x86}; Store::Store (ManagementAgent*, Manageable* _core, ::qpid::management::Manageable* _parent) : @@ -103,9 +103,12 @@ agent->registerClass(packageName, className, md5Sum, writeSchema); } -void Store::writeSchema (Buffer& buf) +void Store::writeSchema (std::string& schema) { - FieldTable ft; + const int _bufSize=65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::framing::FieldTable ft; // Schema class header: buf.putOctet (CLASS_KIND_TABLE); @@ -290,10 +293,15 @@ // Methods + { + uint32_t _len = buf.getPosition(); + buf.reset(); + buf.getRawData(schema, _len); + } } -void Store::aggregatePerThreadStats(struct PerThreadStats* totals) +void Store::aggregatePerThreadStats(struct PerThreadStats* totals) const { totals->tplTxnPrepares = 0; totals->tplTxnCommits = 0; @@ -311,6 +319,7 @@ } + uint32_t Store::writePropertiesSize() const { uint32_t size = writeTimestampsSize(); @@ -330,12 +339,21 @@ return size; } -void Store::readProperties (Buffer& buf) +void Store::readProperties (const std::string& _sBuf) { + char *_tmpBuf = new char[_sBuf.length()]; + memcpy(_tmpBuf, _sBuf.data(), _sBuf.length()); + ::qpid::framing::Buffer buf(_tmpBuf, _sBuf.length()); ::qpid::sys::Mutex::ScopedLock mutex(accessLock); - readTimestamps(buf); - brokerRef.decode(buf); + { + std::string _tbuf; + buf.getRawData(_tbuf, writeTimestampsSize()); + readTimestamps(_tbuf); + } + + + {std::string _s; buf.getRawData(_s, brokerRef.encodedSize()); brokerRef.decode(_s);}; buf.getShortString(location); defaultInitialFileCount = buf.getShort(); defaultDataFileSize = buf.getLong(); @@ -347,16 +365,28 @@ tplDataFileSize = buf.getLong(); tplCurrentFileCount = buf.getLong(); + + delete [] _tmpBuf; } -void Store::writeProperties (Buffer& buf) const +void Store::writeProperties (std::string& _sBuf) const { + const int _bufSize=65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::sys::Mutex::ScopedLock mutex(accessLock); configChanged = false; - writeTimestamps (buf); + { + std::string _tbuf; + writeTimestamps(_tbuf); + buf.putRawData(_tbuf); + } - brokerRef.encode(buf); + + + {std::string _s; brokerRef.encode(_s); buf.putRawData(_s);}; buf.putShortString(location); buf.putShort(defaultInitialFileCount); buf.putLong(defaultDataFileSize); @@ -368,10 +398,19 @@ buf.putLong(tplDataFileSize); buf.putLong(tplCurrentFileCount); + + uint32_t _bufLen = buf.getPosition(); + buf.reset(); + + buf.getRawData(_sBuf, _bufLen); } -void Store::writeStatistics (Buffer& buf, bool skipHeaders) +void Store::writeStatistics (std::string& _sBuf, bool skipHeaders) { + const int _bufSize=65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer buf(_msgChars, _bufSize); + ::qpid::sys::Mutex::ScopedLock mutex(accessLock); instChanged = false; @@ -380,8 +419,12 @@ aggregatePerThreadStats(&totals); - if (!skipHeaders) - writeTimestamps (buf); + if (!skipHeaders) { + std::string _tbuf; + writeTimestamps (_tbuf); + buf.putRawData(_tbuf); + } + buf.putLong(tplTransactionDepth); buf.putLong(tplTransactionDepthHigh); buf.putLong(tplTransactionDepthLow); @@ -400,16 +443,35 @@ tplOutstandingAIOsLow = tplOutstandingAIOs; + + uint32_t _bufLen = buf.getPosition(); + buf.reset(); + + buf.getRawData(_sBuf, _bufLen); } -void Store::doMethod (string&, Buffer&, Buffer& outBuf) +void Store::doMethod (string&, const string&, string& outStr) { Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD; std::string text; + bool _matched = false; - outBuf.putLong(status); - outBuf.putShortString(Manageable::StatusText(status, text)); + const int _bufSize=65536; + char _msgChars[_bufSize]; + ::qpid::framing::Buffer outBuf(_msgChars, _bufSize); + + + + if (!_matched) { + outBuf.putLong(status); + outBuf.putShortString(Manageable::StatusText(status, text)); + } + + uint32_t _bufLen = outBuf.getPosition(); + outBuf.reset(); + + outBuf.getRawData(outStr, _bufLen); } std::string Store::getKey() const @@ -420,3 +482,108 @@ return key.str(); } + + +void Store::mapEncodeValues (::qpid::types::Variant::Map& _map, + bool includeProperties, + bool includeStatistics) +{ + using namespace ::qpid::types; + ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + + if (includeProperties) { + configChanged = false; + _map["brokerRef"] = ::qpid::types::Variant(brokerRef); + _map["location"] = ::qpid::types::Variant(location); + _map["defaultInitialFileCount"] = ::qpid::types::Variant(defaultInitialFileCount); + _map["defaultDataFileSize"] = ::qpid::types::Variant(defaultDataFileSize); + _map["tplIsInitialized"] = ::qpid::types::Variant(tplIsInitialized); + _map["tplDirectory"] = ::qpid::types::Variant(tplDirectory); + _map["tplWritePageSize"] = ::qpid::types::Variant(tplWritePageSize); + _map["tplWritePages"] = ::qpid::types::Variant(tplWritePages); + _map["tplInitialFileCount"] = ::qpid::types::Variant(tplInitialFileCount); + _map["tplDataFileSize"] = ::qpid::types::Variant(tplDataFileSize); + _map["tplCurrentFileCount"] = ::qpid::types::Variant(tplCurrentFileCount); + + } + + if (includeStatistics) { + instChanged = false; + + + struct PerThreadStats totals; + aggregatePerThreadStats(&totals); + + + + _map["tplTransactionDepth"] = ::qpid::types::Variant(tplTransactionDepth); + _map["tplTransactionDepthHigh"] = ::qpid::types::Variant(tplTransactionDepthHigh); + _map["tplTransactionDepthLow"] = ::qpid::types::Variant(tplTransactionDepthLow); + _map["tplTxnPrepares"] = ::qpid::types::Variant(totals.tplTxnPrepares); + _map["tplTxnCommits"] = ::qpid::types::Variant(totals.tplTxnCommits); + _map["tplTxnAborts"] = ::qpid::types::Variant(totals.tplTxnAborts); + _map["tplOutstandingAIOs"] = ::qpid::types::Variant(tplOutstandingAIOs); + _map["tplOutstandingAIOsHigh"] = ::qpid::types::Variant(tplOutstandingAIOsHigh); + _map["tplOutstandingAIOsLow"] = ::qpid::types::Variant(tplOutstandingAIOsLow); + + + // Maintenance of hi-lo statistics + tplTransactionDepthHigh = tplTransactionDepth; + tplTransactionDepthLow = tplTransactionDepth; + tplOutstandingAIOsHigh = tplOutstandingAIOs; + tplOutstandingAIOsLow = tplOutstandingAIOs; + + + } +} + +void Store::mapDecodeValues (const ::qpid::types::Variant::Map& _map) +{ + ::qpid::types::Variant::Map::const_iterator _i; + ::qpid::sys::Mutex::ScopedLock mutex(accessLock); + + if ((_i = _map.find("brokerRef")) != _map.end()) { + brokerRef = _i->second; + } + if ((_i = _map.find("location")) != _map.end()) { + location = (_i->second).getString(); + } + if ((_i = _map.find("defaultInitialFileCount")) != _map.end()) { + defaultInitialFileCount = _i->second; + } + if ((_i = _map.find("defaultDataFileSize")) != _map.end()) { + defaultDataFileSize = _i->second; + } + if ((_i = _map.find("tplIsInitialized")) != _map.end()) { + tplIsInitialized = _i->second; + } + if ((_i = _map.find("tplDirectory")) != _map.end()) { + tplDirectory = (_i->second).getString(); + } + if ((_i = _map.find("tplWritePageSize")) != _map.end()) { + tplWritePageSize = _i->second; + } + if ((_i = _map.find("tplWritePages")) != _map.end()) { + tplWritePages = _i->second; + } + if ((_i = _map.find("tplInitialFileCount")) != _map.end()) { + tplInitialFileCount = _i->second; + } + if ((_i = _map.find("tplDataFileSize")) != _map.end()) { + tplDataFileSize = _i->second; + } + if ((_i = _map.find("tplCurrentFileCount")) != _map.end()) { + tplCurrentFileCount = _i->second; + } + +} + +void Store::doMethod (string&, const ::qpid::types::Variant::Map&, ::qpid::types::Variant::Map& outMap) +{ + Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD; + std::string text; + + + outMap["_status_code"] = (uint32_t) status; + outMap["_status_text"] = Manageable::StatusText(status, text); +} 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-03-31 18:19:14 UTC (rev 3887) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2010-03-31 21:13:51 UTC (rev 3888) @@ -25,8 +25,6 @@ // Please do not edit. #include "qpid/management/ManagementObject.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/Uuid.h" namespace qpid { namespace management { @@ -47,7 +45,7 @@ static std::string packageName; static std::string className; - static uint8_t md5Sum[16]; + static uint8_t md5Sum[MD5_LEN]; // Properties @@ -96,18 +94,28 @@ return threadStats; } - void aggregatePerThreadStats(struct PerThreadStats*); + void aggregatePerThreadStats(struct PerThreadStats*) const; public: - static void writeSchema(::qpid::framing::Buffer& buf); + static void writeSchema(std::string& schema); + void mapEncodeValues(::qpid::types::Variant::Map& map, + bool includeProperties=true, + bool includeStatistics=true); + void mapDecodeValues(const ::qpid::types::Variant::Map& map); + void doMethod(std::string& methodName, + const ::qpid::types::Variant::Map& inMap, + ::qpid::types::Variant::Map& outMap); + std::string getKey() const; + uint32_t writePropertiesSize() const; - void readProperties(::qpid::framing::Buffer& buf); - void writeProperties(::qpid::framing::Buffer& buf) const; - void writeStatistics(::qpid::framing::Buffer& buf, bool skipHeaders = false); + void readProperties(const std::string& buf); + void writeProperties(std::string& buf) const; + void writeStatistics(std::string& buf, bool skipHeaders = false); void doMethod(std::string& methodName, - ::qpid::framing::Buffer& inBuf, - ::qpid::framing::Buffer& outBuf); - std::string getKey() const; + const std::string& inBuf, + std::string& outBuf); + + writeSchemaCall_t getWriteSchemaCall() { return writeSchema; }