Author: tross
Date: Wed Jun 4 15:13:40 2008
New Revision: 663386
URL: http://svn.apache.org/viewvc?rev=663386&view=rev
Log:
Management cleanup - Synchronized with the spec on the Wiki
Modified:
incubator/qpid/trunk/qpid/cpp/managementgen/templates/Class.cpp
incubator/qpid/trunk/qpid/cpp/managementgen/templates/Class.h
incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h
Modified: incubator/qpid/trunk/qpid/cpp/managementgen/templates/Class.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/managementgen/templates/Class.cpp?rev=663386&r1=663385&r2=663386&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/templates/Class.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/templates/Class.cpp Wed Jun 4
15:13:40 2008
@@ -85,7 +85,7 @@
/*MGEN:Class.EventSchema*/
}
-void /*MGEN:Class.NameCap*/::writeConfig (Buffer& buf)
+void /*MGEN:Class.NameCap*/::writeProperties (Buffer& buf)
{
sys::Mutex::ScopedLock mutex(accessLock);
configChanged = false;
@@ -94,7 +94,7 @@
/*MGEN:Class.WriteConfig*/
}
-void /*MGEN:Class.NameCap*/::writeInstrumentation (Buffer& buf, bool
skipHeaders)
+void /*MGEN:Class.NameCap*/::writeStatistics (Buffer& buf, bool skipHeaders)
{
sys::Mutex::ScopedLock mutex(accessLock);
instChanged = false;
Modified: incubator/qpid/trunk/qpid/cpp/managementgen/templates/Class.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/managementgen/templates/Class.h?rev=663386&r1=663385&r2=663386&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/managementgen/templates/Class.h (original)
+++ incubator/qpid/trunk/qpid/cpp/managementgen/templates/Class.h Wed Jun 4
15:13:40 2008
@@ -44,13 +44,13 @@
// Statistics
/*MGEN:Class.InstDeclarations*/
// Private Methods
- static void writeSchema (qpid::framing::Buffer& buf);
- void writeConfig (qpid::framing::Buffer& buf);
- void writeInstrumentation (qpid::framing::Buffer& buf,
- bool skipHeaders = false);
- void doMethod (std::string methodName,
- qpid::framing::Buffer& inBuf,
- qpid::framing::Buffer& outBuf);
+ static void writeSchema (qpid::framing::Buffer& buf);
+ void writeProperties (qpid::framing::Buffer& buf);
+ void writeStatistics (qpid::framing::Buffer& buf,
+ bool skipHeaders = false);
+ void doMethod (std::string methodName,
+ qpid::framing::Buffer& inBuf,
+ qpid::framing::Buffer& outBuf);
writeSchemaCall_t getWriteSchemaCall (void) { return writeSchema; }
/*MGEN:Class.InstChangedStub*/
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp?rev=663386&r1=663385&r2=663386&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementBroker.cpp Wed
Jun 4 15:13:40 2008
@@ -299,11 +299,11 @@
{
Buffer msgBuffer (msgChars, BUFSIZE);
EncodeHeader (msgBuffer, 'c');
- object->writeConfig (msgBuffer);
+ object->writeProperties(msgBuffer);
contentSize = BUFSIZE - msgBuffer.available ();
msgBuffer.reset ();
- routingKey = "mgmt." + uuid.str() + ".config." +
object->getClassName ();
+ routingKey = "mgmt." + uuid.str() + ".prop." +
object->getClassName ();
SendBuffer (msgBuffer, contentSize, mExchange, routingKey);
}
@@ -311,11 +311,11 @@
{
Buffer msgBuffer (msgChars, BUFSIZE);
EncodeHeader (msgBuffer, 'i');
- object->writeInstrumentation (msgBuffer);
+ object->writeStatistics(msgBuffer);
contentSize = BUFSIZE - msgBuffer.available ();
msgBuffer.reset ();
- routingKey = "mgmt." + uuid.str () + ".inst." +
object->getClassName ();
+ routingKey = "mgmt." + uuid.str () + ".stat." +
object->getClassName ();
SendBuffer (msgBuffer, contentSize, mExchange, routingKey);
}
@@ -681,8 +681,8 @@
uint32_t outLen;
EncodeHeader (outBuffer, 'g', sequence);
- object->writeConfig (outBuffer);
- object->writeInstrumentation (outBuffer, true);
+ object->writeProperties(outBuffer);
+ object->writeStatistics(outBuffer, true);
outLen = MA_BUFFER_SIZE - outBuffer.available ();
outBuffer.reset ();
SendBuffer (outBuffer, outLen, dExchange, replyToKey);
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h?rev=663386&r1=663385&r2=663386&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/management/ManagementObject.h Wed
Jun 4 15:13:40 2008
@@ -86,13 +86,13 @@
virtual ~ManagementObject () {}
virtual writeSchemaCall_t getWriteSchemaCall (void) = 0;
- virtual void writeConfig (qpid::framing::Buffer& buf) = 0;
- virtual void writeInstrumentation (qpid::framing::Buffer& buf,
- bool skipHeaders = false) = 0;
- virtual void doMethod (std::string methodName,
- qpid::framing::Buffer& inBuf,
- qpid::framing::Buffer& outBuf) = 0;
- virtual void setReference(uint64_t objectId);
+ virtual void writeProperties(qpid::framing::Buffer& buf) = 0;
+ virtual void writeStatistics(qpid::framing::Buffer& buf,
+ bool skipHeaders = false) = 0;
+ virtual void doMethod (std::string methodName,
+ qpid::framing::Buffer& inBuf,
+ qpid::framing::Buffer& outBuf) = 0;
+ virtual void setReference (uint64_t objectId);
virtual std::string getClassName (void) = 0;
virtual std::string getPackageName (void) = 0;
