Modified: incubator/qpid/branches/thegreatmerge/qpid/specs/management-schema.xml URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/specs/management-schema.xml?rev=648207&r1=648206&r2=648207&view=diff ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/specs/management-schema.xml (original) +++ incubator/qpid/branches/thegreatmerge/qpid/specs/management-schema.xml Tue Apr 15 03:28:06 2008 @@ -47,7 +47,11 @@ <class name="system"> <configElement name="sysId" index="y" type="sstr" access="RC"/> - <!-- RT config/instrumentation TBD --> + <configElement name="osName" type="sstr" access="RO" desc="Operating System Name"/> + <configElement name="nodeName" type="sstr" access="RO" desc="Node Name"/> + <configElement name="release" type="sstr" access="RO"/> + <configElement name="version" type="sstr" access="RO"/> + <configElement name="machine" type="sstr" access="RO"/> </class> @@ -57,20 +61,18 @@ =============================================================== --> <class name="broker"> - <configElement name="systemRef" type="objId" access="RC" index="y" desc="System ID"/> + <configElement name="systemRef" type="objId" access="RC" index="y" desc="System ID" parentRef="y"/> <configElement name="port" type="uint16" access="RC" index="y" desc="TCP Port for AMQP Service"/> <configElement name="workerThreads" type="uint16" access="RO" desc="Thread pool size"/> <configElement name="maxConns" type="uint16" access="RO" desc="Maximum allowed connections"/> <configElement name="connBacklog" type="uint16" access="RO" desc="Connection backlog limit for listening socket"/> <configElement name="stagingThreshold" type="uint32" access="RO" desc="Broker stages messages over this size to disk"/> - <configElement name="storeLib" type="sstr" access="RO" desc="Name of persistent storage library"/> - <configElement name="asyncStore" type="bool" access="RO" desc="Use async persistent store"/> <configElement name="mgmtPubInterval" type="uint16" access="RW" unit="second" min="1" desc="Interval for management broadcasts"/> - <configElement name="initialDiskPageSize" type="uint32" access="RO" desc="Number of disk pages allocated for storage"/> - <configElement name="initialPagesPerQueue" type="uint32" access="RO" desc="Number of disk pages allocated per queue"/> <configElement name="clusterName" type="sstr" access="RO" - desc="Name of cluster this server is a member of, zero-length for standalone server"/> + desc="Name of cluster this server is a member of"/> <configElement name="version" type="sstr" access="RO" desc="Running software version"/> + <configElement name="dataDirEnabled" type="bool" access="RO" desc="Persistent configuration storage enabled"/> + <configElement name="dataDir" type="sstr" access="RO" desc="Persistent configuration storage location"/> <method name="joinCluster"> <arg name="clusterName" dir="I" type="sstr"/> @@ -91,6 +93,15 @@ <!-- =============================================================== + Management Agent + =============================================================== + --> + <class name="agent"> + <configElement name="id" type="uuid" access="RO" index="y" desc="Agent ID"/> + </class> + + <!-- + =============================================================== Virtual Host =============================================================== --> @@ -111,6 +122,8 @@ <configElement name="durable" type="bool" access="RC"/> <configElement name="autoDelete" type="bool" access="RC"/> <configElement name="exclusive" type="bool" access="RC"/> + <configElement name="arguments" type="ftable" access="RO" desc="Arguments supplied in queue.declare"/> + <configElement name="storeRef" type="objId" access="RO" desc="Reference to persistent queue (if durable)"/> <instElement name="msgTotalEnqueues" type="count64" unit="message" desc="Total messages enqueued"/> <instElement name="msgTotalDequeues" type="count64" unit="message" desc="Total messages dequeued"/> @@ -137,9 +150,7 @@ <instElement name="consumers" type="hilo32" unit="consumer" desc="Current consumers on queue"/> <instElement name="bindings" type="hilo32" unit="binding" desc="Current bindings"/> <instElement name="unackedMessages" type="hilo32" unit="message" desc="Messages consumed but not yet acked"/> - <instElement name="messageLatencyMin" type="uint64" unit="nanosecond" desc="Minimum broker latency through this queue"/> - <instElement name="messageLatencyMax" type="uint64" unit="nanosecond" desc="Maximum broker latency through this queue"/> - <instElement name="messageLatencyAvg" type="uint64" unit="nanosecond" desc="Average broker latency through this queue"/> + <instElement name="messageLatency" type="mmaTime" unit="nanosecond" desc="Broker latency through this queue"/> <method name="purge" desc="Discard all messages on queue"/> </class> @@ -170,10 +181,10 @@ =============================================================== --> <class name="binding"> - <configElement name="exchangeRef" type="objId" access="RC" index="y" parentRef="y"/> - <configElement name="queueRef" type="objId" access="RC" index="y"/> - <configElement name="bindingKey" type="sstr" access="RC" index="y"/> -<!--<configElement name="arguments" type="fieldTable" access="RC"/> --> + <configElement name="exchangeRef" type="objId" access="RC" index="y" parentRef="y"/> + <configElement name="queueRef" type="objId" access="RC" index="y"/> + <configElement name="bindingKey" type="sstr" access="RC" index="y"/> + <configElement name="arguments" type="ftable" access="RC"/> <instElement name="msgMatched" type="count64"/> </class> @@ -203,11 +214,14 @@ =============================================================== --> <class name="link"> - <configElement name="vhostRef" type="objId" access="RC" index="y" parentRef="y"/> - <configElement name="address" type="sstr" access="RC" index="y"/> + + This class represents an inter-broker connection. + + <configElement name="vhostRef" type="objId" access="RC" index="y" parentRef="y"/> + <configElement name="address" type="sstr" access="RC" index="y"/> + <configElement name="authIdentity" type="sstr" access="RO"/> <instElement name="closing" type="bool" desc="This link is closing by management request"/> - <instElement name="authIdentity" type="sstr"/> <instElement name="framesFromPeer" type="count64"/> <instElement name="framesToPeer" type="count64"/> <instElement name="bytesFromPeer" type="count64"/>
Modified: incubator/qpid/branches/thegreatmerge/qpid/specs/management-types.xml URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/specs/management-types.xml?rev=648207&r1=648206&r2=648207&view=diff ============================================================================== --- incubator/qpid/branches/thegreatmerge/qpid/specs/management-types.xml (original) +++ incubator/qpid/branches/thegreatmerge/qpid/specs/management-types.xml Tue Apr 15 03:28:06 2008 @@ -19,16 +19,20 @@ under the License. --> -<type name="objId" base="REF" cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" accessor="direct" init="0"/> -<type name="uint8" base="U8" cpp="uint8_t" encode="@.putOctet (#)" decode="# = @.getOctet ()" accessor="direct" init="0"/> -<type name="uint16" base="U16" cpp="uint16_t" encode="@.putShort (#)" decode="# = @.getShort ()" accessor="direct" init="0"/> -<type name="uint32" base="U32" cpp="uint32_t" encode="@.putLong (#)" decode="# = @.getLong ()" accessor="direct" init="0"/> -<type name="uint64" base="U64" cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" accessor="direct" init="0"/> -<type name="bool" base="BOOL" cpp="uint8_t" encode="@.putOctet (#?1:0)" decode="# = @.getOctet ()==1" accessor="direct" init="0"/> -<type name="sstr" base="SSTR" cpp="std::string" encode="@.putShortString (#)" decode="@.getShortString (#)" accessor="direct" init='""'/> -<type name="lstr" base="LSTR" cpp="std::string" encode="@.putLongString (#)" decode="@.getLongString (#)" accessor="direct" init='""'/> -<type name="absTime" base="ABSTIME" cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" accessor="direct" init="0"/> -<type name="deltaTime" base="DELTATIME" cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" accessor="direct" init="0"/> +<type name="objId" base="REF" cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" accessor="direct" init="0"/> +<type name="uint8" base="U8" cpp="uint8_t" encode="@.putOctet (#)" decode="# = @.getOctet ()" accessor="direct" init="0"/> +<type name="uint16" base="U16" cpp="uint16_t" encode="@.putShort (#)" decode="# = @.getShort ()" accessor="direct" init="0"/> +<type name="uint32" base="U32" cpp="uint32_t" encode="@.putLong (#)" decode="# = @.getLong ()" accessor="direct" init="0"/> +<type name="uint64" base="U64" cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" accessor="direct" init="0"/> +<type name="bool" base="BOOL" cpp="uint8_t" encode="@.putOctet (#?1:0)" decode="# = @.getOctet ()==1" accessor="direct" init="0"/> +<type name="sstr" base="SSTR" cpp="std::string" encode="@.putShortString (#)" decode="@.getShortString (#)" accessor="direct" init='""'/> +<type name="lstr" base="LSTR" cpp="std::string" encode="@.putLongString (#)" decode="@.getLongString (#)" accessor="direct" init='""'/> +<type name="absTime" base="ABSTIME" cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" accessor="direct" init="0"/> +<type name="deltaTime" base="DELTATIME" cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" accessor="direct" init="0"/> +<type name="float" base="FLOAT" cpp="float" encode="@.putFloat (#)" decode="# = @.getFloat ()" accessor="direct" init="0."/> +<type name="double" base="DOUBLE" cpp="double" encode="@.putDouble (#)" decode="# = @.getDouble ()" accessor="direct" init="0."/> +<type name="uuid" base="UUID" cpp="framing::Uuid" encode="#.encode (@)" decode="#.decode (@)" accessor="direct"/> +<type name="ftable" base="FTABLE" cpp="framing::FieldTable" encode="#.encode (@)" decode="#.decode (@)" accessor="direct"/> <type name="hilo8" base="U8" cpp="uint8_t" encode="@.putOctet (#)" decode="# = @.getOctet ()" style="wm" accessor="counter" init="0"/> <type name="hilo16" base="U16" cpp="uint16_t" encode="@.putShort (#)" decode="# = @.getShort ()" style="wm" accessor="counter" init="0"/> @@ -41,8 +45,9 @@ <type name="count64" base="U64" cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" accessor="counter" init="0"/> <!-- Min/Max/Average statistics --> -<type name="mma32" base="U32" cpp="uint32_t" encode="@.putLong (#)" decode="# = @.getLong ()" style="mma" accessor="direct" init="0"/> -<type name="mma64" base="U64" cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" style="mma" accessor="direct" init="0"/> +<type name="mma32" base="U32" cpp="uint32_t" encode="@.putLong (#)" decode="# = @.getLong ()" style="mma" accessor="direct" init="0"/> +<type name="mma64" base="U64" cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" style="mma" accessor="direct" init="0"/> +<type name="mmaTime" base="DELTATIME" cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" style="mma" accessor="direct" init="0"/> <!-- Some Proposed Syntax for User-Defined Types: <enum name="enumeratedType" base="U8">
