Cleanup: remove unused m4/libxml.m4

[lttng-tools.git] / src / common / mi-lttng-3.0.xsd

diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-3.0.xsd
index cfccc2a655cbfa9923516ac4956bcad106d925ce..56b65a364d7c8a0110f124a58ab9860e8b7491f9 100644 (file)
--- a/src/common/mi-lttng-3.0.xsd
+++ b/src/common/mi-lttng-3.0.xsd
@@ -362,6 +362,7 @@ THE SOFTWARE.
                        <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:all>
        </xs:complexType>
 
@@ -372,8 +373,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 +394,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 +417,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 +425,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>
 
@@ -490,15 +500,15 @@ THE SOFTWARE.
        </xs:complexType>
 
        <!-- Maps to an action during snapshot command -->
-       <xs:complexType name="snapshot_action_type">
+       <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" />
@@ -508,25 +518,40 @@ THE SOFTWARE.
        </xs:simpleType>
 
        <!-- Maps to an action during metadata command -->
-       <xs:complexType name="metadata_action_type">
+       <xs:complexType name="metadata_cmd_type">
                <xs:sequence>
-                       <xs:element name="name" type="tns:metadata_actiontype_type" minOccurs="0" />
+                       <xs:element name="name" type="tns:metadata_action_type" minOccurs="0" />
                </xs:sequence>
        </xs:complexType>
 
        <!-- Type of metadata commands -->
-       <xs:simpleType name="metadata_actiontype_type">
+       <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" />
@@ -537,7 +562,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_action_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>
 
@@ -563,6 +589,7 @@ THE SOFTWARE.
                        <xs:enumeration value="track" />
                        <xs:enumeration value="untrack" />
                        <xs:enumeration value="metadata" />
+                       <xs:enumeration value="regenerate" />
                </xs:restriction>
        </xs:simpleType>