From 07334a07e831a0e9d56bbae696eaeaf6d4291b98 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 5 Jul 2018 11:08:40 -0400 Subject: [PATCH] Backport: trackers: bump MI version to 4.0 Signed-off-by: Mathieu Desnoyers --- src/common/Makefile.am | 2 +- src/common/defaults.h | 2 +- src/common/{mi-lttng-3.0.xsd => mi-lttng-4.0.xsd} | 6 +++--- src/common/mi-lttng.c | 4 ++-- tests/regression/tools/mi/test_mi | 2 +- tests/regression/tools/relayd-grouping/test_ust | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename src/common/{mi-lttng-3.0.xsd => mi-lttng-4.0.xsd} (99%) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index bc769f8e0..0feb0a0d1 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -62,7 +62,7 @@ noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \ # Common library noinst_LTLIBRARIES = libcommon.la -EXTRA_DIST = mi-lttng-3.0.xsd +EXTRA_DIST = mi-lttng-4.0.xsd libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.c runas.h \ common.h futex.c futex.h uri.c uri.h defaults.c \ diff --git a/src/common/defaults.h b/src/common/defaults.h index 2dff39087..f504f4d78 100644 --- a/src/common/defaults.h +++ b/src/common/defaults.h @@ -327,7 +327,7 @@ #define DEFAULT_RUN_AS_WORKER_NAME "lttng-runas" /* Default LTTng MI XML namespace. */ -#define DEFAULT_LTTNG_MI_NAMESPACE "http://lttng.org/xml/ns/lttng-mi" +#define DEFAULT_LTTNG_MI_NAMESPACE "https://lttng.org/xml/ns/lttng-mi" /* Default thread stack size; the default mandated by pthread_create(3) */ #define DEFAULT_LTTNG_THREAD_STACK_SIZE 2097152 diff --git a/src/common/mi-lttng-3.0.xsd b/src/common/mi-lttng-4.0.xsd similarity index 99% rename from src/common/mi-lttng-3.0.xsd rename to src/common/mi-lttng-4.0.xsd index 1a957e17d..ca7f3c543 100644 --- a/src/common/mi-lttng-3.0.xsd +++ b/src/common/mi-lttng-4.0.xsd @@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --> + targetNamespace="https://lttng.org/xml/ns/lttng-mi" + xmlns:tns="https://lttng.org/xml/ns/lttng-mi" + elementFormDefault="qualified" version="4.0"> diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c index e761bb112..ca0ba20dd 100644 --- a/src/common/mi-lttng.c +++ b/src/common/mi-lttng.c @@ -26,7 +26,7 @@ #include -#define MI_SCHEMA_MAJOR_VERSION 3 +#define MI_SCHEMA_MAJOR_VERSION 4 #define MI_SCHEMA_MINOR_VERSION 0 /* Machine interface namespace URI */ @@ -36,7 +36,7 @@ LTTNG_HIDDEN const char * const mi_lttng_w3_schema_uri = "http://www.w3.org/2001 LTTNG_HIDDEN const char * const mi_lttng_schema_location = "xsi:schemaLocation"; LTTNG_HIDDEN const char * const mi_lttng_schema_location_uri = DEFAULT_LTTNG_MI_NAMESPACE " " - "http://lttng.org/xml/schemas/lttng-mi/" XSTR(MI_SCHEMA_MAJOR_VERSION) + "https://lttng.org/xml/schemas/lttng-mi/" XSTR(MI_SCHEMA_MAJOR_VERSION) "/lttng-mi-" XSTR(MI_SCHEMA_MAJOR_VERSION) "." XSTR(MI_SCHEMA_MINOR_VERSION) ".xsd"; LTTNG_HIDDEN const char * const mi_lttng_schema_version = "schemaVersion"; diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi index ef43987d1..3ebcfdb6f 100755 --- a/tests/regression/tools/mi/test_mi +++ b/tests/regression/tools/mi/test_mi @@ -19,7 +19,7 @@ TEST_DESC="Machine interface testing" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../../ -XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd +XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd SESSIOND_BIN="lttng-sessiond" RELAYD_BIN="lttng-relayd" diff --git a/tests/regression/tools/relayd-grouping/test_ust b/tests/regression/tools/relayd-grouping/test_ust index d26c5bc9d..58d1ab34c 100755 --- a/tests/regression/tools/relayd-grouping/test_ust +++ b/tests/regression/tools/relayd-grouping/test_ust @@ -26,7 +26,7 @@ TESTAPP_NAME="gen-ust-events" TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" EVENT_NAME="tp:tptest" -XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd +XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd XML_VALIDATE="$TESTDIR/regression/tools/mi/validate_xml $XSD_PATH" XML_EXTRACT="$TESTDIR/regression/tools/mi/extract_xml" -- 2.34.1