[rhmessaging-commits] rhmessaging commits: r1356 - mgmt/mint/xml.

rhmessaging-commits at lists.jboss.org rhmessaging-commits at lists.jboss.org
Mon Nov 26 09:46:02 EST 2007


Author: nunofsantos
Date: 2007-11-26 09:46:02 -0500 (Mon, 26 Nov 2007)
New Revision: 1356

Modified:
   mgmt/mint/xml/MgmtSchema.xml
   mgmt/mint/xml/MgmtTypes.xml
Log:
new mgmt schema and types, from specs

Modified: mgmt/mint/xml/MgmtSchema.xml
===================================================================
--- mgmt/mint/xml/MgmtSchema.xml	2007-11-23 16:35:38 UTC (rev 1355)
+++ mgmt/mint/xml/MgmtSchema.xml	2007-11-26 14:46:02 UTC (rev 1356)
@@ -44,7 +44,7 @@
   System
   ===============================================================
   -->
-  <class name="system" schemaId="1">
+  <class name="system">
     <configElement name="sysId" index="y" type="sstr" access="RC"/>
 
     <!-- RT config/instrumentation TBD -->
@@ -56,7 +56,7 @@
   Broker
   ===============================================================
   -->
-  <class name="broker" schemaId="2">
+  <class name="broker">
     <configElement name="systemRef"            type="objId"  access="RC" index="y" desc="System ID"/>
     <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"/>
@@ -72,6 +72,8 @@
                    desc="Name of cluster this server is a member of, zero-length for standalone server"/>
     <configElement name="version"              type="sstr"   access="RO" desc="Running software version"/>
 
+
+
     <method name="joinCluster">
       <arg name="clusterName" dir="I" type="sstr"/>
     </method>
@@ -90,8 +92,8 @@
   Virtual Host
   ===============================================================
   -->
-  <class name="vhost" schemaId="3">
-    <configElement name="brokerRef" type="objId"  access="RC" index="y"/>
+  <class name="vhost">
+    <configElement name="brokerRef" type="objId"  access="RC" index="y" parentRef="y"/>
     <configElement name="name"      type="sstr"   access="RC" index="y"/>
   </class>
 
@@ -100,8 +102,8 @@
   Queue
   ===============================================================
   -->
-  <class name="queue" schemaId="4">
-    <configElement name="vhostRef"        type="objId"  access="RC" index="y"/>
+  <class name="queue">
+    <configElement name="vhostRef"        type="objId"  access="RC" index="y" parentRef="y"/>
     <configElement name="name"            type="sstr"   access="RC" index="y"/>
 
     <configElement name="durable"         type="bool"   access="RC"/>
@@ -109,9 +111,25 @@
     <configElement name="exclusive"       type="bool"   access="RC"/>
     <configElement name="pageMemoryLimit" type="uint32" access="RO"/>
 
-    <instElement name="diskPageSize"        type="uint32"/>
-    <instElement name="diskPages"           type="uint32"/>
-    <instElement name="diskAvailableSize"   type="uint32"/>
+    <!-- Persistent Journal Support -->
+    <instElement name="journalLocation"            type="sstr"                  desc="Logical directory on disk"/>
+    <instElement name="journalBaseFileName"        type="sstr"                  desc="Base filename prefix for journal"/>
+    <instElement name="journalInitialFileCount"    type="uint32"                desc="Number of files initially allocated to this journal"/>
+    <instElement name="journalCurrentFileCount"    type="uint32"                desc="Number of files currently allocated to this journal"/>
+    <instElement name="journalDataFileSize"        type="uint32"  unit="byte"   desc="Size of each journal data file"/>
+    <instElement name="journalFreeFileCount"       type="hilo32"                desc="Number of files free on this journal. Includes free files trapped in holes."/>
+    <instElement name="journalAvailableFileCount"  type="hilo32"                desc="Number of files available to be written.  Excluding holes"/>
+    <instElement name="journalRecordDepth"         type="hilo32"  unit="record" desc="Number of enqueued records (durable messages)"/>
+    <instElement name="journalRecordEnqueues"      type="count64" unit="record" desc="Total enqueued records on journal"/>
+    <instElement name="journalRecordDequeues"      type="count64" unit="record" desc="Total dequeued records on journal"/>
+    <instElement name="journalWriteWaitFailures"   type="count64" unit="record" desc="AIO Wait failures on write"/>
+    <instElement name="journalWriteBusyFailures"   type="count64" unit="record" desc="AIO Busy failures on write"/>
+    <instElement name="journalReadRecordCount"     type="count64" unit="record" desc="Records read from the journal"/>
+    <instElement name="journalReadBusyFailures"    type="count64" unit="record" desc="AIO Busy failures on read"/>
+    <instElement name="journalWritePageCacheDepth" type="hilo32"  unit="page"   desc="Current depth of write-page-cache"/>
+    <instElement name="journalWritePageSize"       type="uint32"  unit="byte"   desc="Page size in write-page-cache"/>
+    <instElement name="journalReadPageCacheDepth"  type="hilo32"  unit="page"   desc="Current depth of read-page-cache"/>
+    <instElement name="journalReadPageSize"        type="uint32"  unit="byte"   desc="Page size in read-page-cache"/>
 
     <instElement name="msgTotalEnqueues"    type="count64" unit="message"     desc="Total messages enqueued"/>
     <instElement name="msgTotalDequeues"    type="count64" unit="message"     desc="Total messages dequeued"/>
