X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession.xsd;h=814723b2a39fbdb7f06ecaca9ab05b04cab34b9f;hp=49b7cd112e82c902fa663e7697145b06d7792528;hb=ab8a350b171f349c43b856895a1fe961ed47c337;hpb=847a5916c26ab9cc0dfc9322cccd2c748c54747e

diff --git a/src/common/config/session.xsd b/src/common/config/session.xsd
index 49b7cd112..814723b2a 100644
--- a/src/common/config/session.xsd
+++ b/src/common/config/session.xsd
@@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2014 - 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.
+Copyright (C) 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+
+SPDX-License-Identifier: MIT
+
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-elementFormDefault="qualified" version="2.7">
+elementFormDefault="qualified" version="2.12">
 
 <xs:simpleType name="name_type">
 	<xs:restriction base="xs:string">
@@ -43,6 +28,18 @@ elementFormDefault="qualified" version="2.7">
 	</xs:restriction>
 </xs:simpleType>
 
+<!--
+Maps to the range allowed for blocking timeout: -1 (block forever),
+0 (do not block), positive integer value (blocking time in usec) limited
+by its signed 32-bit representation when converted to msec.
+-->
+<xs:simpleType name="blocking_timeout_type">
+	<xs:restriction base="xs:integer">
+		<xs:minInclusive value="-1" />
+		<xs:maxInclusive value="2147483648000" />
+	</xs:restriction>
+</xs:simpleType>
+
 <xs:simpleType name="channel_overwrite_mode_type">
 	<xs:restriction base="xs:string">
 		<xs:enumeration value="DISCARD"/>
@@ -73,6 +70,7 @@ elementFormDefault="qualified" version="2.7">
 		<xs:enumeration value="ALL"/>
 		<xs:enumeration value="TRACEPOINT"/>
 		<xs:enumeration value="PROBE"/>
+		<xs:enumeration value="USERSPACE_PROBE"/>
 		<xs:enumeration value="FUNCTION"/>
 		<xs:enumeration value="FUNCTION_ENTRY"/>
 		<xs:enumeration value="NOOP"/>
@@ -90,6 +88,31 @@ elementFormDefault="qualified" version="2.7">
 	</xs:all>
 </xs:complexType>
 
+<xs:simpleType name="userspace_probe_lookup_method">
+	<xs:restriction base="xs:string">
+		<xs:enumeration value="DEFAULT"/>
+		<xs:enumeration value="ELF"/>
+		<xs:enumeration value="SDT"/>
+	</xs:restriction>
+</xs:simpleType>
+
+<xs:complexType name="event_userspace_probe_function_attributes_type">
+	<xs:all>
+		<xs:element name="lookup_method" type="userspace_probe_lookup_method"/>
+		<xs:element name="binary_path" type="xs:string"/>
+		<xs:element name="function_name" type="xs:string"/>
+	</xs:all>
+</xs:complexType>
+
+<xs:complexType name="event_userspace_probe_tracepoint_attributes_type">
+	<xs:all>
+		<xs:element name="lookup_method" type="userspace_probe_lookup_method"/>
+		<xs:element name="binary_path" type="xs:string"/>
+		<xs:element name="probe_name" type="xs:string"/>
+		<xs:element name="provider_name" type="xs:string"/>
+	</xs:all>
+</xs:complexType>
+
 <xs:complexType name="event_ftrace_attributes_type">
 	<xs:all>
 		<xs:element name="symbol_name" type="name_type"/>
@@ -100,6 +123,8 @@ elementFormDefault="qualified" version="2.7">
 	<xs:choice>
 		<xs:element name="probe_attributes" type="event_probe_attributes_type"/>
 		<xs:element name="function_attributes" type="event_ftrace_attributes_type"/>
+		<xs:element name="userspace_probe_function_attributes" type="event_userspace_probe_function_attributes_type"/>
+		<xs:element name="userspace_probe_tracepoint_attributes" type="event_userspace_probe_tracepoint_attributes_type"/>
 	</xs:choice>
 </xs:complexType>
 
@@ -136,6 +161,13 @@ elementFormDefault="qualified" version="2.7">
 	</xs:all>
 </xs:complexType>
 
+<xs:complexType name="event_app_context_type">
+	<xs:all>
+	  <xs:element name="provider_name" type="xs:string"/>
+	  <xs:element name="ctx_name" type="xs:string"/>
+	</xs:all>
+</xs:complexType>
+
 <!-- Maps to the lttng_event_context_type enum -->
 <xs:simpleType name="event_context_type_type">
 	<xs:restriction base="xs:string">
@@ -151,6 +183,13 @@ elementFormDefault="qualified" version="2.7">
 		<xs:enumeration value="PTHREAD_ID"/>
 		<xs:enumeration value="HOSTNAME"/>
 		<xs:enumeration value="IP"/>
