X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng-3.0.xsd;h=ee221903b8875b3a38a89fe994999b1397b5d95b;hb=59deec0c09b544d548711deaa6d8206efe99ea0d;hp=56b65a364d7c8a0110f124a58ab9860e8b7491f9;hpb=cf0bcb51ea857687a353d2851e572dba6cc63cb0;p=lttng-tools.git

diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-3.0.xsd
index 56b65a364..ee221903b 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>
 
@@ -363,6 +378,7 @@ THE SOFTWARE.
 			<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>
 
@@ -401,6 +417,8 @@ THE SOFTWARE.
 			<xs:element name="channels" type="tns:channels_type" minOccurs="0" />
 			<xs:element name="domains" type="tns:domains_type" minOccurs="0" />
 			<xs:element name="snapshots" type="tns:snapshots_type" minOccurs="0" />
+			<xs:element name="rotation_schedule_size" type="tns:uint64_type" default="0" minOccurs="0" /> <!-- bytes -->
+			<xs:element name="rotation_schedule_timer_period" type="tns:uint64_type" default="0" minOccurs="0" /> <!-- usec -->
 		</xs:all>
 	</xs:complexType>
 
@@ -464,11 +482,14 @@ THE SOFTWARE.
 
 	<!-- 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:sequence>
+			<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:element name="symbol" type="xs:string" minOccurs="0" />
+		</xs:sequence>
 	</xs:complexType>
 
 	<!-- Maps to an array of domain -->
@@ -546,6 +567,32 @@ THE SOFTWARE.
 		</xs:sequence>
 	</xs:complexType>
 
+	<!-- Maps to the rotate command -->
+	<xs:complexType name="rotation_type">
+		<xs:all>
+			<xs:element name="session_name" type="tns:name_type" minOccurs="0" />
+			<xs:element name="status" type="xs:string" />
+			<xs:element name="path" type="xs:string" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to an array of rotations -->
+	<xs:complexType name="rotations_type">
+		<xs:sequence>
+			<xs:element name="rotation" type="tns:rotation_type" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to the enable-rotation command -->
+	<xs:complexType name="rotation_schedule_type">
+		<xs:sequence>
+			<xs:element name="session_name" type="tns:name_type" minOccurs="0" />
+			<xs:element name="rotation_schedule_size" type="tns:uint64_type" default="0" minOccurs="0" /> <!-- bytes -->
+			<xs:element name="rotation_schedule_timer_period" type="tns:uint64_type" default="0" minOccurs="0" /> <!-- usec -->
+			<xs:element name="status" type="xs:string" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+
 	<xs:complexType name="output_type">
 		<xs:choice>
 			<xs:element name="domains" type="tns:domains_type" minOccurs="0" />
@@ -564,6 +611,8 @@ THE SOFTWARE.
 			<xs:element name="targets" type="tns:targets_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:element name="rotations" type="tns:rotations_type" minOccurs="0" />
+			<xs:element name="rotation_schedule" type="tns:rotation_schedule_type" minOccurs="0" />
 		</xs:choice>
 	</xs:complexType>
 
@@ -590,6 +639,9 @@ THE SOFTWARE.
 			<xs:enumeration value="untrack" />
 			<xs:enumeration value="metadata" />
 			<xs:enumeration value="regenerate" />
+			<xs:enumeration value="rotate" />
+			<xs:enumeration value="enable-rotation" />
+			<xs:enumeration value="disable-rotation" />
 		</xs:restriction>
 	</xs:simpleType>