@@ -140,7 +158,7 @@
     <instElement name="unackedMessages"     type="hilo32"  unit="message"     desc="Messages consumed but not yet acked"/>
 
     <method name="purge"            desc="Discard all messages on queue"/>
-    <method name="increaseDiskSize" desc="Increase number of disk pages allocated for this queue">
+    <method name="increaseJournalSize" desc="Increase number of disk pages allocated for this queue">
       <arg name="pages" type="uint32" dir="I" desc="New total page allocation"/>
     </method>
 
@@ -151,10 +169,10 @@
   Exchange
   ===============================================================
   -->
-  <class name="exchange" schemaId="5">
-    <configElement name="vhostRef"   type="objId"  access="RC" index="y"/>
-    <configElement name="name"       type="sstr" access="RC" index="y"/>
-    <configElement name="type"       type="sstr" access="RC"/>
+  <class name="exchange">
+    <configElement name="vhostRef"   type="objId" access="RC" index="y" parentRef="y"/>
+    <configElement name="name"       type="sstr"  access="RC" index="y"/>
+    <configElement name="type"       type="sstr"  access="RC"/>
 
     <instElement name="producers"    type="hilo32"  desc="Current producers on exchange"/>
     <instElement name="bindings"     type="hilo32"  desc="Current bindings"/>
@@ -171,7 +189,7 @@
   Binding
   ===============================================================
   -->
-  <class name="binding" schemaId="6">
+  <class name="binding">
     <configElement name="queueRef"    type="objId" access="RC" index="y"/>
     <configElement name="exchangeRef" type="objId" access="RC" index="y"/>
     <configElement name="bindingKey"  type="sstr"  access="RC"/>
@@ -185,8 +203,8 @@
   Client
   ===============================================================
   -->
-  <class name="client" schemaId="7">
-    <configElement name="vhostRef" type="objId"  access="RC" index="y"/>
+  <class name="client">
+    <configElement name="vhostRef" type="objId"  access="RC" index="y" parentRef="y"/>
     <configElement name="ipAddr"   type="uint32" access="RC" index="y"/>
     <configElement name="port"     type="uint16" access="RC" index="y"/>
 
@@ -205,9 +223,9 @@
   Session
   ===============================================================
   -->
-  <class name="session" schemaId="8">
-    <configElement name="vhostRef"         type="objId"  index="y"/>
-    <configElement name="name"             type="sstr"   index="y"/>
+  <class name="session">
+    <configElement name="vhostRef"         type="objId"  access="RC" index="y" parentRef="y"/>
+    <configElement name="name"             type="sstr"   access="RC" index="y"/>
     <configElement name="clientRef"        type="sstr"   access="RO"/>
     <configElement name="detachedLifespan" type="uint32" access="RO"/>
 
@@ -226,9 +244,9 @@
   Destination
   ===============================================================
   -->
-  <class name="destination" schemaId="9">
-    <configElement name="sessionRef" type="objId"  index="y"/>
-    <configElement name="name"       type="sstr"   index="y"/>
+  <class name="destination">
+    <configElement name="sessionRef" type="objId"  access="RC" index="y" parentRef="y"/>
+    <configElement name="name"       type="sstr"   access="RC" index="y"/>
 
     <instElement name="flowMode"       type="uint8"/>
     <instElement name="maxMsgCredits"  type="uint32"/>
@@ -248,9 +266,9 @@
   Producer
   ===============================================================
   -->
-  <class name="producer" schemaId="10">
-    <configElement name="destinationRef" type="objId" index="y"/>
-    <configElement name="exchangeRef"    type="objId" index="y"/>
+  <class name="producer">
+    <configElement name="destinationRef" access="RC" type="objId" index="y"/>
+    <configElement name="exchangeRef"    access="RC" type="objId" index="y"/>
 
     <instElement name="msgsProduced"  type="count64"/>
     <instElement name="bytesProduced" type="count64"/>
@@ -261,9 +279,9 @@
   Consumer
   ===============================================================
   -->
