X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng-3.0.xsd;h=030463558b8fb00f91a080f18703a7ee3d3740b0;hb=627e69536f1f82c12abae866bf647237a415f910;hp=5be477f32471bcb95c942b1f3fe2293650323ffa;hpb=654f9f5e49aae2669d8ae771650b5e2dce5d660f;p=lttng-tools.git

diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-3.0.xsd
index 5be477f32..030463558 100644
--- a/src/common/mi-lttng-3.0.xsd
+++ b/src/common/mi-lttng-3.0.xsd
@@ -23,6 +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"
 	elementFormDefault="qualified" version="3.0">
 
 	<!-- Maps to the uint32_t type -->
@@ -41,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">
@@ -58,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>
 
@@ -87,9 +100,6 @@ THE SOFTWARE.
 	<!-- 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" />
@@ -161,24 +171,24 @@ 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" minOccurs="0" />
-			<xs:element name="offset" type="uint64_type" minOccurs="0" />
-			<xs:element name="symbol_name" type="name_type" minOccurs="0" />
+			<xs:element name="address" type="tns:uint64_type" minOccurs="0" />
+			<xs:element name="offset" type="tns:uint64_type" minOccurs="0" />
+			<xs:element name="symbol_name" type="tns:name_type" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
 	<!-- Maps to the lttng_event_function_attr struct -->
 	<xs:complexType name="event_ftrace_attributes_type">
 		<xs:all>
-			<xs:element name="symbol_name" type="name_type" />
+			<xs:element name="symbol_name" type="tns:name_type" />
 		</xs:all>
 	</xs:complexType>
 
 	<!-- Maps to per event type configuration -->
 	<xs:complexType name="event_attributes_type">
 		<xs:choice>
-			<xs:element name="probe_attributes" type="event_probe_attributes_type" />
-			<xs:element name="function_attributes" type="event_ftrace_attributes_type" />
+			<xs:element name="probe_attributes" type="tns:event_probe_attributes_type" />
+			<xs:element name="function_attributes" type="tns:event_ftrace_attributes_type" />
 		</xs:choice>
 	</xs:complexType>
 
@@ -192,16 +202,15 @@ THE SOFTWARE.
 	<!-- Maps to lttng_event struct -->
 	<xs:complexType name="event_type">
 		<xs:all>
-			<xs:element name="type" type="event_type_type" default="TRACEPOINT" minOccurs="0" />
-			<xs:element name="name" type="name_type" minOccurs="0" />
-			<xs:element name="loglevel_type" type="loglevel_type" default="ALL" minOccurs="0" />
-			<xs:element name="loglevel" type="loglevel_string_type" default="" minOccurs="0" />
+			<xs:element name="type" type="tns:event_type_type" default="TRACEPOINT" minOccurs="0" />
+			<xs:element name="name" type="tns:name_type" minOccurs="0" />
+			<xs:element name="loglevel_type" type="tns:loglevel_type" default="ALL" minOccurs="0" />
+			<xs:element name="loglevel" type="tns:loglevel_string_type" default="" minOccurs="0" />
 			<xs:element name="enabled" type="xs:boolean" default="false" minOccurs="0" />
 			<xs:element name="filter_expression" type="xs:string" 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="exclusions" type="tns:event_exclusion_list_type" minOccurs="0"/>
+			<xs:element name="attributes" type="tns:event_attributes_type" minOccurs="0" />
+			<xs:element name="event_fields" type="tns:event_fields_type" minOccurs="0" />
 			<xs:element name="success" type="xs:boolean" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
@@ -209,14 +218,14 @@ THE SOFTWARE.
 	<!-- Maps to mi_lttng_version struct -->
 	<xs:complexType name="version_type">
 		<xs:all>
-			<xs:element name="name" type="name_type" />
-			<xs:element name="string" type="name_type" />
-			<xs:element name="major" type="uint32_type" />
+			<xs:element name="name" type="tns:name_type" />
+			<xs:element name="string" type="tns:name_type" />
+			<xs:element name="major" type="tns:uint32_type" />
 			<xs:element name="url" type="xs:string" />
-			<xs:element name="minor" type="uint32_type" />
+			<xs:element name="minor" type="tns: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="patchLevel" type="tns:uint32_type" />
 			<xs:element name="description" type="xs:string" />
 		</xs:all>
 	</xs:complexType>
@@ -224,7 +233,7 @@ THE SOFTWARE.
 	<!-- 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" />
+			<xs:element name="event" type="tns:event_type" minOccurs="0" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 
@@ -268,15 +277,15 @@ THE SOFTWARE.
 	<xs:complexType name="pid_type">
 		<xs:all>
 			<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:element name="name" type="tns:name_type" />
+			<xs:element name="events" type="tns: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" />
+			<xs:element name="pid" type="tns:pid_type" minOccurs="0" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 
@@ -297,7 +306,7 @@ THE SOFTWARE.
 		<xs:all>
 			<xs:element name="pid">
 				<xs:simpleType>