+		<xs:enumeration value="APP"/>
+		<xs:enumeration value="INTERRUPTIBLE" />
+		<xs:enumeration value="PREEMPTIBLE" />
+		<xs:enumeration value="NEED_RESCHEDULE" />
+		<xs:enumeration value="MIGRATABLE" />
+		<xs:enumeration value="CALLSTACK_USER" />
+		<xs:enumeration value="CALLSTACK_KERNEL" />
 	</xs:restriction>
 </xs:simpleType>
 
@@ -158,6 +197,7 @@ elementFormDefault="qualified" version="2.7">
 	<xs:choice>
 		<xs:element name="type" type="event_context_type_type"/>
 		<xs:element name="perf" type="event_perf_context_type"/>
+		<xs:element name="app" type="event_app_context_type"/>
 	</xs:choice>
 </xs:complexType>
 
@@ -177,12 +217,14 @@ elementFormDefault="qualified" version="2.7">
 		<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="blocking_timeout" type="blocking_timeout_type" default="0" minOccurs="0" /> <!-- 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:element name="events" type="event_list_type" minOccurs="0"/>
 		<xs:element name="contexts" type="event_context_list_type" minOccurs="0"/>
+		<xs:element name="monitor_timer_interval" type="uint64_type" default="0" minOccurs="0"/>  <!-- usec -->
 	</xs:all>
 </xs:complexType>
 
@@ -212,50 +254,183 @@ elementFormDefault="qualified" version="2.7">
 	</xs:sequence>
 </xs:complexType>
 
-<xs:complexType name="pid_target_type">
+<xs:complexType name="pid_value_type">
+	<xs:choice minOccurs="0">
+		<xs:element name="id" type="xs:integer" />
+	</xs:choice>
+</xs:complexType>
+
+<!-- Maps to a list of pid_process_attr_values-->
+<xs:complexType name="pid_process_attr_values_type">
+	<xs:sequence>
+		<xs:choice minOccurs="0" maxOccurs="unbounded" >
+			<xs:element name="pid" type="pid_value_type" />
+		</xs:choice>
+	</xs:sequence>
+</xs:complexType>
+
+<!-- Maps to a pid_process_attr_tracker-->
+<xs:complexType name="pid_process_attr_tracker_type">
 	<xs:all>
-		<xs:element name="pid" type="xs:integer" />
+		<xs:element name="process_attr_values" type="pid_process_attr_values_type" />
 	</xs:all>
 </xs:complexType>
 
-<!-- Maps to a list of pid_targets-->
-<xs:complexType name="targets_type">
+<xs:complexType name="vpid_value_type">
+	<xs:all>
+		<xs:element name="id" type="xs:integer" />
+	</xs:all>
+</xs:complexType>
+
+<!-- Maps to a list of vpid_process_attr_values-->
+<xs:complexType name="vpid_process_attr_values_type">
 	<xs:sequence>
-		<xs:choice>
-			<xs:element name="pid_target" type="pid_target_type" minOccurs="0" maxOccurs="unbounded" />
-		</xs:choice>
+		<xs:element name="vpid" type="vpid_value_type" minOccurs="0" maxOccurs="unbounded" />
+	</xs:sequence>
+</xs:complexType>
+
+<!-- Maps to a pid_process_attr_tracker-->
+<xs:complexType name="vpid_process_attr_tracker_type">
+	<xs:all>
+		<xs:element name="process_attr_values" type="vpid_process_attr_values_type" />
+	</xs:all>
+</xs:complexType>
+
+<xs:complexType name="uid_value_type">
+	<xs:choice>
+		<xs:element name="id" type="xs:integer" />
+		<xs:element name="name" type="xs:string" />
+	</xs:choice>
+</xs:complexType>
+
+<!-- Maps to a list of uid_process_attr_values-->
+<xs:complexType name="uid_process_attr_values_type">
+	<xs:sequence>
+		<xs:element name="uid" type="uid_value_type" minOccurs="0" maxOccurs="unbounded" />
+	</xs:sequence>
+</xs:complexType>
+
+<!-- Maps to a uid_process_attr_tracker-->
+<xs:complexType name="uid_process_attr_tracker_type">
+	<xs:all>
+		<xs:element name="process_attr_values" type="uid_process_attr_values_type" />
+	</xs:all>
+</xs:complexType>
+
+<xs:complexType name="vuid_value_type">
+	<xs:choice>
+		<xs:element name="id" type="xs:integer" />
+		<xs:element name="name" type="xs:string" />
+	</xs:choice>
+</xs:complexType>
+
+<!-- Maps to a list of vuid_process_attr_values-->
+<xs:complexType name="vuid_process_attr_values_type">
+	<xs:sequence>
+		<xs:element name="vuid" type="vuid_value_type" minOccurs="0" maxOccurs="unbounded" />
+	</xs:sequence>
+</xs:complexType>
+
+<!-- Maps to a vuid_process_attr_tracker-->
+<xs:complexType name="vuid_process_attr_tracker_type">
+	<xs:all>
+		<xs:element name="process_attr_values" type="vuid_process_attr_values_type" />
+	</xs:all>
+</xs:complexType>
+
+<xs:complexType name="gid_value_type">
+	<xs:choice>
+		<xs:element name="id" type="xs:integer" />
+		<xs:element name="name" type="xs:string" />
+	</xs:choice>
+</xs:complexType>
+
+<!-- Maps to a list of gid_process_attr_values-->
+<xs:complexType name="gid_process_attr_values_type">
+	<xs:sequence>
+		<xs:element name="gid" type="gid_value_type" minOccurs="0" maxOccurs="unbounded" />
+	</xs:sequence>
+</xs:complexType>
+
+<!-- Maps to a gid_process_attr_tracker-->
+<xs:complexType name="gid_process_attr_tracker_type">
+	<xs:all>
+		<xs:element name="process_attr_values" type="gid_process_attr_values_type" />
+	</xs:all>
+</xs:complexType>
+
+<xs:complexType name="vgid_value_type">
+	<xs:choice>
+		<xs:element name="id" type="xs:integer" />
+		<xs:element name="name" type="xs:string" />
+	</xs:choice>
+</xs:complexType>
+
+<!-- Maps to a list of vgid_process_attr_values-->
+<xs:complexType name="vgid_process_attr_values_type">
+	<xs:sequence>
+		<xs:element name="vgid" type="vgid_value_type" minOccurs="0" maxOccurs="unbounded" />
 	</xs:sequence>
 </xs:complexType>
 
