Update DTD and XSD documents to take into account new huge pages metrics

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

diff --git a/sadf.h b/sadf.h
index 558aef2ea4b058a007aadfd85f8d9e32e16ac5c2..c998b2ac36666124b49d8fe15f2acc33edf329e4 100644 (file)
--- a/sadf.h
+++ b/sadf.h
@@ -9,7 +9,7 @@
 #include "sa.h"
 
 /* DTD version for XML output */
-#define XML_DTD_VERSION        "3.4"
+#define XML_DTD_VERSION        "3.5"
 
 /* Various constants */
 #define DO_SAVE                0

diff --git a/xml/sysstat-3.4.dtd b/xml/sysstat-3.5.dtd
similarity index 98%
rename from xml/sysstat-3.4.dtd
rename to xml/sysstat-3.5.dtd
index 1a4c00e6ca0289e7c8e5fc8fb19a1dfca7dccfad..df4511fd949b597e4d593efebad2435f9daa6ec6 100644 (file)
--- a/xml/sysstat-3.4.dtd
+++ b/xml/sysstat-3.5.dtd
@@ -193,7 +193,7 @@
 
 <!ELEMENT campg (#PCDATA)>
 
-<!ELEMENT hugepages (hugfree, hugused, hugused-percent)>
+<!ELEMENT hugepages (hugfree, hugused, hugused-percent, hugrsvd?, hugsurp?)>
 <!ATTLIST hugepages
        unit CDATA #REQUIRED
 >
@@ -204,6 +204,10 @@
 
 <!ELEMENT hugused-percent (#PCDATA)>
 
+<!ELEMENT hugrsvd (#PCDATA)>
+
+<!ELEMENT hugsurp (#PCDATA)>
+
 <!ELEMENT kernel EMPTY>
 <!ATTLIST kernel
        dentunusd CDATA #REQUIRED

diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index 1f700d78e04b5d9d065bbf3a6b3ec52a84476a4b..a98c2dc9b9a0e695b6aaadcad7bbd8e27b581a16 100644 (file)
--- a/xml/sysstat.xsd
+++ b/xml/sysstat.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://pagesperso-orange.fr/sebastien.godard/sysstat" targetNamespace="http://pagesperso-orange.fr/sebastien.godard/sysstat" elementFormDefault="qualified">
 <xs:annotation>
-       <xs:appinfo>-- XML Schema v3.4 for sysstat. See sadf.h --</xs:appinfo>
+       <xs:appinfo>-- XML Schema v3.5 for sysstat. See sadf.h --</xs:appinfo>
 </xs:annotation>
 
 <xs:element name="sysstat" type="sysstat-type"></xs:element>
@@ -288,6 +288,8 @@
                <xs:element name="hugfree" type="xs:nonNegativeInteger"></xs:element>
                <xs:element name="hugused" type="xs:nonNegativeInteger"></xs:element>
                <xs:element name="hugused-percent" type="hundredth-type"></xs:element>
+               <xs:element name="hugrsvd" type="xs:nonNegativeInteger" minOccurs="0" maxOccurs="1"></xs:element>
+               <xs:element name="hugsurp" type="xs:nonNegativeInteger" minOccurs="0" maxOccurs="1"></xs:element>
        </xs:sequence>
        <xs:attribute name="unit" type="unit-type" use="required"></xs:attribute>
 </xs:complexType>