X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fmi_lttng.xsd;h=3f0894e83960bd1a80f88cedbfc186a6d4288405;hp=884830d1c32c65de867de363501a283def9a7b64;hb=0e1155633b00241b8b1e5a9bb683cf91b28f5eeb;hpb=7e66b1b0255bbe6b5a55a83d3ff182ba3d4300ee

diff --git a/src/common/mi_lttng.xsd b/src/common/mi_lttng.xsd
index 884830d1c..3f0894e83 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_event_context_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">
@@ -102,6 +123,29 @@ THE SOFTWARE.
 			<xs:enumeration value="TRACE_DEBUG_FUNCTION" />
 			<xs:enumeration value="TRACE_DEBUG_LINE" />
 			<xs:enumeration value="TRACE_DEBUG" />
+			<xs:enumeration value="JUL_OFF" />
+			<xs:enumeration value="JUL_SEVERE" />
+			<xs:enumeration value="JUL_WARNING" />
+			<xs:enumeration value="JUL_INFO" />
+			<xs:enumeration value="JUL_CONFIG" />
+			<xs:enumeration value="JUL_FINE" />
+			<xs:enumeration value="JUL_FINER" />
+			<xs:enumeration value="JUL_FINEST" />
+			<xs:enumeration value="JUL_ALL" />
+			<xs:enumeration value="LOG4J_OFF" />
+			<xs:enumeration value="LOG4J_FATAL" />
+			<xs:enumeration value="LOG4J_ERROR" />
+			<xs:enumeration value="LOG4J_WARN" />
+			<xs:enumeration value="LOG4J_INFO" />
+			<xs:enumeration value="LOG4J_DEBUG" />
+			<xs:enumeration value="LOG4J_TRACE" />
+			<xs:enumeration value="LOG4J_ALL" />
+			<xs:enumeration value="PYTHON_CRITICAL" />
+			<xs:enumeration value="PYTHON_ERROR" />
+			<xs:enumeration value="PYTHON_WARNING" />
+			<xs:enumeration value="PYTHON_INFO" />
+			<xs:enumeration value="PYTHON_DEBUG" />
+			<xs:enumeration value="PYTHON_NOTSET" />
 			<xs:enumeration value="UNKNOWN" />
 		</xs:restriction>
 	</xs:simpleType>
@@ -116,9 +160,9 @@ THE SOFTWARE.
 	<!-- Maps to the lttng_event_probe_attr struct -->
 	<xs:complexType name="event_probe_attributes_type">
 		<xs:all>
-			<xs:element name="address" type="uint64_type" />
-			<xs:element name="offset" type="uint64_type" />
-			<xs:element name="symbol_name" type="name_type" />
+			<xs:element name="address" type="uint64_type" minOccurs="0" />
+			<xs:element name="offset" type="uint64_type" minOccurs="0" />
+			<xs:element name="symbol_name" type="name_type" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
@@ -137,6 +181,13 @@ THE SOFTWARE.
 		</xs:choice>
 	</xs:complexType>
 
+	<!-- Maps to exclusion type -->
+	<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>
@@ -147,8 +198,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>
 
@@ -167,6 +220,7 @@ THE SOFTWARE.
 		</xs:all>
 	</xs:complexType>
 
+	<!-- Maps to an array of event -->
 	<xs:complexType name="event_list_type">
 		<xs:sequence>
 			<xs:element name="event" type="event_type" minOccurs="0" maxOccurs="unbounded" />
@@ -179,6 +233,8 @@ THE SOFTWARE.
 			<xs:enumeration value="KERNEL"/>
 			<xs:enumeration value="UST"/>
 			<xs:enumeration value="JUL"/>
+			<xs:enumeration value="LOG4J"/>
+			<xs:enumeration value="PYTHON"/>
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -191,6 +247,7 @@ THE SOFTWARE.
 		</xs:restriction>
 	</xs:simpleType>
 
+	<!-- Maps to the type mode of a channel -->
 	<xs:simpleType name="channel_overwrite_mode_type">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="DISCARD" />
@@ -206,14 +263,16 @@ THE SOFTWARE.
 		</xs:restriction>
 	</xs:simpleType>
 
+	<!-- map to a pid -->
 	<xs:complexType name="pid_type">
 		<xs:all>
-			<xs:element name="id" type="xs:int"/>
-			<xs:element name="name" type="name_type"/>
+			<xs:element name="id" type="xs:int" />
+			<xs:element name="name" type="name_type" />
 			<xs:element name="events" type="event_list_type" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
+	<!-- maps to an array of pid -->
 	<xs:complexType name="pids_type">
 		<xs:sequence>
 			<xs:element name="pid" type="pid_type" minOccurs="0" maxOccurs="unbounded" />
@@ -223,7 +282,7 @@ THE SOFTWARE.
 	<!-- Maps to struct lttng_domain and contains channels -->
 	<xs:complexType name="domain_type">
 		<xs:all>
-			<xs:element name="type" type="domain_type_type"/>
+			<xs:element name="type" type="domain_type_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" />
@@ -234,34 +293,54 @@ THE SOFTWARE.
 	<!-- Maps to struct lttng_channel -->
 	<xs:complexType name="channel_type">
 		<xs:all>
-			<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="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" minOccurs="0" />
+			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
 	<!-- Maps to struct lttng_channel_attr -->
 	<xs:complexType name="channel_attributes_type">
 		<xs:all>
