X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession.xsd;h=044b37701170696eb44ee9b5caa99847e455dc29;hp=550fea0ee2376d427860d0b1a6744aad003558dc;hb=55c9e7cac24318259d4f2549c97f7577b7b52db4;hpb=045fc61744f711fd2e4ca84c6339d97f1eafc71d

diff --git a/src/common/config/session.xsd b/src/common/config/session.xsd
index 550fea0ee..044b37701 100644
--- a/src/common/config/session.xsd
+++ b/src/common/config/session.xsd
@@ -21,7 +21,7 @@ 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.8">
+elementFormDefault="qualified" version="2.11">
 
 <xs:simpleType name="name_type">
 	<xs:restriction base="xs:string">
@@ -43,6 +43,18 @@ elementFormDefault="qualified" version="2.8">
 	</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 +85,7 @@ elementFormDefault="qualified" version="2.8">
 		<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 +103,31 @@ elementFormDefault="qualified" version="2.8">
 	</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 +138,8 @@ elementFormDefault="qualified" version="2.8">
 	<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>
 
@@ -159,6 +199,12 @@ elementFormDefault="qualified" version="2.8">
 		<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>
 
@@ -186,12 +232,14 @@ elementFormDefault="qualified" version="2.8">
 		<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>
 
@@ -222,16 +270,17 @@ elementFormDefault="qualified" version="2.8">
 </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>
@@ -239,14 +288,125 @@ elementFormDefault="qualified" version="2.8">
 <!-- 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>
 
@@ -260,11 +420,33 @@ elementFormDefault="qualified" version="2.8">
 	</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">