From f12c561a18f636b28c470af19f9bb60bc9a34a0e Mon Sep 17 00:00:00 2001
From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Tue, 14 Apr 2020 13:44:43 +0200
Subject: [PATCH] sadf: Update DTD and XSD documents

Take into account PSI statistics.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
---
 sadf.h              |  2 +-
 xml/sysstat-3.9.dtd | 41 +++++++++++++++++++++++++++++++++++++++--
 xml/sysstat.xsd     | 34 +++++++++++++++++++++++++++++++++-
 3 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/sadf.h b/sadf.h
index 60eaa9f..af36603 100644
--- a/sadf.h
+++ b/sadf.h
@@ -9,7 +9,7 @@
 #include "sa.h"
 
 /* DTD version for XML output */
-#define XML_DTD_VERSION	"3.8"
+#define XML_DTD_VERSION	"3.9"
 
 /* Various constants */
 #define DO_SAVE		0
diff --git a/xml/sysstat-3.9.dtd b/xml/sysstat-3.9.dtd
index 1ca3c01..3e945c8 100644
--- a/xml/sysstat-3.9.dtd
+++ b/xml/sysstat-3.9.dtd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--DTD v3.8 for sysstat. See sadf.h -->
+<!--DTD v3.9 for sysstat. See sadf.h -->
 
 <!ELEMENT sysstat (sysdata-version, host)>
 <!ATTLIST sysstat
@@ -10,7 +10,7 @@
 
 <!ELEMENT sysdata-version (#PCDATA)>
 
-<!ENTITY % TIMESTAMP_ELEMENTS "cpu-load|process-and-context-switch|interrupts|swap-pages|paging|io|memory|hugepages|kernel|queue|serial|disk|network|power-management|filesystems">
+<!ENTITY % TIMESTAMP_ELEMENTS "cpu-load|process-and-context-switch|interrupts|swap-pages|paging|io|memory|hugepages|kernel|queue|serial|disk|network|power-management|filesystems|psi">
 <!ENTITY % HOST_ELEMENTS "sysname|release|machine|number-of-cpus|file-date|file-utc-time|timezone|statistics|restarts|comments">
 
 <!ELEMENT host (%HOST_ELEMENTS;)+>
@@ -613,3 +613,40 @@
 	Iused CDATA #REQUIRED
 	Iused-percent CDATA #REQUIRED
 >
+
+<!ELEMENT psi (psi-cpu?, psi-io?, psi-mem?)>
+<!ATTLIST psi
+	per CDATA #REQUIRED
+>
+
+<!ELEMENT psi-cpu EMPTY>
+<!ATTLIST psi-cpu
+	some_avg10 CDATA #REQUIRED
+	some_avg60 CDATA #REQUIRED
+	some_avg300 CDATA #REQUIRED
+	some_total CDATA #REQUIRED
+>
+
+<!ELEMENT psi-io EMPTY>
+<!ATTLIST psi-io
+	some_avg10 CDATA #REQUIRED
+	some_avg60 CDATA #REQUIRED
+	some_avg300 CDATA #REQUIRED
+	some_total CDATA #REQUIRED
+	full_avg10 CDATA #REQUIRED
+	full_avg60 CDATA #REQUIRED
+	full_avg300 CDATA #REQUIRED
+	full_total CDATA #REQUIRED
+>
+
+<!ELEMENT psi-mem EMPTY>
+<!ATTLIST psi-mem
+	some_avg10 CDATA #REQUIRED
+	some_avg60 CDATA #REQUIRED
+	some_avg300 CDATA #REQUIRED
+	some_total CDATA #REQUIRED
+	full_avg10 CDATA #REQUIRED
+	full_avg60 CDATA #REQUIRED
+	full_avg300 CDATA #REQUIRED
+	full_total CDATA #REQUIRED
+>
diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index 3f3d162..263aa9e 100644
--- 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.8 for sysstat. See sadf.h --</xs:appinfo>
+	<xs:appinfo>-- XML Schema v3.9 for sysstat. See sadf.h --</xs:appinfo>
 </xs:annotation>
 
 <xs:element name="sysstat" type="sysstat-type"></xs:element>
@@ -109,6 +109,7 @@
 		<xs:element name="network" type="network-type" minOccurs="0" maxOccurs="1"></xs:element>
 		<xs:element name="power-management" type="power-management-type" minOccurs="0" maxOccurs="1"></xs:element>
 		<xs:element name="filesystems" type="filesystems-type" minOccurs="0" maxOccurs="1"></xs:element>
+		<xs:element name="psi" type="psi-type" minOccurs="0" maxOccurs="1"></xs:element>
 	</xs:sequence>
 	<xs:attribute name="date" type="xs:date" use="required"></xs:attribute>
 	<xs:attribute name="time" type="xs:time" use="required"></xs:attribute>
@@ -792,4 +793,35 @@
 	<xs:attribute name="Iused-percent" type="hundredth-type" use="required"></xs:attribute>
 </xs:complexType>
 
+<xs:element name="psi" type="psi-type"></xs:element>
+<xs:complexType name="psi-type">
+	<xs:sequence>
+		<xs:element name="psi-cpu" type="psi-some-type" minOccurs="0" maxOccurs="1"></xs:element>
+		<xs:element name="psi-io" type="psi-full-type" minOccurs="0" maxOccurs="1"></xs:element>
+		<xs:element name="psi-mem" type="psi-full-type" minOccurs="0" maxOccurs="1"></xs:element>
+	</xs:sequence>
+	<xs:attribute name="per" type="per-type" use="required"></xs:attribute>
+</xs:complexType>
+
+<xs:element name="psi-cpu" type="psi-some-type"></xs:element>
+<xs:complexType name="psi-some-type">
+	<xs:attribute name="some_avg10" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="some_avg60" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="some_avg300" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="some_total" type="hundredth-type" use="required"></xs:attribute>
+</xs:complexType>
+
+<xs:element name="psi-io" type="psi-full-type"></xs:element>
+<xs:element name="psi-mem" type="psi-full-type"></xs:element>
+<xs:complexType name="psi-full-type">
+	<xs:attribute name="some_avg10" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="some_avg60" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="some_avg300" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="some_total" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="full_avg10" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="full_avg60" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="full_avg300" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="full_total" type="hundredth-type" use="required"></xs:attribute>
+</xs:complexType>
+
 </xs:schema>
-- 
2.49.0