sar: Add softnet statistics (part 7): Update XSD and DTD documents

Update XSD and DTD documents to take into account new softnet
statistics.

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

diff --git a/sadf.h b/sadf.h
index 5f3a82fea9e9fed8e64a4cd212c7002ed207e2f6..632be258d30e3f389b5bc8a3aac1da67b3663826 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.1"
+#define XML_DTD_VERSION        "3.2"
 
 /* Various constants */
 #define DO_SAVE                0

diff --git a/xml/sysstat-3.1.dtd b/xml/sysstat-3.2.dtd
similarity index 97%
rename from xml/sysstat-3.1.dtd
rename to xml/sysstat-3.2.dtd
index 743c6ac5b918e268522c6ceceb225b2bd2d63513..b7f11dece347e745db448440e937a35cf0aafa36 100644 (file)
--- a/xml/sysstat-3.1.dtd
+++ b/xml/sysstat-3.2.dtd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--DTD v3.1 for sysstat. See sadf.h -->
+<!--DTD v3.2 for sysstat. See sadf.h -->
 
 <!ELEMENT sysstat (sysdata-version, host)>
 <!ATTLIST sysstat
@@ -254,7 +254,7 @@
        util-percent CDATA #REQUIRED
 >
 
-<!ELEMENT network (net-dev*, net-edev*, net-nfs?, net-nfsd?, net-sock?, net-ip?, net-eip?, net-icmp?, net-eicmp?, net-tcp?, net-etcp?, net-udp?, net-sock6?, net-ip6?, net-eip6?, net-icmp6?, net-eicmp6?, net-udp6?, fchost*)>
+<!ELEMENT network (net-dev*, net-edev*, net-nfs?, net-nfsd?, net-sock?, net-ip?, net-eip?, net-icmp?, net-eicmp?, net-tcp?, net-etcp?, net-udp?, net-sock6?, net-ip6?, net-eip6?, net-icmp6?, net-eicmp6?, net-udp6?, fchost*, softnet*)>
 <!ATTLIST network
        per CDATA #REQUIRED
 >
@@ -494,6 +494,16 @@
        fch_txw CDATA #REQUIRED
 >
 
+<!ELEMENT softnet EMPTY>
+<!ATTLIST softnet
+       cpu CDATA #REQUIRED
+       total CDATA #REQUIRED
+       dropd CDATA #REQUIRED
+       squeezd CDATA #REQUIRED
+       rx_rps CDATA #REQUIRED
+       flw_lim CDATA #REQUIRED
+>
+
 <!ELEMENT power-management (cpu-frequency?, fan-speed?, temperature?, voltage-input?, cpu-weighted-frequency?, usb-devices?)>
 
 <!ELEMENT cpu-frequency (cpufreq+)>

diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index eaf486c9fbe291a479ded31246116c4f058ebaa9..cb489a88f27f454c3f036b1612c871e99db02c97 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.1 for sysstat. See sadf.h --</xs:appinfo>
+       <xs:appinfo>-- XML Schema v3.2 for sysstat. See sadf.h --</xs:appinfo>
 </xs:annotation>
 
 <xs:element name="sysstat" type="sysstat-type"></xs:element>
@@ -371,6 +371,7 @@
                <xs:element name="net-eicmp6" type="net-eicmp6-type" minOccurs="0" maxOccurs="1"></xs:element>
                <xs:element name="net-udp6" type="net-udp6-type" minOccurs="0" maxOccurs="1"></xs:element>
                <xs:element name="fchost" type="fchost-type" minOccurs="0" maxOccurs="unbounded"></xs:element>
+               <xs:element name="softnet" type="softnet-type" minOccurs="0" maxOccurs="unbounded"></xs:element>
        </xs:sequence>
        <xs:attribute name="per" type="per-type" use="required"></xs:attribute>
 </xs:complexType>
@@ -610,6 +611,16 @@
        <xs:attribute name="fch_txw" type="hundredth-type" use="required"></xs:attribute>
 </xs:complexType>
 
+<xs:element name="softnet" type="softnet-type"></xs:element>
+<xs:complexType name="softnet-type">
+       <xs:attribute name="cpu" type="xs:string" use="required"></xs:attribute>
+       <xs:attribute name="total" type="hundredth-type" use="required"></xs:attribute>
+       <xs:attribute name="dropd" type="hundredth-type" use="required"></xs:attribute>
+       <xs:attribute name="squeezd" type="hundredth-type" use="required"></xs:attribute>
+       <xs:attribute name="rx_rps" type="hundredth-type" use="required"></xs:attribute>
+       <xs:attribute name="flw_lim" type="hundredth-type" use="required"></xs:attribute>
+</xs:complexType>
+
 <xs:element name="power-management" type="power-management-type"></xs:element>
 <xs:complexType name="power-management-type">
        <xs:sequence>