X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng-3.0.xsd;h=668b0d267e4e94b217488a4e2a9bbfc7e4b6c5a4;hb=ee6bb36a4235a005b7d674f341f50c10b2ae52aa;hp=5c58f6896bc50e56af45c6157010f38a7bb149aa;hpb=fb83fe64f250bec7416f18891a8264450c61ead3;p=lttng-tools.git

diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-3.0.xsd
index 5c58f6896..668b0d267 100644
--- a/src/common/mi-lttng-3.0.xsd
+++ b/src/common/mi-lttng-3.0.xsd
@@ -60,8 +60,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 +99,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>
 
@@ -372,8 +374,8 @@ THE SOFTWARE.
 			<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="tns:name_type" minOccurs="0" />
-			<xs:element name="data_url" 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>
 
@@ -393,7 +395,7 @@ THE SOFTWARE.
 	<xs:complexType name="session_type">
 		<xs:all>
 			<xs:element name="name" type="tns:name_type" />
-			<xs:element name="path" type="tns:name_type" minOccurs="0" />
+			<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="tns:uint32_type" minOccurs="0" />
 			<xs:element name="live_timer_interval" type="tns:uint32_type" minOccurs="0" />
@@ -416,7 +418,7 @@ THE SOFTWARE.
 	<xs:complexType name="save_type">
 		<xs:all>
 			<xs:element name="session" type="tns:session_type" />
-			<xs:element name="path" type="tns:name_type" />
+			<xs:element name="path" type="xs:string" />
 		</xs:all>
 	</xs:complexType>
 
@@ -424,7 +426,16 @@ THE SOFTWARE.
 	<xs:complexType name="load_type">
 		<xs:all>
 			<xs:element name="session" type="tns:session_type" />
-			<xs:element name="path" type="tns:name_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>
 
@@ -489,16 +500,16 @@ THE SOFTWARE.
 		</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="tns:snapshot_actiontype_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" />
@@ -507,12 +518,41 @@ 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="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_action_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" />
@@ -523,6 +563,8 @@ THE SOFTWARE.
 			<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>
 
@@ -547,6 +589,8 @@ 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>