From: Sebastien Godard <sysstat@orange.fr>
Date: Sun, 24 Oct 2010 19:27:40 +0000 (+0200)
Subject: Fixed some differences between XML output (as displayed by
X-Git-Tag: v9.1.6~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8b1e576ddf34a167461355a494d4d6195d3a5c8;p=sysstat

Fixed some differences between XML output (as displayed by
sadf -x) and DTD document.

In the DTD document, cpu-frequency is defined as a list of cpufreq items.
But sadf -x outputs:

<cpu-frequency unit="MHz">
	<cpu number="all" frequency="3000.00"/>
	<cpu number="0" frequency="3000.00"/>
	<cpu number="1" frequency="3000.00"/>
</cpu-frequency>

So replace cpu by cpufreq in sadf.c (we don't keep the name
"cpu" as it is already used in CPU statistics):

<cpu-frequency unit="MHz">
	<cpufreq number="all" frequency="3000.00"/>
	<cpufreq number="0" frequency="3000.00"/>
	<cpufreq number="1" frequency="3000.00"/>
</cpu-frequency>

In the DTD document, fan-speed is defined as a list of fanspd items.
But sadf -x outputs:

<fan-speed unit="rpm">
	<fan number="1" rpm="1869" drpm="1869" device="dme1737-i2c-1-2e"/>
	<fan number="2" rpm="1136" drpm="1136" device="dme1737-i2c-1-2e"/>
	<fan number="3" rpm="0" drpm="0" device="dme1737-i2c-1-2e"/>
</fan-speed>

The name "word" can be kept here, so replace fanspd by fan in DTD document.

Note that XSD document is correct.
---

diff --git a/CHANGES b/CHANGES
index 23866d8..fc6eb82 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,8 @@ xxxx/xx/xx: Version 9.1.6 - Sebastien Godard (sysstat <at> orange.fr)
 	  the whole file.
 	* Added CPU average clock frequency statistics to sar and sadc.
 	* Added hugepages utilization statistics to sar and sadc.
+	* Fixed some differences between XML output (as displayed by
+	  sadf -x) and DTD document.
 	* [Ivana Varekova]: Moved manual pages to $prefix/share/man
 	  instead of $prefix/man.
 	* [Ivana Varekova]: Fixed configure's --disable-man-group option.
diff --git a/prf_stats.c b/prf_stats.c
index e79fb30..44d9f4d 100644
--- a/prf_stats.c
+++ b/prf_stats.c
@@ -4110,7 +4110,7 @@ __print_funct_t xml_print_pwr_cpufreq_stats(struct activity *a, int curr, int ta
 				sprintf(cpuno, "%d", i - 1);
 			}
 			
-			xprintf(tab, "<cpu number=\"%s\" "
+			xprintf(tab, "<cpufreq number=\"%s\" "
 				"frequency=\"%.2f\"/>",
 				cpuno,
 				((double) spc->cpufreq) / 100);
diff --git a/xml/sysstat.dtd b/xml/sysstat.dtd
index 32a6eb3..58130f5 100644
--- a/xml/sysstat.dtd
+++ b/xml/sysstat.dtd
@@ -412,12 +412,12 @@
 	number CDATA #REQUIRED
 	weighted-frequency CDATA #REQUIRED
 >
-<!ELEMENT fan-speed (fanspd+)>
+<!ELEMENT fan-speed (fan+)>
 <!ATTLIST fan-speed
 	unit CDATA #REQUIRED
 >
-<!ELEMENT fanspd EMPTY>
-<!ATTLIST fanspd
+<!ELEMENT fan EMPTY>
+<!ATTLIST fan
 	number CDATA #REQUIRED
 	rpm CDATA #REQUIRED
 	drpm CDATA #REQUIRED