-<!-- Maps to a pid_tracker-->
-<xs:complexType name="pid_tracker_type">
+<!-- Maps to a vgid_process_attr_tracker-->
+<xs:complexType name="vgid_process_attr_tracker_type">
 	<xs:all>
-		<xs:element name="targets" type="targets_type" />
+		<xs:element name="process_attr_values" type="vgid_process_attr_values_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:complexType name="process_attr_tracker_type">
+	<xs:sequence>
+		<xs:choice minOccurs="0" maxOccurs="unbounded" >
+			<xs:element name="pid_process_attr_tracker" type="pid_process_attr_tracker_type" maxOccurs="1" />
+			<xs:element name="vpid_process_attr_tracker" type="vpid_process_attr_tracker_type" maxOccurs="1" />
+			<xs:element name="uid_process_attr_tracker" type="uid_process_attr_tracker_type" maxOccurs="1" />
+			<xs:element name="vuid_process_attr_tracker" type="vuid_process_attr_tracker_type" maxOccurs="1" />
+			<xs:element name="gid_process_attr_tracker" type="gid_process_attr_tracker_type" maxOccurs="1" />
+			<xs:element name="vgid_process_attr_tracker" type="vgid_process_attr_tracker_type" maxOccurs="1" />
+		</xs:choice>
 	</xs:sequence>
 </xs:complexType>
 
-<!-- Maps to struct lttng_domain, contains channels and pid_tracker -->
+<!-- Maps to struct lttng_domain, contains channels and pid_process_attr_tracker -->
 <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="channels" type="channel_list_type" minOccurs="0"/>
-		<xs:element name="trackers" type="trackers_type" minOccurs="0"/>
+		<xs:element name="process_attr_trackers" type="process_attr_tracker_type" minOccurs="0"/>
+	</xs:all>
+</xs:complexType>
+
+<xs:complexType name="periodic_rotation_schedule_type">
+	<xs:all>
+		<xs:element name="time_us" type="uint64_type" minOccurs="0" />
 	</xs:all>
 </xs:complexType>
 
+<xs:complexType name="size_threshold_rotation_schedule_type">
+	<xs:all>
+		<xs:element name="bytes" type="uint64_type" minOccurs="0" />
+	</xs:all>
+</xs:complexType>
+
+<xs:complexType name="rotation_schedule_type">
+	<xs:sequence>
+		<xs:choice maxOccurs="unbounded">
+			<xs:element name="periodic" type="periodic_rotation_schedule_type" maxOccurs="unbounded" />
+			<xs:element name="size_threshold" type="size_threshold_rotation_schedule_type" maxOccurs="unbounded" />
+		</xs:choice>
+	</xs:sequence>
+</xs:complexType>
+
 <xs:complexType name="session_attributes_type">
-	<xs:choice>
-		<xs:element name="snapshot_mode" type="xs:boolean"/>
-		<xs:element name="live_timer_interval" type="uint32_type"/> <!-- usec -->
-	</xs:choice>
+	<xs:all>
+		<xs:element name="snapshot_mode" type="xs:boolean" minOccurs="0"/>
+		<xs:element name="live_timer_interval" type="uint32_type" minOccurs="0"/> <!-- usec -->
+		<xs:element name="rotation_schedules" type="rotation_schedule_type" minOccurs="0" />
+	</xs:all>
 </xs:complexType>
 
 <xs:complexType name="domain_list_type">