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

diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-3.0.xsd
index b51ce5a82..436a9893b 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" />
@@ -364,6 +360,8 @@ THE SOFTWARE.
 			<xs:element name="tracefile_size" type="tns:uint64_type" default="0" minOccurs="0" /> <!-- bytes -->
 			<xs:element name="tracefile_count" type="tns:uint64_type" default="0" minOccurs="0" />
 			<xs:element name="live_timer_interval" type="tns:uint32_type" default="0" minOccurs="0" /> <!-- usec -->
+			<xs:element name="discarded_events" type="tns:uint64_type" default="0" minOccurs="0" />
+			<xs:element name="lost_packets" type="tns:uint64_type" default="0" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
@@ -374,8 +372,8 @@ THE SOFTWARE.
 			<xs:element name="max_size" type="tns:uint64_type" minOccurs="0" />
 			<xs:element name="name" type="tns:name_type" minOccurs="0" />
 			<xs:element name="session_name" type="tns:name_type" minOccurs="0" />
-			<xs:element name="ctrl_url" type="tns:name_type" minOccurs="0" />
-			<xs:element name="data_url" type="tns:name_type" minOccurs="0" />
+			<xs:element name="ctrl_url" type="xs:string" minOccurs="0" />
+			<xs:element name="data_url" type="xs:string" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
@@ -395,7 +393,7 @@ THE SOFTWARE.
 	<xs:complexType name="session_type">
 		<xs:all>
 			<xs:element name="name" type="tns:name_type" />
-			<xs:element name="path" type="tns:name_type" minOccurs="0" />
+			<xs:element name="path" type="xs:string" minOccurs="0" />
 			<xs:element name="enabled" type="xs:boolean" default="false" minOccurs="0" />
 			<xs:element name="snapshot_mode" type="tns:uint32_type" minOccurs="0" />
 			<xs:element name="live_timer_interval" type="tns:uint32_type" minOccurs="0" />
@@ -418,7 +416,7 @@ THE SOFTWARE.
 	<xs:complexType name="save_type">
 		<xs:all>
 			<xs:element name="session" type="tns:session_type" />
-			<xs:element name="path" type="tns:name_type" />
+			<xs:element name="path" type="xs:string" />
 		</xs:all>
 	</xs:complexType>
 
@@ -426,7 +424,7 @@ THE SOFTWARE.
 	<xs:complexType name="load_type">
 		<xs:all>
 			<xs:element name="session" type="tns:session_type" />
-			<xs:element name="path" type="tns:name_type" />
+			<xs:element name="path" type="xs:string" />
 		</xs:all>
 	</xs:complexType>
 
@@ -440,21 +438,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>
@@ -483,7 +489,7 @@ THE SOFTWARE.
 		</xs:sequence>
 	</xs:complexType>
 
-	<!-- Maps to an action dutring snapshot command -->
+	<!-- Maps to an action during snapshot command -->
 	<xs:complexType name="snapshot_action_type">
 		<xs:sequence>
 			<xs:element name="name" type="tns:snapshot_actiontype_type" minOccurs="0" />
@@ -501,6 +507,20 @@ THE SOFTWARE.
 		</xs:restriction>
 	</xs:simpleType>
 
+	<!-- Maps to an action during metadata command -->
+	<xs:complexType name="metadata_action_type">
+		<xs:sequence>
+			<xs:element name="name" type="tns:metadata_actiontype_type" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Type of metadata commands -->
+	<xs:simpleType name="metadata_actiontype_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="regenerate" />
+		</xs:restriction>
+	</xs:simpleType>
+
 	<xs:complexType name="output_type">
 		<xs:choice>
 			<xs:element name="domains" type="tns:domains_type" minOccurs="0" />
@@ -517,6 +537,7 @@ THE SOFTWARE.
 			<xs:element name="events" type="tns:event_list_type" minOccurs="0" />
 			<xs:element name="channel" type="tns:channel_type" minOccurs="0" />
 			<xs:element name="targets" type="tns:targets_type" minOccurs="0" />
+			<xs:element name="metadata_action" type="tns:metadata_action_type" minOccurs="0" />
 		</xs:choice>
 	</xs:complexType>
 
@@ -541,6 +562,7 @@ THE SOFTWARE.
 			<xs:enumeration value="disable-channel" />
 			<xs:enumeration value="track" />
 			<xs:enumeration value="untrack" />
+			<xs:enumeration value="metadata" />
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -551,6 +573,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>