X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fmi_lttng.xsd;h=efb62a20bb8613d70958eb872cc0f8877414d4e6;hb=bf239d4cf83c083459c7672ac8a1965108bacca6;hp=a54e6bfbf189b6393ea852f3d9566fe387726863;hpb=99e88aea851afcb1c9388469c68c7e1fe2b8982a;p=lttng-tools.git

diff --git a/src/common/mi_lttng.xsd b/src/common/mi_lttng.xsd
index a54e6bfbf..efb62a20b 100644
--- a/src/common/mi_lttng.xsd
+++ b/src/common/mi_lttng.xsd
@@ -22,7 +22,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.7">
 
 	<!-- Maps to the uint32_t type -->
 	<xs:simpleType name="uint32_type">
@@ -83,7 +83,7 @@ THE SOFTWARE.
 		</xs:restriction>
 	</xs:simpleType>
 
-	<!-- Maps to the lttng_loglevel_type enum -->
+	<!-- Maps to the lttng_event_context_type enum -->
 	<xs:simpleType name="context_type_type">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="PERF_COUNTER" />
@@ -132,6 +132,20 @@ THE SOFTWARE.
 			<xs:enumeration value="JUL_FINER" />
 			<xs:enumeration value="JUL_FINEST" />
 			<xs:enumeration value="JUL_ALL" />
+			<xs:enumeration value="LOG4J_OFF" />
+			<xs:enumeration value="LOG4J_FATAL" />
+			<xs:enumeration value="LOG4J_ERROR" />
+			<xs:enumeration value="LOG4J_WARN" />
+			<xs:enumeration value="LOG4J_INFO" />
+			<xs:enumeration value="LOG4J_DEBUG" />
+			<xs:enumeration value="LOG4J_TRACE" />
+			<xs:enumeration value="LOG4J_ALL" />
+			<xs:enumeration value="PYTHON_CRITICAL" />
+			<xs:enumeration value="PYTHON_ERROR" />
+			<xs:enumeration value="PYTHON_WARNING" />
+			<xs:enumeration value="PYTHON_INFO" />
+			<xs:enumeration value="PYTHON_DEBUG" />
+			<xs:enumeration value="PYTHON_NOTSET" />
 			<xs:enumeration value="UNKNOWN" />
 		</xs:restriction>
 	</xs:simpleType>
@@ -146,9 +160,9 @@ THE SOFTWARE.
 	<!-- Maps to the lttng_event_probe_attr struct -->
 	<xs:complexType name="event_probe_attributes_type">
 		<xs:all>
-			<xs:element name="address" type="uint64_type" />
-			<xs:element name="offset" type="uint64_type" />
-			<xs:element name="symbol_name" type="name_type" />
+			<xs:element name="address" type="uint64_type" minOccurs="0" />
+			<xs:element name="offset" type="uint64_type" minOccurs="0" />
+			<xs:element name="symbol_name" type="name_type" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
@@ -219,6 +233,8 @@ THE SOFTWARE.
 			<xs:enumeration value="KERNEL"/>
 			<xs:enumeration value="UST"/>
 			<xs:enumeration value="JUL"/>
+			<xs:enumeration value="LOG4J"/>
+			<xs:enumeration value="PYTHON"/>
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -263,6 +279,53 @@ THE SOFTWARE.
 		</xs:sequence>
 	</xs:complexType>
 
+	<xs:simpleType name="pidbyint">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="4294967295" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="pidwildcard">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="*"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="pid_target_type">
+		<xs:all>
+			<xs:element name="pid">
+				<xs:simpleType>
+					<xs:union memberTypes="pidbyint pidwildcard" />
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="success" type="xs:boolean" default="false" minOccurs="0" />
+		</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 and contains channels -->
 	<xs:complexType name="domain_type">
 		<xs:all>
@@ -271,6 +334,7 @@ THE SOFTWARE.
 			<xs:element name="pids" type="pids_type" minOccurs="0" />
 			<xs:element name="channels" type="channels_type" minOccurs="0" />
 			<xs:element name="events" type="event_list_type" minOccurs="0" />
+			<xs:element name="trackers" type="trackers_type" minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
 
@@ -347,7 +411,7 @@ THE SOFTWARE.
 		</xs:all>
 	</xs:complexType>
 
-	<!-- Map to the save command -->
+	<!-- Maps to the save command -->
 	<xs:complexType name="save_type">
 		<xs:all>
 			<xs:element name="session" type="session_type" />
@@ -355,7 +419,7 @@ THE SOFTWARE.
 		</xs:all>
 	</xs:complexType>
 
-	<!-- Map to the load command -->
+	<!-- Maps to the load command -->
 	<xs:complexType name="load_type">
 		<xs:all>
 			<xs:element name="session" type="session_type" />
@@ -370,7 +434,7 @@ THE SOFTWARE.
 		</xs:all>
 	</xs:complexType>
 
-	<!-- Map to lttng_event_perf_counter_ctx -->
+	<!-- Maps to lttng_event_perf_counter_ctx -->
 	<xs:complexType name="perf_counter_context_type">
 		<xs:all>
 			<xs:element name="type" type="uint32_type" />
@@ -379,7 +443,7 @@ THE SOFTWARE.
 		</xs:all>
 	</xs:complexType>
 
-	<!-- Map to lttng_event_context -->
+	<!-- Maps to lttng_event_context -->
 	<xs:complexType name="context_type">
 		<xs:all>
 			<xs:element name="type" type="context_type_type" />
@@ -437,7 +501,6 @@ THE SOFTWARE.
 	<xs:complexType name="output_type">
 		<xs:choice>
 			<xs:element name="domains" type="domains_type" minOccurs="0" />
-			<xs:element name="session" type="session_type" minOccurs="0" />
 			<xs:element name="sessions" type="sessions_type" minOccurs="0" />
 			<xs:element name="session" type="session_type" minOccurs="0" />
 			<xs:element name="snapshot_action" type="snapshot_action_type" minOccurs="0" />
@@ -450,7 +513,7 @@ THE SOFTWARE.
 			<xs:element name="channels" type="channels_type" minOccurs="0" />
 			<xs:element name="events" type="event_list_type" minOccurs="0" />
 			<xs:element name="channel" type="channel_type" minOccurs="0" />
-			<xs:element name="channels" type="channels_type" minOccurs="0" />
+			<xs:element name="targets" type="targets_type" minOccurs="0" />
 		</xs:choice>
 	</xs:complexType>
 
@@ -473,6 +536,8 @@ THE SOFTWARE.
 			<xs:enumeration value="set-session" />
 			<xs:enumeration value="disable-event" />
 			<xs:enumeration value="disable-channel" />
+			<xs:enumeration value="track" />
+			<xs:enumeration value="untrack" />
 		</xs:restriction>
 	</xs:simpleType>