[rhmessaging-commits] rhmessaging commits: r4520 - in store/trunk/cpp/lib: gen/qmf/com/redhat/rhm/store and 1 other directory.

Author: tedross Date: 2012-11-21 09:50:13 -0500 (Wed, 21 Nov 2012) New Revision: 4520 Modified: store/trunk/cpp/lib/JournalImpl.h store/trunk/cpp/lib/MessageStoreImpl.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.h store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Package.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 management code. The store DOES NOT COMPILE against the Qpid trunk. Modified: store/trunk/cpp/lib/JournalImpl.h =================================================================== --- store/trunk/cpp/lib/JournalImpl.h 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/JournalImpl.h 2012-11-21 14:50:13 UTC (rev 4520) @@ -207,7 +207,7 @@ virtual void wr_aio_cb(std::vector<mrg::journal::data_tok*>& dtokl); virtual void rd_aio_cb(std::vector<u_int16_t>& pil); - qpid::management::ManagementObject::shared_ptr GetManagementObject (void) const + qpid::management::ManagementObject::shared_ptr GetManagementObjectShared (void) const { return _mgmtObject; } qpid::management::Manageable::status_t ManagementMethod (uint32_t, @@ -229,10 +229,10 @@ // Management instrumentation callbacks overridden from jcntl inline void instr_incr_outstanding_aio_cnt() { - if (_mgmtObject != 0) _mgmtObject->inc_outstandingAIOs(); + if (_mgmtObject.get() != 0) _mgmtObject->inc_outstandingAIOs(); } inline void instr_decr_outstanding_aio_cnt() { - if (_mgmtObject != 0) _mgmtObject->dec_outstandingAIOs(); + if (_mgmtObject.get() != 0) _mgmtObject->dec_outstandingAIOs(); } }; // class JournalImpl Modified: store/trunk/cpp/lib/MessageStoreImpl.h =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.h 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/MessageStoreImpl.h 2012-11-21 14:50:13 UTC (rev 4520) @@ -363,7 +363,7 @@ void abort(qpid::broker::TransactionContext& ctxt); - qpid::management::ManagementObject::shared_ptr GetManagementObject (void) const + qpid::management::ManagementObject::shared_ptr GetManagementObjectShared (void) const { return mgmtObject; } inline qpid::management::Manageable::status_t ManagementMethod (u_int32_t, qpid::management::Args&) 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 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.cpp 2012-11-21 14:50:13 UTC (rev 4520) @@ -36,8 +36,8 @@ using qpid::management::Mutex; using std::string; -string EventCreated::PACKAGE_NAME = string ("com.redhat.rhm.store"); -string EventCreated::EVENT_NAME = string ("created"); +string EventCreated::packageName = string ("com.redhat.rhm.store"); +string EventCreated::eventName = string ("created"); uint8_t EventCreated::md5Sum[16] = {0x6f,0x7,0x35,0xf6,0xdc,0xa3,0x18,0x29,0x23,0xf0,0x19,0x61,0xcc,0xe7,0x1c,0x5b}; @@ -59,7 +59,7 @@ void EventCreated::registerSelf(ManagementAgent* agent) { - agent->registerEvent(PACKAGE_NAME, EVENT_NAME, md5Sum, writeSchema); + agent->registerEvent(packageName, eventName, md5Sum, writeSchema); } void EventCreated::writeSchema (std::string& schema) @@ -71,8 +71,8 @@ // Schema class header: buf.putOctet (CLASS_KIND_EVENT); - buf.putShortString (PACKAGE_NAME); // Package Name - buf.putShortString (EVENT_NAME); // Event Name + buf.putShortString (packageName); // Package Name + buf.putShortString (eventName); // Event Name buf.putBin128 (md5Sum); // Schema Hash buf.putShort (3); // Argument Count @@ -131,5 +131,5 @@ bool EventCreated::match(const std::string& evt, const std::string& pkg) { - return EVENT_NAME == evt && PACKAGE_NAME == pkg; + return eventName == evt && packageName == pkg; } 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 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventCreated.h 2012-11-21 14:50:13 UTC (rev 4520) @@ -25,8 +25,10 @@ // Please do not edit. #include "qpid/management/ManagementEvent.h" + #include "qmf/BrokerImportExport.h" + namespace qmf { namespace com { namespace redhat { @@ -39,6 +41,8 @@ private: static void writeSchema (std::string& schema); static uint8_t md5Sum[MD5_LEN]; + QPID_BROKER_EXTERN static std::string packageName; + QPID_BROKER_EXTERN static std::string eventName; const std::string& jrnlId; const uint32_t fileSize; @@ -46,9 +50,6 @@ public: - QPID_BROKER_EXTERN static std::string PACKAGE_NAME; - QPID_BROKER_EXTERN static std::string EVENT_NAME; - writeSchemaCall_t getWriteSchemaCall(void) { return writeSchema; } QPID_BROKER_EXTERN EventCreated(const std::string& _jrnlId, @@ -57,14 +58,17 @@ QPID_BROKER_EXTERN ~EventCreated() {}; static void registerSelf(::qpid::management::ManagementAgent* agent); - std::string& getPackageName() const { return PACKAGE_NAME; } - std::string& getEventName() const { return EVENT_NAME; } + std::string& getPackageName() const { return packageName; } + std::string& getEventName() const { return eventName; } uint8_t* getMd5Sum() const { return md5Sum; } uint8_t getSeverity() const { return 5; } QPID_BROKER_EXTERN void encode(std::string& buffer) const; QPID_BROKER_EXTERN void mapEncode(::qpid::types::Variant::Map& map) const; QPID_BROKER_EXTERN static bool match(const std::string& evt, const std::string& pkg); + static std::pair<std::string,std::string> getFullName() { + return std::make_pair(packageName, eventName); + } }; }}}}} 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 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.cpp 2012-11-21 14:50:13 UTC (rev 4520) @@ -36,8 +36,8 @@ using qpid::management::Mutex; using std::string; -string EventEnqThresholdExceeded::PACKAGE_NAME = string ("com.redhat.rhm.store"); -string EventEnqThresholdExceeded::EVENT_NAME = string ("enqThresholdExceeded"); +string EventEnqThresholdExceeded::packageName = string ("com.redhat.rhm.store"); +string EventEnqThresholdExceeded::eventName = string ("enqThresholdExceeded"); uint8_t EventEnqThresholdExceeded::md5Sum[16] = {0x5b,0x1f,0xd4,0x87,0x9c,0xf6,0x1e,0xc3,0xdc,0x3e,0xc4,0x4,0x49,0xf3,0xa8,0xf3}; @@ -57,7 +57,7 @@ void EventEnqThresholdExceeded::registerSelf(ManagementAgent* agent) { - agent->registerEvent(PACKAGE_NAME, EVENT_NAME, md5Sum, writeSchema); + agent->registerEvent(packageName, eventName, md5Sum, writeSchema); } void EventEnqThresholdExceeded::writeSchema (std::string& schema) @@ -69,8 +69,8 @@ // Schema class header: buf.putOctet (CLASS_KIND_EVENT); - buf.putShortString (PACKAGE_NAME); // Package Name - buf.putShortString (EVENT_NAME); // Event Name + buf.putShortString (packageName); // Package Name + buf.putShortString (eventName); // Event Name buf.putBin128 (md5Sum); // Schema Hash buf.putShort (2); // Argument Count @@ -121,5 +121,5 @@ bool EventEnqThresholdExceeded::match(const std::string& evt, const std::string& pkg) { - return EVENT_NAME == evt && PACKAGE_NAME == pkg; + return eventName == evt && packageName == pkg; } 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 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventEnqThresholdExceeded.h 2012-11-21 14:50:13 UTC (rev 4520) @@ -25,8 +25,10 @@ // Please do not edit. #include "qpid/management/ManagementEvent.h" + #include "qmf/BrokerImportExport.h" + namespace qmf { namespace com { namespace redhat { @@ -39,15 +41,14 @@ private: static void writeSchema (std::string& schema); static uint8_t md5Sum[MD5_LEN]; + QPID_BROKER_EXTERN static std::string packageName; + QPID_BROKER_EXTERN static std::string eventName; const std::string& jrnlId; const std::string& what; public: - QPID_BROKER_EXTERN static std::string PACKAGE_NAME; - QPID_BROKER_EXTERN static std::string EVENT_NAME; - writeSchemaCall_t getWriteSchemaCall(void) { return writeSchema; } QPID_BROKER_EXTERN EventEnqThresholdExceeded(const std::string& _jrnlId, @@ -55,14 +56,17 @@ QPID_BROKER_EXTERN ~EventEnqThresholdExceeded() {}; static void registerSelf(::qpid::management::ManagementAgent* agent); - std::string& getPackageName() const { return PACKAGE_NAME; } - std::string& getEventName() const { return EVENT_NAME; } + std::string& getPackageName() const { return packageName; } + std::string& getEventName() const { return eventName; } uint8_t* getMd5Sum() const { return md5Sum; } uint8_t getSeverity() const { return 4; } QPID_BROKER_EXTERN void encode(std::string& buffer) const; QPID_BROKER_EXTERN void mapEncode(::qpid::types::Variant::Map& map) const; QPID_BROKER_EXTERN static bool match(const std::string& evt, const std::string& pkg); + static std::pair<std::string,std::string> getFullName() { + return std::make_pair(packageName, eventName); + } }; }}}}} 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 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.cpp 2012-11-21 14:50:13 UTC (rev 4520) @@ -36,8 +36,8 @@ using qpid::management::Mutex; using std::string; -string EventFull::PACKAGE_NAME = string ("com.redhat.rhm.store"); -string EventFull::EVENT_NAME = string ("full"); +string EventFull::packageName = string ("com.redhat.rhm.store"); +string EventFull::eventName = string ("full"); uint8_t EventFull::md5Sum[16] = {0x23,0x4c,0x70,0xc1,0xb0,0xeb,0x4e,0x5d,0x72,0x37,0x56,0x60,0xc3,0x10,0x78,0x68}; @@ -57,7 +57,7 @@ void EventFull::registerSelf(ManagementAgent* agent) { - agent->registerEvent(PACKAGE_NAME, EVENT_NAME, md5Sum, writeSchema); + agent->registerEvent(packageName, eventName, md5Sum, writeSchema); } void EventFull::writeSchema (std::string& schema) @@ -69,8 +69,8 @@ // Schema class header: buf.putOctet (CLASS_KIND_EVENT); - buf.putShortString (PACKAGE_NAME); // Package Name - buf.putShortString (EVENT_NAME); // Event Name + buf.putShortString (packageName); // Package Name + buf.putShortString (eventName); // Event Name buf.putBin128 (md5Sum); // Schema Hash buf.putShort (2); // Argument Count @@ -121,5 +121,5 @@ bool EventFull::match(const std::string& evt, const std::string& pkg) { - return EVENT_NAME == evt && PACKAGE_NAME == pkg; + return eventName == evt && packageName == pkg; } 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 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventFull.h 2012-11-21 14:50:13 UTC (rev 4520) @@ -25,8 +25,10 @@ // Please do not edit. #include "qpid/management/ManagementEvent.h" + #include "qmf/BrokerImportExport.h" + namespace qmf { namespace com { namespace redhat { @@ -39,15 +41,14 @@ private: static void writeSchema (std::string& schema); static uint8_t md5Sum[MD5_LEN]; + QPID_BROKER_EXTERN static std::string packageName; + QPID_BROKER_EXTERN static std::string eventName; const std::string& jrnlId; const std::string& what; public: - QPID_BROKER_EXTERN static std::string PACKAGE_NAME; - QPID_BROKER_EXTERN static std::string EVENT_NAME; - writeSchemaCall_t getWriteSchemaCall(void) { return writeSchema; } QPID_BROKER_EXTERN EventFull(const std::string& _jrnlId, @@ -55,14 +56,17 @@ QPID_BROKER_EXTERN ~EventFull() {}; static void registerSelf(::qpid::management::ManagementAgent* agent); - std::string& getPackageName() const { return PACKAGE_NAME; } - std::string& getEventName() const { return EVENT_NAME; } + std::string& getPackageName() const { return packageName; } + std::string& getEventName() const { return eventName; } uint8_t* getMd5Sum() const { return md5Sum; } uint8_t getSeverity() const { return 3; } QPID_BROKER_EXTERN void encode(std::string& buffer) const; QPID_BROKER_EXTERN void mapEncode(::qpid::types::Variant::Map& map) const; QPID_BROKER_EXTERN static bool match(const std::string& evt, const std::string& pkg); + static std::pair<std::string,std::string> getFullName() { + return std::make_pair(packageName, eventName); + } }; }}}}} 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 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.cpp 2012-11-21 14:50:13 UTC (rev 4520) @@ -36,8 +36,8 @@ using qpid::management::Mutex; using std::string; -string EventRecovered::PACKAGE_NAME = string ("com.redhat.rhm.store"); -string EventRecovered::EVENT_NAME = string ("recovered"); +string EventRecovered::packageName = string ("com.redhat.rhm.store"); +string EventRecovered::eventName = string ("recovered"); uint8_t EventRecovered::md5Sum[16] = {0x23,0x28,0x44,0x5a,0x72,0xb0,0x1e,0xda,0x7d,0xff,0x0,0x9,0x1,0x6d,0xa8,0xd4}; @@ -67,7 +67,7 @@ void EventRecovered::registerSelf(ManagementAgent* agent) { - agent->registerEvent(PACKAGE_NAME, EVENT_NAME, md5Sum, writeSchema); + agent->registerEvent(packageName, eventName, md5Sum, writeSchema); } void EventRecovered::writeSchema (std::string& schema) @@ -79,8 +79,8 @@ // Schema class header: buf.putOctet (CLASS_KIND_EVENT); - buf.putShortString (PACKAGE_NAME); // Package Name - buf.putShortString (EVENT_NAME); // Event Name + buf.putShortString (packageName); // Package Name + buf.putShortString (eventName); // Event Name buf.putBin128 (md5Sum); // Schema Hash buf.putShort (7); // Argument Count @@ -171,5 +171,5 @@ bool EventRecovered::match(const std::string& evt, const std::string& pkg) { - return EVENT_NAME == evt && PACKAGE_NAME == pkg; + return eventName == evt && packageName == pkg; } 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 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/EventRecovered.h 2012-11-21 14:50:13 UTC (rev 4520) @@ -25,8 +25,10 @@ // Please do not edit. #include "qpid/management/ManagementEvent.h" + #include "qmf/BrokerImportExport.h" + namespace qmf { namespace com { namespace redhat { @@ -39,6 +41,8 @@ private: static void writeSchema (std::string& schema); static uint8_t md5Sum[MD5_LEN]; + QPID_BROKER_EXTERN static std::string packageName; + QPID_BROKER_EXTERN static std::string eventName; const std::string& jrnlId; const uint32_t fileSize; @@ -50,9 +54,6 @@ public: - QPID_BROKER_EXTERN static std::string PACKAGE_NAME; - QPID_BROKER_EXTERN static std::string EVENT_NAME; - writeSchemaCall_t getWriteSchemaCall(void) { return writeSchema; } QPID_BROKER_EXTERN EventRecovered(const std::string& _jrnlId, @@ -65,14 +66,17 @@ QPID_BROKER_EXTERN ~EventRecovered() {}; static void registerSelf(::qpid::management::ManagementAgent* agent); - std::string& getPackageName() const { return PACKAGE_NAME; } - std::string& getEventName() const { return EVENT_NAME; } + std::string& getPackageName() const { return packageName; } + std::string& getEventName() const { return eventName; } uint8_t* getMd5Sum() const { return md5Sum; } uint8_t getSeverity() const { return 5; } QPID_BROKER_EXTERN void encode(std::string& buffer) const; QPID_BROKER_EXTERN void mapEncode(::qpid::types::Variant::Map& map) const; QPID_BROKER_EXTERN static bool match(const std::string& evt, const std::string& pkg); + static std::pair<std::string,std::string> getFullName() { + return std::make_pair(packageName, eventName); + } }; }}}}} 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 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2012-11-21 14:50:13 UTC (rev 4520) @@ -25,7 +25,9 @@ // Please do not edit. #include "qpid/management/ManagementObject.h" + #include "qmf/BrokerImportExport.h" + #include <limits> namespace qpid { Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Package.h =================================================================== --- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Package.h 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Package.h 2012-11-21 14:50:13 UTC (rev 4520) @@ -25,8 +25,10 @@ // Please do not edit. #include "qpid/management/ManagementAgent.h" + #include "qmf/BrokerImportExport.h" + namespace qmf { namespace com { namespace redhat { 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 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2012-11-21 14:50:13 UTC (rev 4520) @@ -49,7 +49,7 @@ Store::Store (ManagementAgent*, Manageable* _core, ::qpid::management::Manageable* _parent) : ManagementObject(_core) { - brokerRef = _parent->GetManagementObject ()->getObjectId (); + brokerRef = _parent->GetManagementObjectShared()->getObjectId (); location = ""; defaultInitialFileCount = 0; defaultDataFileSize = 0; 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 2012-11-16 15:19:09 UTC (rev 4519) +++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2012-11-21 14:50:13 UTC (rev 4520) @@ -25,7 +25,9 @@ // Please do not edit. #include "qpid/management/ManagementObject.h" + #include "qmf/BrokerImportExport.h" + #include <limits> namespace qpid {