MI: add <filter_expression> (event filter expression)

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

diff --git a/src/common/mi_lttng.xsd b/src/common/mi_lttng.xsd
index 11d60d047b15cae09bd1f5105830e66684c5700d..3992a8e71f907f81bebdd8e38163fbba997f63f7 100644 (file)
--- a/src/common/mi_lttng.xsd
+++ b/src/common/mi_lttng.xsd
@@ -197,6 +197,7 @@ THE SOFTWARE.
                        <xs:element name="loglevel" type="loglevel_string_type" default="" minOccurs="0" />
                        <xs:element name="enabled" type="xs:boolean" default="false" minOccurs="0" />
                        <xs:element name="filter" type="xs:boolean" 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" />
@@ -263,27 +264,19 @@ THE SOFTWARE.
                </xs:restriction>
        </xs:simpleType>
 
-       <!-- Maps to a process -->
-       <xs:complexType name="process_type">
+       <!-- map to a pid -->
+       <xs:complexType name="pid_type">
                <xs:all>
-                       <xs:element name="pid" type="xs:int" />
-                       <xs:element name="name" type="name_type" minOccurs="0" />
+                       <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="success" type="xs:boolean" default="false" minOccurs="0" />
                </xs:all>
        </xs:complexType>
 
-       <!-- Maps to an array of pid -->
+       <!-- maps to an array of pid -->
        <xs:complexType name="pids_type">
                <xs:sequence>
-                       <xs:element name="pid" type="xs:int" minOccurs="0" maxOccurs="unbounded" />
-               </xs:sequence>
-       </xs:complexType>
-
-       <!-- Maps to an array of processes -->
-       <xs:complexType name="processes_type">
-               <xs:sequence>
-                       <xs:element name="process" type="process_type" minOccurs="0" maxOccurs="unbounded" />
+                       <xs:element name="pid" type="pid_type" minOccurs="0" maxOccurs="unbounded" />
                </xs:sequence>
        </xs:complexType>
 
@@ -339,7 +332,7 @@ THE SOFTWARE.
                <xs:all>
                        <xs:element name="type" type="domain_type_type" />
                        <xs:element name="buffer_type" type="domain_buffer_type" />
-                       <xs:element name="processes" type="processes_type" minOccurs="0" />
+                       <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" />