X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng-3.0.xsd;h=030463558b8fb00f91a080f18703a7ee3d3740b0;hb=cb9dc8472ec2b14da6ca1004ec5cc1ad84b00f61;hp=38b13bcf2a8367750af6cda0c245f64edb2cae32;hpb=d0adede21be7231335143f06821cffaf05082b73;p=lttng-tools.git

diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-3.0.xsd
index 38b13bcf2..030463558 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>
 
@@ -362,6 +373,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 +438,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>