Bump LTTng MI schema to 3.0
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Fri, 26 Feb 2016 22:08:33 +0000 (17:08 -0500)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Thu, 3 Mar 2016 22:19:41 +0000 (17:19 -0500)
The machine interface schema now allows LTTng to express filter
expressions.

It also introduces "any" clauses at various points to allow the
extension of the schema in a non-breaking way.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
src/common/Makefile.am
src/common/mi-lttng-3.0.xsd [new file with mode: 0644]
src/common/mi-lttng.c
src/common/mi_lttng.xsd [deleted file]
tests/regression/tools/mi/test_mi

index 66146bb73d9d82ff2833a62f22fa929501dbc2c8..c1b9d4e7a36f35d1e0c2b43712ba5b962ddbf044 100644 (file)
@@ -65,7 +65,7 @@ noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \
 
 # Common library
 noinst_LTLIBRARIES = libcommon.la
-EXTRA_DIST = mi_lttng.xsd
+EXTRA_DIST = mi-lttng-3.0.xsd
 
 libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.c runas.h \
                        common.h futex.c futex.h uri.c uri.h defaults.c \
diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-3.0.xsd
new file mode 100644 (file)
index 0000000..5be477f
--- /dev/null
@@ -0,0 +1,554 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2014 - Oliver Cotte <olivier.cotte@polymtl.ca>
+                   - Jonathan Rajotte <jonathan.r.julien@gmail.com>
+Copyright (c) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+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"
+       elementFormDefault="qualified" version="3.0">
+
+       <!-- Maps to the uint32_t type -->
+       <xs:simpleType name="uint32_type">
+               <xs:restriction base="xs:integer">
+                       <xs:minInclusive value="0" />
+                       <xs:maxInclusive value="4294967295" />
+               </xs:restriction>
+       </xs:simpleType>
+
+       <!-- Maps to the uint64_t type -->
+       <xs:simpleType name="uint64_type">
+               <xs:restriction base="xs:integer">
+                       <xs:minInclusive value="0" />
+                       <xs:maxInclusive value="18446744073709551615" />
+               </xs:restriction>
+       </xs:simpleType>
+
+       <!-- Maps to the char name[LTTNG_SYMBOL_NAME_LEN] -->
+       <xs:simpleType name="name_type">
+               <xs:restriction base="xs:string">
+                       <xs:maxLength value="255" />
+               </xs:restriction>
+       </xs:simpleType>
+
+       <!-- Maps to the lttng_event_type enum -->
+       <xs:simpleType name="event_type_type">
+               <xs:restriction base="xs:string">
+                       <xs:enumeration value="ALL" />
+                       <xs:enumeration value="TRACEPOINT" />
+                       <xs:enumeration value="PROBE" />
+                       <xs:enumeration value="FUNCTION" />
+                       <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>
+
+       <!-- Maps to the lttng_event_field_type enum -->
+       <xs:simpleType name="event_field_type_type">
+               <xs:restriction base="xs:string">
+                       <xs:enumeration value="OTHER" />
+                       <xs:enumeration value="INTEGER" />
+                       <xs:enumeration value="ENUM" />
+                       <xs:enumeration value="FLOAT" />
+                       <xs:enumeration value="STRING" />
+               </xs:restriction>
+       </xs:simpleType>
+
+       <!-- Maps to the lttng_loglevel_type enum -->
+       <xs:simpleType name="loglevel_type">
+               <xs:restriction base="xs:string">
+                       <xs:enumeration value="ALL" />
+                       <xs:enumeration value="RANGE" />
+                       <xs:enumeration value="SINGLE" />
+                       <xs:enumeration value="UNKNOWN" />
+               </xs:restriction>
+       </xs:simpleType>
+
+       <!-- 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" />
+                       <xs:enumeration value="NICE" />
+                       <xs:enumeration value="VPID" />
+                       <xs:enumeration value="TID" />
+                       <xs:enumeration value="VTID" />
+                       <xs:enumeration value="PPID" />
+                       <xs:enumeration value="VPPID" />
+                       <xs:enumeration value="PTHREAD_ID" />
+                       <xs:enumeration value="HOSTNAME" />
+                       <xs:enumeration value="IP" />
+               </xs:restriction>
+       </xs:simpleType>
+
+       <!-- Maps to loglevel_string char * -->
+       <xs:simpleType name="loglevel_string_type">
+               <xs:restriction base="xs:string">
+                       <xs:enumeration value="" />
+                       <xs:enumeration value="TRACE_EMERG" />
+                       <xs:enumeration value="TRACE_ALERT" />
+                       <xs:enumeration value="TRACE_CRIT" />
+                       <xs:enumeration value="TRACE_ERR" />
+                       <xs:enumeration value="TRACE_WARNING" />
+                       <xs:enumeration value="TRACE_NOTICE" />
+                       <xs:enumeration value="TRACE_INFO" />
+                       <xs:enumeration value="TRACE_DEBUG_SYSTEM" />
+                       <xs:enumeration value="TRACE_DEBUG_PROGRAM" />
+                       <xs:enumeration value="TRACE_DEBUG_PROCESS" />
+                       <xs:enumeration value="TRACE_DEBUG_MODULE" />
+                       <xs:enumeration value="TRACE_DEBUG_UNIT" />
+                       <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="LOG4J_OFF" />
+                       <xs:enumeration value="LOG4J_FATAL" />
+                       <xs:enumeration value="LOG4J_ERROR" />
+                       <xs:enumeration value="LOG4J_WARN" />
+                       <xs:enumeration value="LOG4J_INFO" />
+                       <xs:enumeration value="LOG4J_DEBUG" />
+                       <xs:enumeration value="LOG4J_TRACE" />
+                       <xs:enumeration value="LOG4J_ALL" />
+                       <xs:enumeration value="PYTHON_CRITICAL" />
+                       <xs:enumeration value="PYTHON_ERROR" />
+                       <xs:enumeration value="PYTHON_WARNING" />
+                       <xs:enumeration value="PYTHON_INFO" />
+                       <xs:enumeration value="PYTHON_DEBUG" />
+                       <xs:enumeration value="PYTHON_NOTSET" />
+                       <xs:enumeration value="UNKNOWN" />
+               </xs:restriction>
+       </xs:simpleType>
+
+       <!-- Maps to the lttng_calibrate_type enum -->
+       <xs:simpleType name="calibrate_type_type">
+               <xs:restriction base="xs:string">
+                       <xs:enumeration value="FUNCTION" />
+               </xs:restriction>
+       </xs:simpleType>
+
+       <!-- 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: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: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:choice>
+       </xs:complexType>
+
+       <!-- Maps to exclusion type -->
+       <xs:complexType name="event_exclusion_list_type">
+               <xs:sequence>
+                       <xs:element name="exclusion" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+               </xs:sequence>
+       </xs:complexType>
+
+       <!-- 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="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="success" type="xs:boolean" minOccurs="0" />
+               </xs:all>
+       </xs:complexType>
+
+       <!-- 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="url" type="xs:string" />
+                       <xs:element name="minor" type="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="description" type="xs:string" />
+               </xs:all>
+       </xs:complexType>
+
+       <!-- 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:sequence>
+       </xs:complexType>
+
+       <!-- Maps to the lttng_domain_type enum -->
+       <xs:simpleType name="domain_type_type">
+               <xs:restriction base="xs:string">
+                       <xs:enumeration value="KERNEL"/>
+                       <xs:enumeration value="UST"/>
+                       <xs:enumeration value="JUL"/>
+                       <xs:enumeration value="LOG4J"/>
+                       <xs:enumeration value="PYTHON"/>
+               </xs:restriction>
+       </xs:simpleType>
+
+       <!-- Maps to the lttng_buffer_type enum -->
+       <xs:simpleType name="domain_buffer_type">
+               <xs:restriction base="xs:string">
+                       <xs:enumeration value="PER_PID"/>
+                       <xs:enumeration value="PER_UID"/>
+                       <xs:enumeration value="GLOBAL"/>
+               </xs:restriction>
+       </xs:simpleType>
+
+       <!-- Maps to the type mode of a channel -->
+       <xs:simpleType name="channel_overwrite_mode_type">
+               <xs:restriction base="xs:string">
+                       <xs:enumeration value="DISCARD" />
+                       <xs:enumeration value="OVERWRITE" />
+               </xs:restriction>
+       </xs:simpleType>
+
+       <!-- Maps to the lttng_event_output enum -->
+       <xs:simpleType name="event_output_type">
+               <xs:restriction base="xs:string">
+                       <xs:enumeration value="SPLICE" />
+                       <xs:enumeration value="MMAP" />
+               </xs:restriction>
+       </xs:simpleType>
+
+       <!-- map to a pid -->
+       <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: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:sequence>
+       </xs:complexType>
+
+       <xs:simpleType name="pidbyint">
+               <xs:restriction base="xs:integer">
+                       <xs:minInclusive value="0"/>
+                       <xs:maxInclusive value="4294967295" />
+               </xs:restriction>
+       </xs:simpleType>
+
+       <xs:simpleType name="pidwildcard">
+               <xs:restriction base="xs:string">
+                       <xs:enumeration value="*"/>
+               </xs:restriction>
+       </xs:simpleType>
+
+       <xs:complexType name="pid_target_type">
+               <xs:all>
+                       <xs:element name="pid">
+                               <xs:simpleType>
+                                       <xs:union memberTypes="pidbyint pidwildcard" />
+                               </xs:simpleType>
+                       </xs:element>
+                       <xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
+               </xs:all>
+       </xs:complexType>
+
+       <!-- Maps to a list of pid_targets-->
+       <xs:complexType name="targets_type">
+               <xs:sequence>
+                       <xs:choice>
+                               <xs:element name="pid_target" type="pid_target_type" minOccurs="0" maxOccurs="unbounded"/>
+                       </xs:choice>
+               </xs:sequence>
+       </xs:complexType>
+
+       <!-- Maps to a pid_tracker-->
+       <xs:complexType name="pid_tracker_type">
+               <xs:all>
+                       <xs:element name="targets" type="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: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: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="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>
+
+       <!-- 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: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:all>
+       </xs:complexType>
+
+       <xs:complexType name="snapshots_type">
+               <xs:sequence>
+                       <xs:element name="snapshot" type="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: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="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: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="nowrite" type="xs:int" />
+               </xs:all>
+       </xs:complexType>
+
+       <!-- 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: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:all>
+       </xs:complexType>
+
+       <!-- Maps to struct lttng_calibrate -->
+       <xs:complexType name="calibrate_type">
+               <xs:all>
+                       <xs:element name="type" type="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:all>
+       </xs:complexType>
+
+       <!-- Maps to lttng_event_context -->
+       <xs:complexType name="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:all>
+       </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: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: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: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:sequence>
+       </xs:complexType>
+
+       <!-- Maps to an action dutring snapshot command -->
+       <xs:complexType name="snapshot_action_type">
+               <xs:sequence>
+                       <xs:element name="name" type="snapshot_actiontype_type" minOccurs="0" />
+                       <xs:element name="output" type="output_type" minOccurs="0" />
+               </xs:sequence>
+       </xs:complexType>
+
+       <!-- Type of snapshot commands -->
+       <xs:simpleType name="snapshot_actiontype_type">
+               <xs:restriction base="xs:string">
+                       <xs:enumeration value="list-output" />
+                       <xs:enumeration value="del-output" />
+                       <xs:enumeration value="add-output" />
+                       <xs:enumeration value="record-output" />
+               </xs:restriction>
+       </xs:simpleType>
+
+       <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:choice>
+       </xs:complexType>
+
+       <!-- Maps to the mi_lttng commands -->
+       <xs:simpleType name="command_string_type">
+               <xs:restriction base="xs:string">
+                       <xs:enumeration value="create" />
+                       <xs:enumeration value="list" />
+                       <xs:enumeration value="snapshot" />
+                       <xs:enumeration value="version" />
+                       <xs:enumeration value="save" />
+                       <xs:enumeration value="load" />
+                       <xs:enumeration value="start" />
+                       <xs:enumeration value="stop" />
+                       <xs:enumeration value="destroy" />
+                       <xs:enumeration value="calibrate" />
+                       <xs:enumeration value="add-context" />
+                       <xs:enumeration value="enable-channel" />
+                       <xs:enumeration value="enable-event" />
+                       <xs:enumeration value="set-session" />
+                       <xs:enumeration value="disable-event" />
+                       <xs:enumeration value="disable-channel" />
+                       <xs:enumeration value="track" />
+                       <xs:enumeration value="untrack" />
+               </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="success" type="xs:boolean" minOccurs="0" maxOccurs="1" />
+                       </xs:all>
+               </xs:complexType>
+       </xs:element>
+</xs:schema>
index ef98687d868108ef6e37e604b9c5e6c577f1cf00..30bd60328f33bc305cc8937811bebf71b642c6a7 100644 (file)
@@ -951,22 +951,16 @@ int mi_lttng_event_common_attributes(struct mi_writer *writer,
                goto end;
        }
 