-					<xs:union memberTypes="pidbyint pidwildcard" />
+					<xs:union memberTypes="tns:pidbyint tns:pidwildcard" />
 				</xs:simpleType>
 			</xs:element>
 			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
@@ -308,7 +317,7 @@ THE SOFTWARE.
 	<xs:complexType name="targets_type">
 		<xs:sequence>
 			<xs:choice>
-				<xs:element name="pid_target" type="pid_target_type" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element name="pid_target" type="tns:pid_target_type" minOccurs="0" maxOccurs="unbounded"/>
 			</xs:choice>
 		</xs:sequence>
 	</xs:complexType>
@@ -316,36 +325,36 @@ THE SOFTWARE.
 	<!-- Maps to a pid_tracker-->
 	<xs:complexType name="pid_tracker_type">
 		<xs:all>
-			<xs:element name="targets" type="targets_type" />
+			<xs:element name="targets" type="tns:targets_type" />
 		</xs:all>
 	</xs:complexType>
 
 	<!-- Maps to a list of trackers-->
 	<xs:complexType name="trackers_type">
 		<xs:sequence minOccurs="0" maxOccurs="unbounded">
-			<xs:element name="pid_tracker" type="pid_tracker_type" maxOccurs="1" />
+			<xs:element name="pid_tracker" type="tns:pid_tracker_type" maxOccurs="1" />
 		</xs:sequence>
 	</xs:complexType>
 
 	<!-- 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="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" />
-			<xs:element name="trackers" type="trackers_type" minOccurs="0" />
+			<xs:element name="type" type="tns:domain_type_type" />
+			<xs:element name="buffer_type" type="tns:domain_buffer_type" />
+			<xs:element name="pids" type="tns:pids_type" minOccurs="0" />
+			<xs:element name="channels" type="tns:channels_type" minOccurs="0" />
+			<xs:element name="events" type="tns:event_list_type" minOccurs="0" />
+			<xs:element name="trackers" type="tns:trackers_type" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
 	<!-- Maps to struct lttng_channel -->
 	<xs:complexType name="channel_type">
 		<xs:all>
-			<xs:element name="name" type="name_type" />
+			<xs:element name="name" type="tns: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="attributes" type="tns:channel_attributes_type" minOccurs="0" />
+			<xs:element name="events" type="tns:event_list_type" minOccurs="0" />
 			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
@@ -353,61 +362,65 @@ THE SOFTWARE.
 	<!-- 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="tns:channel_overwrite_mode_type" default="DISCARD" minOccurs="0" />
+			<xs:element name="subbuffer_size" type="tns:uint64_type" minOccurs="0" /> <!-- bytes -->
+			<xs:element name="subbuffer_count" type="tns:uint64_type" default="4" minOccurs="0" />
+			<xs:element name="switch_timer_interval" type="tns:uint32_type" default="0" minOccurs="0" />  <!-- usec -->
+			<xs:element name="read_timer_interval" type="tns:uint32_type" />  <!-- usec -->
+			<xs:element name="output_type" type="tns:event_output_type" />
+			<xs:element name="tracefile_size" type="tns:uint64_type" default="0" minOccurs="0" /> <!-- bytes -->
+			<xs:element name="tracefile_count" type="tns:uint64_type" default="0" minOccurs="0" />
+			<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>
 
 	<!-- 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:element name="id" type="tns:uint32_type" minOccurs="0" />
+			<xs:element name="max_size" type="tns:uint64_type" minOccurs="0" />
+			<xs:element name="name" type="tns:name_type" minOccurs="0" />
+			<xs:element name="session_name" type="tns:name_type" minOccurs="0" />
+			<xs:element name="ctrl_url" type="xs:string" minOccurs="0" />
+			<xs:element name="data_url" type="xs:string" 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:element name="snapshot" type="tns: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:element name="channel" type="tns: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" />
-			<xs:element name="path" type="name_type" minOccurs="0" />
+			<xs:element name="name" type="tns:name_type" />
+			<xs:element name="path" type="xs:string" 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:element name="snapshots" type="snapshots_type" minOccurs="0" />
+			<xs:element name="snapshot_mode" type="tns:uint32_type" minOccurs="0" />
+			<xs:element name="live_timer_interval" type="tns:uint32_type" minOccurs="0" />
+			<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: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="name" type="tns:name_type" />
+			<xs:element name="type" type="tns:event_field_type_type" />
 			<xs:element name="nowrite" type="xs:int" />
 		</xs:all>
 	</xs:complexType>
@@ -415,82 +428,99 @@ THE SOFTWARE.
 	<!-- Maps 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="session" type="tns:session_type" />
+			<xs:element name="path" type="xs:string" />
 		</xs:all>
 	</xs:complexType>
 
 	<!-- Maps 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="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>
 
 	<!-- Maps to struct lttng_calibrate -->
 	<xs:complexType name="calibrate_type">
 		<xs:all>