-			<xs:element name="overwrite_mode" type="channel_overwrite_mode_type" default="DISCARD" minOccurs="0"/>
-			<xs:element name="subbuffer_size" type="uint64_type" minOccurs="0"/> <!-- bytes -->
-			<xs:element name="subbuffer_count" type="uint64_type" default="4" minOccurs="0"/>
-			<xs:element name="switch_timer_interval" type="uint32_type" default="0" minOccurs="0"/>  <!-- usec -->
-			<xs:element name="read_timer_interval" type="uint32_type"/>  <!-- usec -->
-			<xs:element name="output_type" type="event_output_type"/>
-			<xs:element name="tracefile_size" type="uint64_type" default="0" minOccurs="0"/> <!-- bytes -->
-			<xs:element name="tracefile_count" type="uint64_type" default="0" minOccurs="0"/>
-			<xs:element name="live_timer_interval" type="uint32_type" default="0" minOccurs="0"/> <!-- usec -->
+			<xs:element name="overwrite_mode" type="channel_overwrite_mode_type" default="DISCARD" minOccurs="0" />
+			<xs:element name="subbuffer_size" type="uint64_type" minOccurs="0" /> <!-- bytes -->
+			<xs:element name="subbuffer_count" type="uint64_type" default="4" minOccurs="0" />
+			<xs:element name="switch_timer_interval" type="uint32_type" default="0" minOccurs="0" />  <!-- usec -->
+			<xs:element name="read_timer_interval" type="uint32_type" />  <!-- usec -->
+			<xs:element name="output_type" type="event_output_type" />
+			<xs:element name="tracefile_size" type="uint64_type" default="0" minOccurs="0" /> <!-- bytes -->
+			<xs:element name="tracefile_count" type="uint64_type" default="0" minOccurs="0" />
+			<xs:element name="live_timer_interval" type="uint32_type" default="0" minOccurs="0" /> <!-- usec -->
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to struct lttng_snapshot_output -->
+	<xs:complexType name="snapshot_type">
+		<xs:all>
+			<xs:element name="id" type="uint32_type" minOccurs="0" />
+			<xs:element name="max_size" type="uint64_type" minOccurs="0" />
+			<xs:element name="name" type="name_type" minOccurs="0" />
+			<xs:element name="session_name" type="name_type" minOccurs="0" />
+			<xs:element name="ctrl_url" type="name_type" minOccurs="0" />
+			<xs:element name="data_url" type="name_type" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
+	<xs:complexType name="snapshots_type">
+		<xs:sequence>
+			<xs:element name="snapshot" type="snapshot_type" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
 	<xs:complexType name="channels_type">
 		<xs:sequence>
 			<xs:element name="channel" type="channel_type" minOccurs="0" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 
+	<!-- Maps to a lttng_session -->
 	<xs:complexType name="session_type">
 		<xs:all>
 			<xs:element name="name" type="name_type" />
@@ -271,30 +350,32 @@ THE SOFTWARE.
 			<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:element name="snapshots" type="snapshots_type" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
+	<!-- Maps to a lttng_event_field -->
 	<xs:complexType name="event_field_type">
 		<xs:all>
 			<xs:element name="name" type="name_type" />
-			<xs:element name="type" type="event_field_type_type"/>
-			<xs:element name="nowrite" type="xs:int"/>
+			<xs:element name="type" type="event_field_type_type" />
+			<xs:element name="nowrite" type="xs:int" />
 		</xs:all>
 	</xs:complexType>
 
-	<!-- map to the save command -->
+	<!-- 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:element name="path" type="name_type" />
 		</xs:all>
 	</xs:complexType>
 
-	<!-- map to the load command -->
+	<!-- 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:element name="path" type="name_type" />
 		</xs:all>
 	</xs:complexType>
 
@@ -305,33 +386,85 @@ THE SOFTWARE.
 		</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" />
+			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- Maps to an array of domain -->
 	<xs:complexType name="domains_type">
 		<xs:sequence>
 			<xs:element name="domain" type="domain_type" minOccurs="0" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 
+	<!-- Maps to an array of session -->
 	<xs:complexType name="sessions_type">
 		<xs:sequence>
 			<xs:element name="session" type="session_type" minOccurs="0" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 
+	<!-- Maps to an array of event_field -->
 	<xs:complexType name="event_fields_type">
 		<xs:sequence>
 			<xs:element name="event_field" type="event_field_type" minOccurs="0" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 
+	<!-- Maps to an array of context -->
+	<xs:complexType name="contexts_type">
+		<xs:sequence>
+			<xs:element name="context" type="context_type" minOccurs="0" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Maps to an action dutring snapshot command -->
+	<xs:complexType name="snapshot_action_type">
+		<xs:sequence>
+			<xs:element name="name" type="snapshot_actiontype_type" minOccurs="0" />
+			<xs:element name="output" type="output_type" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Type of snapshot commands -->
+	<xs:simpleType name="snapshot_actiontype_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="list-output" />
+			<xs:enumeration value="del-output" />
+			<xs:enumeration value="add-output" />
+			<xs:enumeration value="record-output" />
+		</xs:restriction>
+	</xs:simpleType>
+
 	<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="snapshot_action" type="snapshot_action_type" minOccurs="0" />
+			<xs:element name="snapshot" type="snapshot_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:element name="channel" type="channel_type" minOccurs="0" />
 		</xs:choice>
 	</xs:complexType>
 
@@ -340,6 +473,7 @@ THE SOFTWARE.
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="create" />
 			<xs:enumeration value="list" />
+			<xs:enumeration value="snapshot" />
 			<xs:enumeration value="version" />
 			<xs:enumeration value="save" />
 			<xs:enumeration value="load" />
@@ -347,6 +481,12 @@ THE SOFTWARE.
 			<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:enumeration value="disable-event" />
+			<xs:enumeration value="disable-channel" />
 		</xs:restriction>
 	</xs:simpleType>