-       /* Event filter enabled? */
-       ret = mi_lttng_writer_write_element_bool(writer,
-                       config_element_filter, event->filter);
-
        /* Event filter expression */
        ret = lttng_event_get_filter_string(event, &filter_expression);
-
        if (ret) {
                goto end;
        }
 
        if (filter_expression) {
                ret = mi_lttng_writer_write_element_string(writer,
-                       config_element_filter_expression,
-                       filter_expression);
-
+                               config_element_filter_expression,
+                               filter_expression);
                if (ret) {
                        goto end;
                }
diff --git a/src/common/mi_lttng.xsd b/src/common/mi_lttng.xsd
deleted file mode 100644 (file)
index 3992a8e..0000000
+++ /dev/null
@@ -1,554 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2014 - Oliver Cotte <olivier.cotte@polymtl.ca>
-                   - Jonathan Rajotte <jonathan.r.julien@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-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"
-       elementFormDefault="qualified" version="2.7">
-
-       <!-- Maps to the uint32_t type -->
-       <xs:simpleType name="uint32_type">
-               <xs:restriction base="xs:integer">
-                       <xs:minInclusive value="0" />
-                       <xs:maxInclusive value="4294967295" />
-               </xs:restriction>
-       </xs:simpleType>
-
-       <!-- Maps to the uint64_t type -->
-       <xs:simpleType name="uint64_type">
-               <xs:restriction base="xs:integer">
-                       <xs:minInclusive value="0" />
-                       <xs:maxInclusive value="18446744073709551615" />
-               </xs:restriction>
-       </xs:simpleType>
-
-       <!-- Maps to the char name[LTTNG_SYMBOL_NAME_LEN] -->
-       <xs:simpleType name="name_type">
-               <xs:restriction base="xs:string">
-                       <xs:maxLength value="255" />
-               </xs:restriction>
-       </xs:simpleType>
-
-       <!-- Maps to the lttng_event_type enum -->
-       <xs:simpleType name="event_type_type">
-               <xs:restriction base="xs:string">
-                       <xs:enumeration value="ALL" />
-                       <xs:enumeration value="TRACEPOINT" />
-                       <xs:enumeration value="PROBE" />
-                       <xs:enumeration value="FUNCTION" />
-                       <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>
-
-       <!-- Maps to the lttng_event_field_type enum -->
-       <xs:simpleType name="event_field_type_type">
-               <xs:restriction base="xs:string">
-                       <xs:enumeration value="OTHER" />
-                       <xs:enumeration value="INTEGER" />
-                       <xs:enumeration value="ENUM" />
-                       <xs:enumeration value="FLOAT" />
-                       <xs:enumeration value="STRING" />
-               </xs:restriction>
-       </xs:simpleType>
-
-       <!-- Maps to the lttng_loglevel_type enum -->
-       <xs:simpleType name="loglevel_type">
-               <xs:restriction base="xs:string">
-                       <xs:enumeration value="ALL" />
-                       <xs:enumeration value="RANGE" />
-                       <xs:enumeration value="SINGLE" />
-                       <xs:enumeration value="UNKNOWN" />
-               </xs:restriction>
-       </xs:simpleType>
-
-       <!-- 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" />
-                       <xs:enumeration value="NICE" />
-                       <xs:enumeration value="VPID" />
-                       <xs:enumeration value="TID" />
-                       <xs:enumeration value="VTID" />
-                       <xs:enumeration value="PPID" />
-                       <xs:enumeration value="VPPID" />
-                       <xs:enumeration value="PTHREAD_ID" />
-                       <xs:enumeration value="HOSTNAME" />
-                       <xs:enumeration value="IP" />
-               </xs:restriction>
-       </xs:simpleType>
-
-       <!-- Maps to loglevel_string char * -->
-       <xs:simpleType name="loglevel_string_type">
-               <xs:restriction base="xs:string">
-                       <xs:enumeration value="" />
-                       <xs:enumeration value="TRACE_EMERG" />
-                       <xs:enumeration value="TRACE_ALERT" />
-                       <xs:enumeration value="TRACE_CRIT" />
-                       <xs:enumeration value="TRACE_ERR" />
-                       <xs:enumeration value="TRACE_WARNING" />
-                       <xs:enumeration value="TRACE_NOTICE" />
-                       <xs:enumeration value="TRACE_INFO" />
-                       <xs:enumeration value="TRACE_DEBUG_SYSTEM" />
-                       <xs:enumeration value="TRACE_DEBUG_PROGRAM" />
-                       <xs:enumeration value="TRACE_DEBUG_PROCESS" />
-                       <xs:enumeration value="TRACE_DEBUG_MODULE" />
-                       <xs:enumeration value="TRACE_DEBUG_UNIT" />
-                       <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="LOG4J_OFF" />
-                       <xs:enumeration value="LOG4J_FATAL" />
-                       <xs:enumeration value="LOG4J_ERROR" />
-                       <xs:enumeration value="LOG4J_WARN" />
-                       <xs:enumeration value="LOG4J_INFO" />
-                       <xs:enumeration value="LOG4J_DEBUG" />
-                       <xs:enumeration value="LOG4J_TRACE" />
-                       <xs:enumeration value="LOG4J_ALL" />
-                       <xs:enumeration value="PYTHON_CRITICAL" />
-                       <xs:enumeration value="PYTHON_ERROR" />
-                       <xs:enumeration value="PYTHON_WARNING" />
-                       <xs:enumeration value="PYTHON_INFO" />
-                       <xs:enumeration value="PYTHON_DEBUG" />
-                       <xs:enumeration value="PYTHON_NOTSET" />
-                       <xs:enumeration value="UNKNOWN" />
-               </xs:restriction>
-       </xs:simpleType>
-
-       <!-- Maps to the lttng_calibrate_type enum -->
-       <xs:simpleType name="calibrate_type_type">
-               <xs:restriction base="xs:string">
-                       <xs:enumeration value="FUNCTION" />
-               </xs:restriction>
-       </xs:simpleType>
-
-       <!-- 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: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: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:choice>
-       </xs:complexType>
-
-       <!-- Maps to exclusion type -->
-       <xs:complexType name="event_exclusion_list_type">
-               <xs:sequence>
-                       <xs:element name="exclusion" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-               </xs:sequence>
-       </xs:complexType>
-
-       <!-- 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="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" />
-                       <xs:element name="event_fields" type="event_fields_type" minOccurs="0" />
-                       <xs:element name="success" type="xs:boolean" minOccurs="0" />
-               </xs:all>
-       </xs:complexType>
-
-       <!-- 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="url" type="xs:string" />
-                       <xs:element name="minor" type="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="description" type="xs:string" />
-               </xs:all>
-       </xs:complexType>
-
-       <!-- 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:sequence>
-       </xs:complexType>
-
-       <!-- Maps to the lttng_domain_type enum -->
-       <xs:simpleType name="domain_type_type">
-               <xs:restriction base="xs:string">
-                       <xs:enumeration value="KERNEL"/>
-                       <xs:enumeration value="UST"/>
-                       <xs:enumeration value="JUL"/>
-                       <xs:enumeration value="LOG4J"/>
-                       <xs:enumeration value="PYTHON"/>
-               </xs:restriction>
-       </xs:simpleType>
-
-       <!-- Maps to the lttng_buffer_type enum -->
-       <xs:simpleType name="domain_buffer_type">
-               <xs:restriction base="xs:string">
-                       <xs:enumeration value="PER_PID"/>
-                       <xs:enumeration value="PER_UID"/>
-                       <xs:enumeration value="GLOBAL"/>
-               </xs:restriction>
-       </xs:simpleType>
-
-       <!-- Maps to the type mode of a channel -->
-       <xs:simpleType name="channel_overwrite_mode_type">
-               <xs:restriction base="xs:string">
-                       <xs:enumeration value="DISCARD" />
-                       <xs:enumeration value="OVERWRITE" />
-               </xs:restriction>
-       </xs:simpleType>
-
-       <!-- Maps to the lttng_event_output enum -->
-       <xs:simpleType name="event_output_type">
-               <xs:restriction base="xs:string">
-                       <xs:enumeration value="SPLICE" />
-                       <xs:enumeration value="MMAP" />
-               </xs:restriction>
-       </xs:simpleType>
-
-       <!-- map to a pid -->
-       <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: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:sequence>
-       </xs:complexType>
-
-       <xs:simpleType name="pidbyint">
-               <xs:restriction base="xs:integer">
-                       <xs:minInclusive value="0"/>
-                       <xs:maxInclusive value="4294967295" />
-               </xs:restriction>
-       </xs:simpleType>
-
-       <xs:simpleType name="pidwildcard">
-               <xs:restriction base="xs:string">
-                       <xs:enumeration value="*"/>
-               </xs:restriction>
-       </xs:simpleType>
-
-       <xs:complexType name="pid_target_type">
-               <xs:all>
-                       <xs:element name="pid">
-                               <xs:simpleType>
-                                       <xs:union memberTypes="pidbyint pidwildcard" />
-                               </xs:simpleType>
-                       </xs:element>
-                       <xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
-               </xs:all>
-       </xs:complexType>
-
-       <!-- Maps to a list of pid_targets-->
-       <xs:complexType name="targets_type">
-               <xs:sequence>
-                       <xs:choice>
-                               <xs:element name="pid_target" type="pid_target_type" minOccurs="0" maxOccurs="unbounded"/>
-                       </xs:choice>
-               </xs:sequence>
-       </xs:complexType>
-
-       <!-- Maps to a pid_tracker-->
-       <xs:complexType name="pid_tracker_type">
-               <xs:all>
-                       <xs:element name="targets" type="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: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: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="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>
-
-       <!-- 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: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:all>
-       </xs:complexType>
-
-       <xs:complexType name="snapshots_type">
-               <xs:sequence>
-                       <xs:element name="snapshot" type="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: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="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: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="nowrite" type="xs:int" />
-               </xs:all>
-       </xs:complexType>
-
-       <!-- 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: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:all>
-       </xs:complexType>
-
-       <!-- Maps to struct lttng_calibrate -->
-       <xs:complexType name="calibrate_type">
-               <xs:all>
-                       <xs:element name="type" type="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:all>
-       </xs:complexType>
-
-       <!-- Maps to lttng_event_context -->
-       <xs:complexType name="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:all>
-       </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: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: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: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:sequence>
-       </xs:complexType>
-
-       <!-- Maps to an action dutring snapshot command -->
-       <xs:complexType name="snapshot_action_type">
-               <xs:sequence>
-                       <xs:element name="name" type="snapshot_actiontype_type" minOccurs="0" />
-                       <xs:element name="output" type="output_type" minOccurs="0" />
-               </xs:sequence>
-       </xs:complexType>
-
-       <!-- Type of snapshot commands -->
-       <xs:simpleType name="snapshot_actiontype_type">
-               <xs:restriction base="xs:string">
-                       <xs:enumeration value="list-output" />
-                       <xs:enumeration value="del-output" />
-                       <xs:enumeration value="add-output" />
-                       <xs:enumeration value="record-output" />
-               </xs:restriction>
-       </xs:simpleType>
-
-       <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:choice>
-       </xs:complexType>
-
-       <!-- Maps to the mi_lttng commands -->
-       <xs:simpleType name="command_string_type">
-               <xs:restriction base="xs:string">
-                       <xs:enumeration value="create" />
-                       <xs:enumeration value="list" />
-                       <xs:enumeration value="snapshot" />
-                       <xs:enumeration value="version" />
-                       <xs:enumeration value="save" />
-                       <xs:enumeration value="load" />
-                       <xs:enumeration value="start" />
-                       <xs:enumeration value="stop" />
-                       <xs:enumeration value="destroy" />
-                       <xs:enumeration value="calibrate" />
-                       <xs:enumeration value="add-context" />
-                       <xs:enumeration value="enable-channel" />
-                       <xs:enumeration value="enable-event" />
-                       <xs:enumeration value="set-session" />
-                       <xs:enumeration value="disable-event" />
-                       <xs:enumeration value="disable-channel" />
-                       <xs:enumeration value="track" />
-                       <xs:enumeration value="untrack" />
-               </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="success" type="xs:boolean" minOccurs="0" maxOccurs="1" />
-                       </xs:all>
-               </xs:complexType>
-       </xs:element>
-</xs:schema>
index 47ec1b16a4c1d98bce5fbc36157a703bf9bc508e..cb0470bb76afcf91fa1097df13c19d4709625a70 100755 (executable)
@@ -19,7 +19,7 @@ TEST_DESC="Machine interface testing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
-XSD_PATH=$TESTDIR/../src/common/mi_lttng.xsd
+XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd
 SESSIOND_BIN="lttng-sessiond"
 RELAYD_BIN="lttng-relayd"
 
This page took 0.061176 seconds and 4 git commands to generate.