save/load: support session rotation schedule descriptors

[lttng-tools.git] / src / common / config / session.xsd

diff --git a/src/common/config/session.xsd b/src/common/config/session.xsd
index 550fea0ee2376d427860d0b1a6744aad003558dc..18cb6679ad37007d499df9bc816098fec100d769 100644 (file)
--- 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"/>
@@ -159,6 +171,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 +204,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>
 
@@ -260,11 +280,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">