X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmi_lttng.xsd;h=6520dfd5a6b34614a73df5246d7fcd0337d48c40;hp=6fc25c6b7665fd88bbb5e506040c5411826219dc;hb=ce91cd0baf698b0c53f97f1101d863db87cf861a;hpb=c5e38b7423047e0faa5f32a85a6d6fcebd411078

diff --git a/src/common/mi_lttng.xsd b/src/common/mi_lttng.xsd
index 6fc25c6b7..6520dfd5a 100644
--- a/src/common/mi_lttng.xsd
+++ b/src/common/mi_lttng.xsd
@@ -83,6 +83,27 @@ THE SOFTWARE.
 		</xs:restriction>
 	</xs:simpleType>
 
+	<!-- Maps to the lttng_loglevel_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" />
+			<xs:enumeration value="NICE" />
+			<xs:enumeration value="VPID" />
+			<xs:enumeration value="TID" />
+			<xs:enumeration value="VTID" />
+			<xs:enumeration value="PPID" />
+			<xs:enumeration value="VPPID" />
+			<xs:enumeration value="PTHREAD_ID" />
+			<xs:enumeration value="HOSTNAME" />
+			<xs:enumeration value="IP" />
+		</xs:restriction>
+	</xs:simpleType>
+
 	<!-- Maps to loglevel_string char * -->
 	<xs:simpleType name="loglevel_string_type">
 		<xs:restriction base="xs:string">
@@ -106,6 +127,13 @@ THE SOFTWARE.
 		</xs:restriction>
 	</xs:simpleType>
 
+	<!-- Maps to the lttng_calibrate_type enum -->
+	<xs:simpleType name="calibrate_type_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="FUNCTION" />
+		</xs:restriction>
+	</xs:simpleType>
+
 	<!-- Maps to the lttng_event_probe_attr struct -->
 	<xs:complexType name="event_probe_attributes_type">
 		<xs:all>
@@ -130,6 +158,12 @@ THE SOFTWARE.
 		</xs:choice>
 	</xs:complexType>
 
+	<xs:complexType name="event_exclusion_list_type">
+		<xs:sequence>
+			<xs:element name="exclusion" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+
 	<!-- Maps to lttng_event struct -->
 	<xs:complexType name="event_type">
 		<xs:all>
@@ -140,8 +174,10 @@ THE SOFTWARE.
 			<xs:element name="enabled" type="xs:boolean" default="false" minOccurs="0" />
 			<xs:element name="filter" type="xs:boolean" minOccurs="0" />
 			<xs:element name="exclusion" type="xs:boolean" minOccurs="0" />
+			<xs:element name="exclusions" type="event_exclusion_list_type" minOccurs="0"/>
 			<xs:element name="attributes" type="event_attributes_type" minOccurs="0" />
 			<xs:element name="event_fields" type="event_fields_type" minOccurs="0" />
+			<xs:element name="success" type="xs:boolean" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
@@ -153,6 +189,7 @@ THE SOFTWARE.
 			<xs:element name="major" type="uint32_type" />
 			<xs:element name="url" type="xs:string" />
 			<xs:element name="minor" type="uint32_type" />
+			<xs:element name="commit" type="xs:string" />
 			<xs:element name="license" type="xs:string" />
 			<xs:element name="patchLevel" type="uint32_type" />
 			<xs:element name="description" type="xs:string" />
@@ -216,7 +253,7 @@ THE SOFTWARE.
 	<xs:complexType name="domain_type">
 		<xs:all>
 			<xs:element name="type" type="domain_type_type"/>
-			<xs:element name="buffer_type" type="domain_buffer_type"/>
+			<xs:element name="buffer_type" type="domain_buffer_type" />
 			<xs:element name="pids" type="pids_type" minOccurs="0" />
 			<xs:element name="channels" type="channels_type" minOccurs="0" />
 			<xs:element name="events" type="event_list_type" minOccurs="0" />
@@ -229,7 +266,7 @@ THE SOFTWARE.
 			<xs:element name="name" type="name_type"/>
 			<xs:element name="enabled" type="xs:boolean" default="true" minOccurs="0"/>
 			<xs:element name="attributes" type="channel_attributes_type" minOccurs="0"/>
