X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng-3.0.xsd;h=9c1a293afe78bfab1e5092781057a0d71d79c9a5;hp=1b8322d39bb4918dbe82aa789bf7efd15d022ee6;hb=66ea93b10c703e1b3dda1e17109eed9138e4ece2;hpb=79344fee39ad399cfe2102c87e13c731d752af0a

diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-3.0.xsd
index 1b8322d39..9c1a293af 100644
--- a/src/common/mi-lttng-3.0.xsd
+++ b/src/common/mi-lttng-3.0.xsd
@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://lttng.org/xml/ns/lttng-mi"
-	xmlns:tns="http://lttng.org/xml/ns/lttng-mi"
+	targetNamespace="https://lttng.org/xml/ns/lttng-mi"
+	xmlns:tns="https://lttng.org/xml/ns/lttng-mi"
 	elementFormDefault="qualified" version="3.0">
 
 	<!-- Maps to the uint32_t type -->
@@ -116,6 +116,8 @@ THE SOFTWARE.
 			<xs:enumeration value="PREEMPTIBLE" />
 			<xs:enumeration value="NEED_RESCHEDULE" />
 			<xs:enumeration value="MIGRATABLE" />
+			<xs:enumeration value="CALLSTACK_USER" />
+			<xs:enumeration value="CALLSTACK_KERNEL" />
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -400,6 +402,27 @@ THE SOFTWARE.
 		</xs:sequence>
 	</xs:complexType>
 
+	<xs:complexType name="periodic_rotation_schedule_type">
+		<xs:all>
+			<xs:element name="time_us" type="tns:uint64_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<xs:complexType name="size_threshold_rotation_schedule_type">
+		<xs:all>
+			<xs:element name="bytes" type="tns:uint64_type" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<xs:complexType name="rotation_schedule_type">
+		<xs:sequence>
+			<xs:choice maxOccurs="unbounded">
+				<xs:element name="periodic" type="tns:periodic_rotation_schedule_type" maxOccurs="unbounded" />
+				<xs:element name="size_threshold" type="tns:size_threshold_rotation_schedule_type" maxOccurs="unbounded" />
+			</xs:choice>
+		</xs:sequence>
+	</xs:complexType>
+
 	<xs:complexType name="channels_type">
 		<xs:sequence>
 			<xs:element name="channel" type="tns:channel_type" minOccurs="0" maxOccurs="unbounded" />
@@ -417,8 +440,7 @@ 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:element name="rotation_schedules" type="tns:rotation_schedule_type" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
@@ -482,11 +504,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 -->
@@ -567,26 +592,23 @@ THE SOFTWARE.
 	<!-- 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:complexType name="rotation_schedule_result_type">
 		<xs:sequence>
-			<xs:element name="rotation" type="tns:rotation_type" minOccurs="0" maxOccurs="unbounded" />
+		  	<xs:element name="rotation_schedule" type="tns:rotation_schedule_type" minOccurs="1" />
+			<xs:element name="success" type="xs:boolean" minOccurs="1"/>
 		</xs:sequence>
 	</xs:complexType>
 
-	<!-- Maps to the enable-rotation command -->
-	<xs:complexType name="rotation_schedule_type">
+	<!-- Maps to the enable/disable-rotation commands -->
+	<xs:complexType name="rotation_schedule_cmd_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:element name="session_name" type="tns:name_type" minOccurs="1" />
+			<xs:element name="rotation_schedule_result" type="tns:rotation_schedule_result_type" minOccurs="1" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 
@@ -608,8 +630,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:element name="rotation" type="tns:rotation_type" minOccurs="0" />
+			<xs:element name="rotation_schedule_results" type="tns:rotation_schedule_cmd_type" minOccurs="0" />
 		</xs:choice>
 	</xs:complexType>