Update DTD and XSD documents

Update DTD and XSD documents to take into account new discard I/O
metrics added to "sar -b" output.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/xml/sysstat-3.7.dtd b/xml/sysstat-3.7.dtd
index 88d885426c86d31b8dd1a0f4ff9ca80bb5c8af17..374894c90c6010edb6568069188d5bbc88c2eaf8 100644 (file)
--- a/xml/sysstat-3.7.dtd
+++ b/xml/sysstat-3.7.dtd
@@ -120,7 +120,7 @@
        vmeff-percent CDATA #REQUIRED
 >
 
-<!ELEMENT io (tps, io-reads, io-writes)>
+<!ELEMENT io (tps, io-reads, io-writes, io-discard)>
 <!ATTLIST io
        per CDATA #REQUIRED
 >
@@ -139,6 +139,12 @@
        bwrtn CDATA #REQUIRED
 >
 
+<!ELEMENT io-discard EMPTY>
+<!ATTLIST io-discard
+       dtps CDATA #IMPLIED
+       bdscd CDATA #IMPLIED
+>
+
 <!ELEMENT memory (memfree?, avail?, memused?, memused-percent?, buffers?, cached?, commit?, commit-percent?, active?, inactive?, dirty?, anonpg?, slab?, kstack?, pgtbl?, vmused?, swpfree?, swpused?, swpused-percent?, swpcad?, swpcad-percent?, frmpg?, bufpg?, campg?)>
 <!ATTLIST memory
        per CDATA #REQUIRED

diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index be096da13a6e0548a8eb55e0db09da8e715c9250..75c0e8dd0907fd3a1ee66da24ddbd2d12141675b 100644 (file)
--- a/xml/sysstat.xsd
+++ b/xml/sysstat.xsd
@@ -223,6 +223,7 @@
                <xs:element name="tps" type="tps-type"></xs:element>
                <xs:element name="io-reads" type="io-reads-type"></xs:element>
                <xs:element name="io-writes" type="io-writes-type"></xs:element>
+               <xs:element name="io-discard" type="io-discard-type"></xs:element>
        </xs:sequence>
        <xs:attribute name="per" type="per-type" use="required"></xs:attribute>
 </xs:complexType>
@@ -239,6 +240,12 @@
        <xs:attribute name="bwrtn" type="hundredth-type" use="required"></xs:attribute>
 </xs:complexType>
 
+<xs:element name="io-discard" type="io-discard-type"></xs:element>
+<xs:complexType name="io-discard-type">
+       <xs:attribute name="dtps" type="hundredth-type"></xs:attribute>
+       <xs:attribute name="bdscd" type="hundredth-type"></xs:attribute>
+</xs:complexType>
+
 <xs:element name="tps" type="tps-type"></xs:element>
 <xs:simpleType name="tps-type">
        <xs:restriction base="hundredth-type"></xs:restriction>