From 21757defc733806d44a8bcda9eac29e889f12b4b Mon Sep 17 00:00:00 2001
From: Florian Wininger
Date: Mon, 10 Mar 2014 15:35:19 -0400
Subject: TMF: Add XML state system view definition to the XSD

Change-Id: I3cad7bd42b2b263837b62392b5169781c5f9b26a
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Signed-off-by: Florian Wininger <florian.wininger@polymtl.ca>
Reviewed-on: https://git.eclipse.org/r/23159
Tested-by: Hudson CI
---
 .../xml/core/tests/common/TmfXmlTestFiles.java     |  2 +-
 .../xml/core/tests/module/XmlUtilsTest.java        | 15 +++++
 .../test_xml_files/test_invalid.xml                |  7 --
 .../test_invalid/invalid_view_multipledisplays.xml | 35 ++++++++++
 .../test_xml_files/test_invalid/test_invalid.xml   |  7 ++
 .../test_xml_files/test_valid.xml                  | 29 +++++++++
 .../tmf/analysis/xml/core/module/xmlDefinition.xsd |  2 +
 .../xml/core/module/xmlStateSystemView.xsd         | 76 ++++++++++++++++++++++
 8 files changed, 165 insertions(+), 8 deletions(-)
 delete mode 100644 lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid.xml
 create mode 100644 lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid/invalid_view_multipledisplays.xml
 create mode 100644 lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid/test_invalid.xml
 create mode 100644 lttng/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/module/xmlStateSystemView.xsd

