X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fconfig%2Fsession.xsd;h=cd752fab45645c53a45ba5e3352638d0f0b73c37;hb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;hp=24259a0b8bb561914469a667f9b574b06f5efa3c;hpb=c460810b849f9dfa8a5c55406161a679b95a19de;p=lttng-tools.git

diff --git a/src/common/config/session.xsd b/src/common/config/session.xsd
index 24259a0b8..cd752fab4 100644
--- a/src/common/config/session.xsd
+++ b/src/common/config/session.xsd
@@ -1,24 +1,9 @@
 <?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.11">
@@ -85,6 +70,7 @@ by its signed 32-bit representation when converted to msec.
 		<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"/>
@@ -102,6 +88,31 @@ by its signed 32-bit representation when converted to msec.
 	</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"/>
@@ -112,6 +123,8 @@ by its signed 32-bit representation when converted to msec.
 	<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>
 
@@ -175,6 +188,8 @@ by its signed 32-bit representation when converted to msec.
 		<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>
 
@@ -240,16 +255,17 @@ by its signed 32-bit representation when converted to msec.
 </xs:complexType>
 
 <xs:complexType name="pid_target_type">
-	<xs:all>
+	<xs:choice minOccurs="0">
 		<xs:element name="pid" type="xs:integer" />
-	</xs:all>
+		<xs:element name="id" type="xs:integer" />
+	</xs:choice>
 </xs:complexType>
 
 <!-- Maps to a list of pid_targets-->
-<xs:complexType name="targets_type">
+<xs:complexType name="pid_targets_type">
 	<xs:sequence>
-		<xs:choice>
-			<xs:element name="pid_target" type="pid_target_type" minOccurs="0" maxOccurs="unbounded" />
+		<xs:choice minOccurs="0" maxOccurs="unbounded" >
+			<xs:element name="pid_target" type="pid_target_type" />
 		</xs:choice>
 	</xs:sequence>
 </xs:complexType>
@@ -257,14 +273,125 @@ by its signed 32-bit representation when converted to msec.
 <!-- Maps to a pid_tracker-->
 <xs:complexType name="pid_tracker_type">
 	<xs:all>
-		<xs:element name="targets" type="targets_type" />
+		<xs:element name="targets" type="pid_targets_type" />
+	</xs:all>
+</xs:complexType>
+
+<xs:complexType name="vpid_target_type">
+	<xs:all>
+		<xs:element name="id" type="xs:integer" />
+	</xs:all>
+</xs:complexType>
+
+<!-- Maps to a list of vpid_targets-->
+<xs:complexType name="vpid_targets_type">
+	<xs:sequence>
+		<xs:element name="vpid_target" type="vpid_target_type" minOccurs="0" maxOccurs="unbounded" />
+	</xs:sequence>
+</xs:complexType>
+
+<!-- Maps to a pid_tracker-->
+<xs:complexType name="vpid_tracker_type">
+	<xs:all>
+		<xs:element name="targets" type="vpid_targets_type" />
+	</xs:all>
+</xs:complexType>
+
+<xs:complexType name="uid_target_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_targets-->
+<xs:complexType name="uid_targets_type">
+	<xs:sequence>
+		<xs:element name="uid_target" type="uid_target_type" minOccurs="0" maxOccurs="unbounded" />
+	</xs:sequence>
+</xs:complexType>
+
+<!-- Maps to a uid_tracker-->
+<xs:complexType name="uid_tracker_type">
+	<xs:all>
+		<xs:element name="targets" type="uid_targets_type" />
+	</xs:all>
+</xs:complexType>
+
+<xs:complexType name="vuid_target_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_targets-->
+<xs:complexType name="vuid_targets_type">
+	<xs:sequence>
+		<xs:element name="vuid_target" type="vuid_target_type" minOccurs="0" maxOccurs="unbounded" />
+	</xs:sequence>
+</xs:complexType>
+
+<!-- Maps to a uid_tracker-->
+<xs:complexType name="vuid_tracker_type">
+	<xs:all>
+		<xs:element name="targets" type="vuid_targets_type" />
+	</xs:all>
+</xs:complexType>
+
+<xs:complexType name="gid_target_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_targets-->
+<xs:complexType name="gid_targets_type">
+	<xs:sequence>
+		<xs:element name="gid_target" type="gid_target_type" minOccurs="0" maxOccurs="unbounded" />
+	</xs:sequence>
+</xs:complexType>
+
+<!-- Maps to a gid_tracker-->
+<xs:complexType name="gid_tracker_type">
+	<xs:all>
+		<xs:element name="targets" type="gid_targets_type" />
+	</xs:all>
+</xs:complexType>
+
+<xs:complexType name="vgid_target_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_targets-->
+<xs:complexType name="vgid_targets_type">
+	<xs:sequence>
+		<xs:element name="vgid_target" type="vgid_target_type" minOccurs="0" maxOccurs="unbounded" />
+	</xs:sequence>
+</xs:complexType>
+
+<!-- Maps to a gid_tracker-->
+<xs:complexType name="vgid_tracker_type">
+	<xs:all>
+		<xs:element name="targets" type="vgid_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:choice minOccurs="0" maxOccurs="unbounded" >
+			<xs:element name="pid_tracker" type="pid_tracker_type" maxOccurs="1" />
+			<xs:element name="vpid_tracker" type="vpid_tracker_type" maxOccurs="1" />
+			<xs:element name="uid_tracker" type="uid_tracker_type" maxOccurs="1" />
+			<xs:element name="vuid_tracker" type="vuid_tracker_type" maxOccurs="1" />
+			<xs:element name="gid_tracker" type="gid_tracker_type" maxOccurs="1" />
+			<xs:element name="vgid_tracker" type="vgid_tracker_type" maxOccurs="1" />
+		</xs:choice>
 	</xs:sequence>
 </xs:complexType>
 
@@ -278,12 +405,32 @@ by its signed 32-bit representation when converted to msec.
 	</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: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_schedule_timer_period" type="uint64_type" minOccurs="0"/> <!-- usec -->
-		<xs:element name="rotation_schedule_size" type="uint64_type" minOccurs="0"/> <!-- bytes -->
+		<xs:element name="rotation_schedules" type="rotation_schedule_type" minOccurs="0" />
 	</xs:all>
 </xs:complexType>