X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=inline;f=src%2Fcommon%2Fconfig%2Fsession.xsd;h=7f4592f1eb36b78fdf3e3a15a5e6ab1a268c9f27;hb=259c267446a63c501298f39a5d2397314b11f729;hp=3023216ea23e23eff437b9c52e96892e7a151d40;hpb=ff00898c439fb356898d51207f0546165ab7432a;p=lttng-tools.git

diff --git a/src/common/config/session.xsd b/src/common/config/session.xsd
index 3023216ea..7f4592f1e 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.5">
+elementFormDefault="qualified" version="2.11">
 
 <xs:simpleType name="name_type">
 	<xs:restriction base="xs:string">
@@ -43,6 +43,18 @@ elementFormDefault="qualified" version="2.5">
 	</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"/>
@@ -136,6 +148,13 @@ elementFormDefault="qualified" version="2.5">
 	</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 +170,7 @@ elementFormDefault="qualified" version="2.5">
 		<xs:enumeration value="PTHREAD_ID"/>
 		<xs:enumeration value="HOSTNAME"/>
 		<xs:enumeration value="IP"/>
+		<xs:enumeration value="APP"/>
 	</xs:restriction>
 </xs:simpleType>
 
@@ -158,6 +178,7 @@ elementFormDefault="qualified" version="2.5">
 	<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 +198,14 @@ elementFormDefault="qualified" version="2.5">
 		<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>
 
@@ -193,6 +216,7 @@ elementFormDefault="qualified" version="2.5">
 		<xs:enumeration value="UST"/>
 		<xs:enumeration value="JUL"/>
 		<xs:enumeration value="LOG4J"/>
+		<xs:enumeration value="PYTHON"/>
 	</xs:restriction>
 </xs:simpleType>
 
@@ -207,24 +231,55 @@ elementFormDefault="qualified" version="2.5">
 
 <xs:complexType name="channel_list_type">
 	<xs:sequence>
-		<xs:element name="channel" type="channel_type" minOccurs="0" maxOccurs="unbounded"/>
+		<xs:element name="channel" type="channel_type" minOccurs="0" maxOccurs="unbounded" />
 	</xs:sequence>
 </xs:complexType>
 
-<!-- Maps to struct lttng_domain and contains channels -->
+<xs:complexType name="pid_target_type">
+	<xs:all>
+		<xs:element name="pid" type="xs:integer" />
+	</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, contains channels and pid_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:all>
 </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_timer_interval" type="uint64_type" minOccurs="0"/> <!-- usec -->
+	</xs:all>
 </xs:complexType>
 
 <xs:complexType name="domain_list_type">
@@ -278,6 +333,7 @@ elementFormDefault="qualified" version="2.5">
 <xs:complexType name="session_type">
 	<xs:all>
 		<xs:element name="name" type="name_type"/>
+		<xs:element name="shared_memory_path" type="xs:string" minOccurs="0"/>
 		<xs:element name="domains" type="domain_list_type" minOccurs="0"/>
 		<xs:element name="started" type="xs:boolean" default="0" minOccurs="0"/>
 		<xs:element name="attributes" type="session_attributes_type" minOccurs="0"/>