diff --git a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/common/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/common/TmfXmlTestFiles.java b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/common/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/common/TmfXmlTestFiles.java
index 2274bd80f0..5a48ce3a04 100644
--- a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/common/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/common/TmfXmlTestFiles.java
+++ b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/common/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/common/TmfXmlTestFiles.java
@@ -23,7 +23,7 @@ public enum TmfXmlTestFiles {
     /** A valid XML test file */
     VALID_FILE("../org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_valid.xml"),
     /** An invalid test file */
-    INVALID_FILE("../org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid.xml");
+    INVALID_FILE("../org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid/test_invalid.xml");
 
     private final String fPath;
 
diff --git a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/src/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/module/XmlUtilsTest.java b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/src/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/module/XmlUtilsTest.java
index fffe192e21..5867aa580b 100644
--- a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/src/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/module/XmlUtilsTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/src/org/eclipse/linuxtools/tmf/analysis/xml/core/tests/module/XmlUtilsTest.java
@@ -40,6 +40,8 @@ import org.w3c.dom.Element;
  */
 public class XmlUtilsTest {
 
+    private static final String pathname = "test_xml_files/test_invalid";
+
     /**
      * Empty the XML directory after the test
      */
@@ -91,8 +93,21 @@ public class XmlUtilsTest {
             fail("XML test file does not exist");
         }
         assertFalse(XmlUtils.xmlValidate(testXmlFile).isOK());
+
     }
 
+    /**
+     * Test various invalid files and make sure they are invalid
+     */
+    @Test
+    public void testXmlValidateInvalid() {
+        File[] validFiles = (new File(pathname)).listFiles();
+        for (File f : validFiles) {
+            assertFalse("File " + f.getName(), XmlUtils.xmlValidate(f).isOK());
+        }
+    }
+
+
     /**
      * test the {@link XmlUtils#addXmlFile(File)} method
      */
diff --git a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid.xml b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid.xml
deleted file mode 100644
index dcd5512c07..0000000000
--- a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tmfxml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="stateprovider.xsd">
-
-	<!-- This element does not belong to the schema -->
-	<element id="fail"></element>
-</tmfxml>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid/invalid_view_multipledisplays.xml b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid/invalid_view_multipledisplays.xml
new file mode 100644
index 0000000000..bf820eaa0e
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid/invalid_view_multipledisplays.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ***************************************************************************
+* Copyright (c) 2014 École Polytechnique de Montréal
+*
+* All rights reserved. This program and the accompanying materials are
+* made available under the terms of the Eclipse Public License v1.0 which
+* accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* 	Geneviève Bastien - Initial API and implementation
+*************************************************************************** -->
+<tmfxml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="xmlDefinition.xsd">
+
+	<stateSystemView id="org.eclipse.linuxtools.tmf.analysis.xml.ui.views.statesystem">
+		<head>
+			<analysis id="kernel.linux.sp" />
+			<label value="Xml kernel View" />
+		</head>
+		<!-- StateValues -->
+		<definedValue name="PROCESS_STATUS_UNKNOWN" value="0" color="#EEEEEE" />
+		<definedValue name="PROCESS_STATUS_WAIT_BLOCKED" value="1" color="#CCCCCC" />
+		<definedValue name="PROCESS_STATUS_RUN_USERMODE" value="2" color="#118811" />
+		<definedValue name="PROCESS_STATUS_RUN_SYSCALL" value="3" color="#0000EE" />
+		<definedValue name="PROCESS_STATUS_INTERRUPTED" value="4" color="#DDDD00" />
+		<definedValue name="PROCESS_STATUS_WAIT_FOR_CPU" value="5" color="#AA0000" />
+
+		<!-- Control Flow View -->
+		<entry path="CPUs/*">
+			<display type="self" />
+			<display type="constant" value="a" />
+		</entry>
+	</stateSystemView>
+</tmfxml>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid/test_invalid.xml b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid/test_invalid.xml
new file mode 100644
index 0000000000..dcd5512c07
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_invalid/test_invalid.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tmfxml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="stateprovider.xsd">
+
+	<!-- This element does not belong to the schema -->
+	<element id="fail"></element>
+</tmfxml>
\ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_valid.xml b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_valid.xml
index 4c821070e1..46911776a5 100644
--- a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_valid.xml
+++ b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core.tests/test_xml_files/test_valid.xml
@@ -13,6 +13,35 @@
 <tmfxml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="xmlDefinition.xsd">
 
+	<stateSystemView id="org.eclipse.linuxtools.tmf.analysis.xml.ui.views.statesystem">
+		<head>
+			<analysis id="kernel.linux.sp" />
+			<label value="Xml Sample Kernel View" />
+		</head>
+		<!-- StateValues -->
+		<definedValue name="PROCESS_STATUS_UNKNOWN" value="0" color="#EEEEEE" />
+		<definedValue name="PROCESS_STATUS_WAIT_BLOCKED" value="1" color="#CCCCCC" />
+		<definedValue name="PROCESS_STATUS_RUN_USERMODE" value="2" color="#118811" />
+		<definedValue name="PROCESS_STATUS_RUN_SYSCALL" value="3" color="#0000EE" />
+		<definedValue name="PROCESS_STATUS_INTERRUPTED" value="4" color="#DDDD00" />
+		<definedValue name="PROCESS_STATUS_WAIT_FOR_CPU" value="5" color="#AA0000" />
+
+		<!-- Control Flow View -->
+		<entry path="CPUs/*">
+			<display type="constant" value="Status" />
+			<parent type="constant" value="PPID" />
+			<name type="constant" value="Exec_name" />
+		</entry>
+		<entry path="Threads">
+			<display type="self" />
+			<entry path="*">
+				<display type="constant" value="Status" />
+				<parent type="constant" value="PPID" />
+				<name type="constant" value="Exec_name" />
+			</entry>
+		</entry>
+	</stateSystemView>
+
 	<stateProvider id="kernel.linux.sp" version="1">
 		<head>
 			<traceType id="org.eclipse.linuxtools.lttng2.kernel.tracetype" />
diff --git a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/module/xmlDefinition.xsd b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/module/xmlDefinition.xsd
index f464c1df5a..1783836f20 100644
--- a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/module/xmlDefinition.xsd
+++ b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/module/xmlDefinition.xsd
@@ -15,9 +15,11 @@
 
 	<xs:include schemaLocation="xmlCommon.xsd" />
 	<xs:include schemaLocation="xmlStateProvider.xsd" />
+	<xs:include schemaLocation="xmlStateSystemView.xsd" />
 	<xs:element name="tmfxml">
 		<xs:complexType>
 			<xs:choice maxOccurs="unbounded">
+				<xs:element maxOccurs="unbounded" minOccurs="0" name="stateSystemView" type="stateSystemView" />
 				<xs:element maxOccurs="unbounded" minOccurs="0" name="stateProvider" type="stateProvider" />
 			</xs:choice>
 		</xs:complexType>
diff --git a/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/module/xmlStateSystemView.xsd b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/module/xmlStateSystemView.xsd
new file mode 100644
index 0000000000..7064a9a48f
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.tmf.analysis.xml.core/src/org/eclipse/linuxtools/tmf/analysis/xml/core/module/xmlStateSystemView.xsd
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- ***************************************************************************
+ * Copyright (c) 2014 École Polytechnique de Montréal
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Florian Wininger - Initial API and implementation
+ *************************************************************************** -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	attributeFormDefault="unqualified" elementFormDefault="qualified">
+
+	<xs:complexType name="stateSystemView">
+		<xs:sequence>
+			<xs:element maxOccurs="1" minOccurs="0" name="head" type="headOutput" />
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="definedValue" type="definedValue" />
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="entry" type="viewEntry" />
+		</xs:sequence>
+		<xs:attribute name="id" type="xs:string" use="required" />
+	</xs:complexType>
+
+	<xs:complexType name="headOutput">
+		<xs:sequence>
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="analysis">
+				<xs:complexType>
+					<xs:attribute name="id" type="xs:string" use="required" />
+					<xs:attribute name="ssid" type="xs:string" use="optional" />
+				</xs:complexType>
+			</xs:element>
+			<xs:element maxOccurs="1" minOccurs="0" name="label">
+				<xs:complexType>
+					<xs:attribute name="value" use="required" />
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="viewEntry">
+		<xs:sequence>
+			<xs:element maxOccurs="1" minOccurs="0" name="display" type="viewStateAttribute" />
+			<xs:element maxOccurs="1" minOccurs="0" name="id" type="viewStateAttribute" />
+			<xs:element maxOccurs="1" minOccurs="0" name="parent" type="viewStateAttribute" />
+			<xs:element maxOccurs="1" minOccurs="0" name="name" type="viewStateAttribute" />
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="entry" type="viewEntry" />
+		</xs:sequence>
+		<xs:attribute name="path" type="xs:string" use="required" />
+	</xs:complexType>
+
+	<xs:complexType name="viewStateAttribute">
+		<xs:sequence>
+			<xs:element maxOccurs="unbounded" minOccurs="0" name="stateAttribute" type="stateAttribute" />
+		</xs:sequence>
+		<xs:attribute name="type" use="required">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="constant" />
+					<xs:enumeration value="location" />
+					<xs:enumeration value="query" />
+					<xs:enumeration value="self" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+		<xs:attribute name="value" type="xs:string" />
+		<xs:attribute name="reference" use="optional" default="relative">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="relative" />
+					<xs:enumeration value="absolute" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+	</xs:complexType>
+</xs:schema>
\ No newline at end of file
-- 
cgit v1.2.3