Fix: mi print of probe attributes + validation

[lttng-tools.git] / src / common / mi_lttng.xsd

diff --git a/src/common/mi_lttng.xsd b/src/common/mi_lttng.xsd
index 57960119e5571f4820808d8c10f61a897d91b221..b115c6130654278fdc8ceda7d5e195ef187b02a4 100644 (file)
--- a/src/common/mi_lttng.xsd
+++ b/src/common/mi_lttng.xsd
@@ -83,7 +83,7 @@ THE SOFTWARE.
                </xs:restriction>
        </xs:simpleType>
 
-       <!-- Maps to the lttng_loglevel_type enum -->
+       <!-- Maps to the lttng_event_context_type enum -->
        <xs:simpleType name="context_type_type">
                <xs:restriction base="xs:string">
                        <xs:enumeration value="PERF_COUNTER" />
@@ -123,6 +123,15 @@ 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="UNKNOWN" />
                </xs:restriction>
        </xs:simpleType>
@@ -137,9 +146,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>
 
@@ -272,6 +281,7 @@ THE SOFTWARE.
                        <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>
 
@@ -427,10 +437,10 @@ THE SOFTWARE.
        <xs:complexType name="output_type">
                <xs:choice>
                        <xs:element name="domains" type="domains_type" minOccurs="0" />
-                       <xs:element name="session" type="session_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" />
@@ -439,7 +449,6 @@ THE SOFTWARE.
                        <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="channels" type="channels_type" minOccurs="0" />
                </xs:choice>
        </xs:complexType>