-			<xs:element name="events" type="event_list_type"/>
+			<xs:element name="events" type="event_list_type" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
@@ -257,10 +294,10 @@ THE SOFTWARE.
 	<xs:complexType name="session_type">
 		<xs:all>
 			<xs:element name="name" type="name_type" />
-			<xs:element name="path" type="name_type" />
-			<xs:element name="enabled" type="xs:boolean" default="false" />
-			<xs:element name="snapshot_mode" type="uint32_type" />
-			<xs:element name="live_timer_interval" type="uint32_type" />
+			<xs:element name="path" type="name_type" minOccurs="0" />
+			<xs:element name="enabled" type="xs:boolean" default="false" minOccurs="0" />
+			<xs:element name="snapshot_mode" type="uint32_type" minOccurs="0" />
+			<xs:element name="live_timer_interval" type="uint32_type" minOccurs="0" />
 			<xs:element name="channels" type="channels_type" minOccurs="0" />
 			<xs:element name="domains" type="domains_type" minOccurs="0" />
 		</xs:all>
@@ -274,6 +311,47 @@ THE SOFTWARE.
 		</xs:all>
 	</xs:complexType>
 
+	<!-- map to the save command -->
+	<xs:complexType name="save_type">
+		<xs:all>
+			<xs:element name="session" type="session_type" />
+			<xs:element name="path" type="name_type"/>
+		</xs:all>
+	</xs:complexType>
+
+	<!-- map to the load command -->
+	<xs:complexType name="load_type">
+		<xs:all>
+			<xs:element name="session" type="session_type" />
+			<xs:element name="path" type="name_type"/>
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to struct lttng_calibrate -->
+	<xs:complexType name="calibrate_type">
+		<xs:all>
+			<xs:element name="type" type="calibrate_type_type" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Map 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:all>
+	</xs:complexType>
+
+	<!-- Map to lttng_event_context -->
+	<xs:complexType name="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" />
+			<!-- The success element is present only for lttng cli command add-context -->
+			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
 
 	<xs:complexType name="domains_type">
 		<xs:sequence>
@@ -293,19 +371,43 @@ THE SOFTWARE.
 		</xs:sequence>
 	</xs:complexType>
 
+	<xs:complexType name="contexts_type">
+		<xs:sequence>
+			<xs:element name="context" type="context_type" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
 	<xs:complexType name="output_type">
 		<xs:choice>
 			<xs:element name="domains" type="domains_type" minOccurs="0" />
 			<xs:element name="sessions" type="sessions_type" minOccurs="0" />
+			<xs:element name="session" type="session_type" minOccurs="0" />
 			<xs:element name="version" type="version_type" minOccurs="0" />
+			<xs:element name="save" type="save_type" minOccurs="0" />
+			<xs:element name="load" type="load_type" minOccurs="0" />
+			<xs:element name="calibrate" type="calibrate_type" minOccurs="0" />
+			<xs:element name="contexts" type="contexts_type" minOccurs="0" />
+			<xs:element name="channels" type="channels_type" minOccurs="0" />
+			<xs:element name="events" type="event_list_type" minOccurs="0" />
 		</xs:choice>
 	</xs:complexType>
 
 	<!-- Maps to the mi_lttng commands -->
 	<xs:simpleType name="command_string_type">
 		<xs:restriction base="xs:string">
+			<xs:enumeration value="create" />
 			<xs:enumeration value="list" />
 			<xs:enumeration value="version" />
+			<xs:enumeration value="save" />
+			<xs:enumeration value="load" />
+			<xs:enumeration value="start" />
+			<xs:enumeration value="stop" />
+			<xs:enumeration value="destroy" />
+			<xs:enumeration value="calibrate" />
+			<xs:enumeration value="add-context" />
+			<xs:enumeration value="enable-channel" />
+			<xs:enumeration value="enable-event" />
+			<xs:enumeration value="set-session" />
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -314,6 +416,7 @@ THE SOFTWARE.
 			<xs:all>
 				<xs:element name="name" type="command_string_type" maxOccurs="1" />
 				<xs:element name="output" type="output_type" maxOccurs="1" />
+				<xs:element name="success" type="xs:boolean" minOccurs="0" maxOccurs="1" />
 			</xs:all>
 		</xs:complexType>
 	</xs:element>