X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession.xsd;h=7781a5bdad8338d9a1c5d3eb4dc79b8482c76fd3;hb=40e14884a7f6606e387cdfa00f66d49a54cf311c;hp=1fdd03eb388c787858d72df1761f2a36c5a08276;hpb=16c4c9914f4e9aa1cf1a6f71f4b030fc8928e10e;p=lttng-tools.git

diff --git a/src/common/config/session.xsd b/src/common/config/session.xsd
index 1fdd03eb3..7781a5bda 100644
--- a/src/common/config/session.xsd
+++ b/src/common/config/session.xsd
@@ -85,6 +85,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 +103,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 +138,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>
 
@@ -280,12 +308,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>