X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fmi-lttng-3.0.xsd;h=ae00ee80eec146d6a3891d425aa7050165998994;hb=d73bf3d793ee0b0c5b56cb47cb50c27d1789d3bd;hp=436a9893b3698cafeb8a87eeb2da97a8d26ec6ed;hpb=dd89693fcab4a97033d5451c5d9cb13aa153aa43;p=lttng-tools.git

diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-3.0.xsd
index 436a9893b..ae00ee80e 100644
--- a/src/common/mi-lttng-3.0.xsd
+++ b/src/common/mi-lttng-3.0.xsd
@@ -43,6 +43,19 @@ THE SOFTWARE.
 		</xs:restriction>
 	</xs:simpleType>
 
+	<!--
+	Maps to the range allowed for blocking timeout: -1 (block
+	forever), 0 (do not block), positive integer value (blocking
+	time in usec) limited by its signed 32-bit representation when
+	converted to msec.
+	-->
+	<xs:simpleType name="blocking_timeout_type">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="-1" />
+			<xs:maxInclusive value="2147483648000" />
+		</xs:restriction>
+	</xs:simpleType>
+
 	<!-- Maps to the char name[LTTNG_SYMBOL_NAME_LEN] -->
 	<xs:simpleType name="name_type">
 		<xs:restriction base="xs:string">
@@ -60,8 +73,6 @@ THE SOFTWARE.
 			<xs:enumeration value="FUNCTION_ENTRY" />
 			<xs:enumeration value="NOOP" />
 			<xs:enumeration value="SYSCALL" />
-			<xs:enumeration value="KPROBE" />
-			<xs:enumeration value="KRETPROBE" />
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -101,6 +112,10 @@ THE SOFTWARE.
 			<xs:enumeration value="PTHREAD_ID" />
 			<xs:enumeration value="HOSTNAME" />
 			<xs:enumeration value="IP" />
+			<xs:enumeration value="INTERRUPTIBLE" />
+			<xs:enumeration value="PREEMPTIBLE" />
+			<xs:enumeration value="NEED_RESCHEDULE" />
+			<xs:enumeration value="MIGRATABLE" />
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -362,6 +377,8 @@ THE SOFTWARE.
 			<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:element name="monitor_timer_interval" type="tns:uint64_type" default="0" minOccurs="0" />
+			<xs:element name="blocking_timeout" type="tns:blocking_timeout_type" default="0" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
@@ -425,6 +442,15 @@ THE SOFTWARE.
 		<xs:all>
 			<xs:element name="session" type="tns:session_type" />
 			<xs:element name="path" type="xs:string" />
+			<xs:element name="overrides" type="tns:overrides_type" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to the override parameters of the load command -->
+	<xs:complexType name="overrides_type">
+		<xs:all>
+			<xs:element name="name" type="tns:name_type" minOccurs="0" />
+			<xs:element name="url" type="xs:string" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
@@ -490,15 +516,15 @@ THE SOFTWARE.
 	</xs:complexType>
 
 	<!-- Maps to an action during snapshot command -->
-	<xs:complexType name="snapshot_action_type">
+	<xs:complexType name="snapshot_cmd_type">
 		<xs:sequence>
-			<xs:element name="name" type="tns:snapshot_actiontype_type" minOccurs="0" />
+			<xs:element name="name" type="tns:snapshot_action_type" minOccurs="0" />
 			<xs:element name="output" type="tns:output_type" minOccurs="0" />
 		</xs:sequence>
 	</xs:complexType>
 
 	<!-- Type of snapshot commands -->
-	<xs:simpleType name="snapshot_actiontype_type">
+	<xs:simpleType name="snapshot_action_type">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="list-output" />
 			<xs:enumeration value="del-output" />
@@ -508,25 +534,40 @@ THE SOFTWARE.
 	</xs:simpleType>
 
 	<!-- Maps to an action during metadata command -->
-	<xs:complexType name="metadata_action_type">
+	<xs:complexType name="metadata_cmd_type">
 		<xs:sequence>
-			<xs:element name="name" type="tns:metadata_actiontype_type" minOccurs="0" />
+			<xs:element name="name" type="tns:metadata_action_type" minOccurs="0" />
 		</xs:sequence>
 	</xs:complexType>
 
 	<!-- Type of metadata commands -->
-	<xs:simpleType name="metadata_actiontype_type">
+	<xs:simpleType name="metadata_action_type">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="regenerate" />
 		</xs:restriction>
 	</xs:simpleType>
 
+	<!-- Type of regenerate commands -->
+	<xs:simpleType name="regenerate_action_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="metadata" />
+			<xs:enumeration value="statedump" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Type of regenerate command -->
+	<xs:complexType name="regenerate_cmd_type">
+		<xs:sequence>
+			<xs:element name="name" type="tns:regenerate_action_type" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+
 	<xs:complexType name="output_type">
 		<xs:choice>
 			<xs:element name="domains" type="tns:domains_type" minOccurs="0" />
 			<xs:element name="sessions" type="tns:sessions_type" minOccurs="0" />
 			<xs:element name="session" type="tns:session_type" minOccurs="0" />
-			<xs:element name="snapshot_action" type="tns:snapshot_action_type" minOccurs="0" />
+			<xs:element name="snapshot_action" type="tns:snapshot_cmd_type" minOccurs="0" />
 			<xs:element name="snapshot" type="tns:snapshot_type" minOccurs="0" />
 			<xs:element name="version" type="tns:version_type" minOccurs="0" />
 			<xs:element name="save" type="tns:save_type" minOccurs="0" />
@@ -537,7 +578,8 @@ 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:element name="metadata_action" type="tns:metadata_cmd_type" minOccurs="0" />
+			<xs:element name="regenerate_action" type="tns:regenerate_cmd_type" minOccurs="0" />
 		</xs:choice>
 	</xs:complexType>
 
@@ -563,6 +605,7 @@ THE SOFTWARE.
 			<xs:enumeration value="track" />
 			<xs:enumeration value="untrack" />
 			<xs:enumeration value="metadata" />
+			<xs:enumeration value="regenerate" />
 		</xs:restriction>
 	</xs:simpleType>