-  <class name="consumer" schemaId="11">
-    <configElement name="destinationRef" type="objId" index="y"/>
-    <configElement name="queueRef"       type="objId" index="y"/>
+  <class name="consumer">
+    <configElement name="destinationRef" access="RC" type="objId" index="y"/>
+    <configElement name="queueRef"       access="RC" type="objId" index="y"/>
 
     <instElement name="msgsConsumed"    type="count64"/>
     <instElement name="bytesConsumed"   type="count64"/>

Modified: mgmt/mint/xml/MgmtTypes.xml
===================================================================
--- mgmt/mint/xml/MgmtTypes.xml	2007-11-23 16:35:38 UTC (rev 1355)
+++ mgmt/mint/xml/MgmtTypes.xml	2007-11-26 14:46:02 UTC (rev 1356)
@@ -19,24 +19,24 @@
   under the License.
 -->
 
-<type name="objId"   base="U64"  cpp="uint64_t"    encode="@.putLongLong(#)"    decode="# = @.getLongLong()"  accessor="direct"/>
-<type name="uint8"   base="U8"   cpp="uint8_t"     encode="@.putOctet(#)"       decode="# = @.getOctet()"     accessor="direct"/>
-<type name="uint16"  base="U16"  cpp="uint16_t"    encode="@.putShort(#)"       decode="# = @.getShort()"     accessor="direct"/>
-<type name="uint32"  base="U32"  cpp="uint32_t"    encode="@.putLong(#)"        decode="# = @.getLong()"      accessor="direct"/>
-<type name="uint64"  base="U64"  cpp="uint64_t"    encode="@.putLongLong(#)"    decode="# = @.getLongLong()"  accessor="direct"/>
-<type name="bool"    base="U8"   cpp="bool"        encode="@.putOctet(#?1:0)"   decode="# = @.getOctet()==1"  accessor="direct"/>
-<type name="sstr"    base="SSTR" cpp="std::string" encode="@.putShortString(#)" decode="@.getShortString(#)"  accessor="direct"/>
-<type name="lstr"    base="LSTR" cpp="std::string" encode="@.putLongString(#)"  decode="@.getLongString(#)"   accessor="direct"/>
+<type name="objId"   base="U64"  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="U8"   cpp="bool"        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="hilo8"   base="U8"   cpp="uint8_t"  encode="@.putOctet(#)"    decode="# = @.getOctet()"    style="wm" accessor="counter"/>
-<type name="hilo16"  base="U16"  cpp="uint16_t" encode="@.putShort(#)"    decode="# = @.getShort()"    style="wm" accessor="counter"/>
-<type name="hilo32"  base="U32"  cpp="uint32_t" encode="@.putLong(#)"     decode="# = @.getLong()"     style="wm" accessor="counter"/>
-<type name="hilo64"  base="U64"  cpp="uint64_t" encode="@.putLongLong(#)" decode="# = @.getLongLong()" style="wm" accessor="counter"/>
+<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"/>
+<type name="hilo32"  base="U32"  cpp="uint32_t" encode="@.putLong (#)"     decode="# = @.getLong ()"     style="wm" accessor="counter" init="0"/>
+<type name="hilo64"  base="U64"  cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" style="wm" accessor="counter" init="0"/>
 
-<type name="count8"  base="U8"   cpp="uint8_t"  encode="@.putOctet(#)"    decode="# = @.getOctet()"    accessor="counter"/>
-<type name="count16" base="U16"  cpp="uint16_t" encode="@.putShort(#)"    decode="# = @.getShort()"    accessor="counter"/>
-<type name="count32" base="U32"  cpp="uint32_t" encode="@.putLong(#)"     decode="# = @.getLong()"     accessor="counter"/>
-<type name="count64" base="U64"  cpp="uint64_t" encode="@.putLongLong(#)" decode="# = @.getLongLong()" accessor="counter"/>
+<type name="count8"  base="U8"   cpp="uint8_t"  encode="@.putOctet (#)"    decode="# = @.getOctet ()"    accessor="counter" init="0"/>
+<type name="count16" base="U16"  cpp="uint16_t" encode="@.putShort (#)"    decode="# = @.getShort ()"    accessor="counter" init="0"/>
+<type name="count32" base="U32"  cpp="uint32_t" encode="@.putLong (#)"     decode="# = @.getLong ()"     accessor="counter" init="0"/>
+<type name="count64" base="U64"  cpp="uint64_t" encode="@.putLongLong (#)" decode="# = @.getLongLong ()" accessor="counter" init="0"/>
 
 <!-- Some Proposed Syntax for User-Defined Types:
 <enum name="enumeratedType" base="U8">




More information about the rhmessaging-commits mailing list