Author: tedross Date: 2010-02-04 13:02:05 -0500 (Thu, 04 Feb 2010) New Revision: 3840 Modified: 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 QMF files. 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-02-03 21:28:47 UTC (rev 3839) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2010-02-04 18:02:05 UTC (rev 3840) @@ -514,6 +514,27 @@ } +uint32_t Journal::writePropertiesSize() const +{ + uint32_t size = writeTimestampsSize(); + + size += 16; // queueRef + size += (1 + name.length()); // name + size += (1 + directory.length()); // directory + size += (1 + baseFileName.length()); // baseFileName + size += 4; // writePageSize + size += 4; // writePages + size += 4; // readPageSize + size += 4; // readPages + size += 2; // initialFileCount + size += 1; // autoExpand + size += 2; // currentFileCount + size += 2; // maxFileCount + size += 4; // dataFileSize + + return size; +} + void Journal::readProperties (Buffer& buf) { ::qpid::sys::Mutex::ScopedLock mutex(accessLock); @@ -535,7 +556,7 @@ } -void Journal::writeProperties (Buffer& buf) +void Journal::writeProperties (Buffer& buf) const { ::qpid::sys::Mutex::ScopedLock mutex(accessLock); configChanged = false; 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-02-03 21:28:47 UTC (rev 3839) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2010-02-04 18:02:05 UTC (rev 3840) @@ -128,19 +128,18 @@ void aggregatePerThreadStats(struct PerThreadStats*); - // Private Methods + public: static void writeSchema(::qpid::framing::Buffer& buf); + uint32_t writePropertiesSize() const; void readProperties(::qpid::framing::Buffer& buf); - void writeProperties(::qpid::framing::Buffer& buf); - void writeStatistics(::qpid::framing::Buffer& buf, - bool skipHeaders = false); + void writeProperties(::qpid::framing::Buffer& buf) const; + void writeStatistics(::qpid::framing::Buffer& buf, bool skipHeaders = false); void doMethod(std::string& methodName, ::qpid::framing::Buffer& inBuf, ::qpid::framing::Buffer& outBuf); std::string getKey() const; writeSchemaCall_t getWriteSchemaCall() { return writeSchema; } - public: Journal(::qpid::management::ManagementAgent* agent, ::qpid::management::Manageable* coreObject); 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-02-03 21:28:47 UTC (rev 3839) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2010-02-04 18:02:05 UTC (rev 3840) @@ -311,6 +311,25 @@ } +uint32_t Store::writePropertiesSize() const +{ + uint32_t size = writeTimestampsSize(); + + size += 16; // brokerRef + size += (1 + location.length()); // location + size += 2; // defaultInitialFileCount + size += 4; // defaultDataFileSize + size += 1; // tplIsInitialized + size += (1 + tplDirectory.length()); // tplDirectory + size += 4; // tplWritePageSize + size += 4; // tplWritePages + size += 2; // tplInitialFileCount + size += 4; // tplDataFileSize + size += 4; // tplCurrentFileCount + + return size; +} + void Store::readProperties (Buffer& buf) { ::qpid::sys::Mutex::ScopedLock mutex(accessLock); @@ -330,7 +349,7 @@ } -void Store::writeProperties (Buffer& buf) +void Store::writeProperties (Buffer& buf) const { ::qpid::sys::Mutex::ScopedLock mutex(accessLock); configChanged = false; 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-02-03 21:28:47 UTC (rev 3839) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2010-02-04 18:02:05 UTC (rev 3840) @@ -98,19 +98,18 @@ void aggregatePerThreadStats(struct PerThreadStats*); - // Private Methods + public: static void writeSchema(::qpid::framing::Buffer& buf); + uint32_t writePropertiesSize() const; void readProperties(::qpid::framing::Buffer& buf); - void writeProperties(::qpid::framing::Buffer& buf); - void writeStatistics(::qpid::framing::Buffer& buf, - bool skipHeaders = false); + void writeProperties(::qpid::framing::Buffer& buf) const; + void writeStatistics(::qpid::framing::Buffer& buf, bool skipHeaders = false); void doMethod(std::string& methodName, ::qpid::framing::Buffer& inBuf, ::qpid::framing::Buffer& outBuf); std::string getKey() const; writeSchemaCall_t getWriteSchemaCall() { return writeSchema; } - public: Store(::qpid::management::ManagementAgent* agent, ::qpid::management::Manageable* coreObject, ::qpid::management::Manageable* _parent);