X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng-3.0.xsd;h=528ff60718d65307e33bc06cdd98a99b2ac86673;hb=53e367f936beb2f9a1f49f6a2920c2f58bcb08d7;hp=b51ce5a822b7ebbfa85724e00374ebd076d5eb4e;hpb=004402761d09919ccfbfa18b4374064db9153bba;p=lttng-tools.git

diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-3.0.xsd
index b51ce5a82..528ff6071 100644
--- a/src/common/mi-lttng-3.0.xsd
+++ b/src/common/mi-lttng-3.0.xsd
@@ -89,9 +89,6 @@ THE SOFTWARE.
 	<!-- Maps to the lttng_event_context_type enum -->
 	<xs:simpleType name="context_type_type">
 		<xs:restriction base="xs:string">
-			<xs:enumeration value="PERF_COUNTER" />
-			<xs:enumeration value="PERF_CPU_COUNTER" />
-			<xs:enumeration value="PERF_THREAD_COUNTER" />
 			<xs:enumeration value="PID" />
 			<xs:enumeration value="PROCNAME" />
 			<xs:enumeration value="PRIO" />
@@ -200,7 +197,6 @@ THE SOFTWARE.
 			<xs:element name="loglevel" type="tns:loglevel_string_type" default="" minOccurs="0" />
 			<xs:element name="enabled" type="xs:boolean" default="false" minOccurs="0" />
 			<xs:element name="filter_expression" type="xs:string" minOccurs="0" />
-			<xs:element name="exclusion" type="xs:boolean" minOccurs="0" />
 			<xs:element name="exclusions" type="tns:event_exclusion_list_type" minOccurs="0"/>
 			<xs:element name="attributes" type="tns:event_attributes_type" minOccurs="0" />
 			<xs:element name="event_fields" type="tns:event_fields_type" minOccurs="0" />
@@ -440,21 +436,29 @@ THE SOFTWARE.
 	<!-- Maps to lttng_event_perf_counter_ctx -->
 	<xs:complexType name="perf_counter_context_type">
 		<xs:all>
-			<xs:element name="type" type="uint32_type" />
-			<xs:element name="config" type="uint64_type" />
-			<xs:element name="name" type="name_type" />
+			<xs:element name="type" type="tns:uint32_type" />
+			<xs:element name="config" type="tns:uint64_type" />
+			<xs:element name="name" type="tns:name_type" />
 		</xs:all>
 	</xs:complexType>
 
-	<!-- Maps to lttng_event_context -->
-	<xs:complexType name="context_type">
+	<!-- Maps to app_ctx -->
+	<xs:complexType name="app_context_type">
 		<xs:all>
-			<xs:element name="type" type="context_type_type" />
-			<xs:element name="perf_counter_context" type="perf_counter_context_type" minOccurs="0" />
-			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
+			<xs:element name="provider_name" type="xs:string"/>
+			<xs:element name="ctx_name" type="xs:string"/>
 		</xs:all>
 	</xs:complexType>
 
+	<!-- Maps to lttng_event_context -->
+	<xs:complexType name="context_type">
+		<xs:choice>
+			<xs:element name="type" type="tns:context_type_type"/>
+			<xs:element name="perf" type="tns:perf_counter_context_type"/>
+			<xs:element name="app" type="tns:app_context_type"/>
+		</xs:choice>
+	</xs:complexType>
+
 	<!-- Maps to an array of domain -->
 	<xs:complexType name="domains_type">
 		<xs:sequence>
@@ -551,6 +555,7 @@ THE SOFTWARE.
 				<xs:element name="output" type="tns:output_type" maxOccurs="1" />
 				<xs:element name="success" type="xs:boolean" minOccurs="0" maxOccurs="1" />
 			</xs:all>
+			<xs:attribute name="schemaVersion" type="xs:string" use="required"/>
 		</xs:complexType>
 	</xs:element>
 </xs:schema>