-			<xs:element name="type" type="calibrate_type_type" />
+			<xs:element name="type" type="tns:calibrate_type_type" />
 		</xs:all>
 	</xs:complexType>
 
 	<!-- Maps 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:element name="type" type="tns:uint32_type" />
+			<xs:element name="config" type="tns:uint64_type" />
+			<xs:element name="name" type="tns:name_type" />
 		</xs:all>
 	</xs:complexType>
 
-	<!-- Maps to lttng_event_context -->
-	<xs:complexType name="context_type">
+	<!-- Maps to app_ctx -->
+	<xs:complexType name="app_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:element name="provider_name" type="xs:string"/>
+			<xs:element name="ctx_name" type="xs:string"/>
 		</xs:all>
 	</xs:complexType>
 
+	<!-- 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: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:element name="domain" type="tns: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:element name="session" type="tns: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:element name="event_field" type="tns: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:element name="context" type="tns:context_type" minOccurs="0" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 
-	<!-- Maps to an action dutring snapshot command -->
-	<xs:complexType name="snapshot_action_type">
+	<!-- Maps to an action during snapshot command -->
+	<xs:complexType name="snapshot_cmd_type">
 		<xs:sequence>
-			<xs:element name="name" type="snapshot_actiontype_type" minOccurs="0" />
-			<xs:element name="output" type="output_type" minOccurs="0" />
+			<xs:element name="name" type="tns:snapshot_action_type" minOccurs="0" />
+			<xs:element name="output" type="tns:output_type" minOccurs="0" />
 		</xs:sequence>
 	</xs:complexType>
 
 	<!-- Type of snapshot commands -->
-	<xs:simpleType name="snapshot_actiontype_type">
+	<xs:simpleType name="snapshot_action_type">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="list-output" />
 			<xs:enumeration value="del-output" />
@@ -499,22 +529,53 @@ THE SOFTWARE.
 		</xs:restriction>
 	</xs:simpleType>
 
+	<!-- Maps to an action during metadata command -->
+	<xs:complexType name="metadata_cmd_type">
+		<xs:sequence>
+			<xs:element name="name" type="tns:metadata_action_type" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<!-- Type of metadata commands -->
+	<xs:simpleType name="metadata_action_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="regenerate" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Type of regenerate commands -->
+	<xs:simpleType name="regenerate_action_type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="metadata" />
+			<xs:enumeration value="statedump" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<!-- Type of regenerate command -->
+	<xs:complexType name="regenerate_cmd_type">
+		<xs:sequence>
+			<xs:element name="name" type="tns:regenerate_action_type" minOccurs="0" />
+		</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="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:element name="targets" type="targets_type" minOccurs="0" />
+			<xs:element name="domains" type="tns:domains_type" minOccurs="0" />
+			<xs:element name="sessions" type="tns:sessions_type" minOccurs="0" />
+			<xs:element name="session" type="tns:session_type" minOccurs="0" />
+			<xs:element name="snapshot_action" type="tns:snapshot_cmd_type" minOccurs="0" />
+			<xs:element name="snapshot" type="tns:snapshot_type" minOccurs="0" />
+			<xs:element name="version" type="tns:version_type" minOccurs="0" />
+			<xs:element name="save" type="tns:save_type" minOccurs="0" />
+			<xs:element name="load" type="tns:load_type" minOccurs="0" />
+			<xs:element name="calibrate" type="tns:calibrate_type" minOccurs="0" />
+			<xs:element name="contexts" type="tns:contexts_type" minOccurs="0" />
+			<xs:element name="channels" type="tns:channels_type" minOccurs="0" />
+			<xs:element name="events" type="tns:event_list_type" minOccurs="0" />
+			<xs:element name="channel" type="tns:channel_type" minOccurs="0" />
+			<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:choice>
 	</xs:complexType>
 
@@ -539,16 +600,19 @@ THE SOFTWARE.
 			<xs:enumeration value="disable-channel" />
 			<xs:enumeration value="track" />
 			<xs:enumeration value="untrack" />
+			<xs:enumeration value="metadata" />
+			<xs:enumeration value="regenerate" />
 		</xs:restriction>
 	</xs:simpleType>
 
 	<xs:element name="command">
 		<xs:complexType>
 			<xs:all>
-				<xs:element name="name" type="command_string_type" maxOccurs="1" />
-				<xs:element name="output" type="output_type" maxOccurs="1" />
+				<xs:element name="name" type="tns:command_string_type" maxOccurs="1" />
+				<xs:element name="output" type="tns:output_type" maxOccurs="1" />
 				<xs:element name="success" type="xs:boolean" minOccurs="0" maxOccurs="1" />
 			</xs:all>
+			<xs:attribute name="schemaVersion" type="xs:string" use="required"/>
 		</xs:complexType>
 	</xs:element>
 </xs:schema>