X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=bb4e9feea5fbf65833174c2a34a6a5f9c3c3781e;hb=395004a13b038fde13364a662d735d16937ea2d1;hp=37c5ce383962e1b278e150a9dfac0a063998fd4e;hpb=d37ac3cdc4fe21f117edfb829db4d0eb7cf914a1;p=lttng-tools.git

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index 37c5ce383..bb4e9feea 100644
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-config.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * SPDX-License-Identifier: GPL-2.0-only
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  */
 
@@ -639,6 +639,32 @@ int config_writer_write_element_bool(struct config_writer *writer,
 		value ? config_xml_true : config_xml_false);
 }
 
+LTTNG_HIDDEN
+int config_writer_write_element_double(struct config_writer *writer,
+		const char *element_name,
+		double value)
+{
+	int ret;
+	xmlChar *encoded_element_name;
+
+	if (!writer || !writer->writer || !element_name || !element_name[0]) {
+		ret = -1;
+		goto end;
+	}
+
+	encoded_element_name = encode_string(element_name);
+	if (!encoded_element_name) {
+		ret = -1;
+		goto end;
+	}
+
+	ret = xmlTextWriterWriteFormatElement(
+			writer->writer, encoded_element_name, "%f", value);
+	xmlFree(encoded_element_name);
+end:
+	return ret >= 0 ? 0 : ret;
+}
+
 LTTNG_HIDDEN
 int config_writer_write_element_string(struct config_writer *writer,
 		const char *element_name, const char *value)
@@ -712,7 +738,7 @@ void fini_session_config_validation_ctx(
 }
 
 static
-char *get_session_config_xsd_path()
+char *get_session_config_xsd_path(void)
 {
 	char *xsd_path;
 	const char *base_path = lttng_secure_getenv(DEFAULT_SESSION_CONFIG_XSD_PATH_ENV);
@@ -843,12 +869,14 @@ int parse_bool(xmlChar *str, int *val)
 		goto end;
 	}
 
-	if (!strcmp((const char *) str, config_xml_true)) {
+	if (!strcmp((const char *) str, config_xml_true) ||
+			!strcmp((const char *) str, "1")) {
 		*val = 1;
-	} else if (!strcmp((const char *) str, config_xml_false)) {
+	} else if (!strcmp((const char *) str, config_xml_false) ||
+			!strcmp((const char *) str, "0")) {
 		*val = 0;
 	} else {
-		WARN("Invalid boolean value encoutered (%s).",
+		WARN("Invalid boolean value encountered (%s).",
 			(const char *) str);
 		ret = -1;
 	}
@@ -4017,16 +4045,17 @@ int config_load_session(const char *path, const char *session_name,
 		/* Try home path */
 		home_path = utils_get_home_dir();
 		if (home_path) {
-			char path[PATH_MAX];
+			char path_buf[PATH_MAX];
 
 			/*
 			 * Try user session configuration path. Ignore error here so we can
 			 * continue loading the system wide sessions.
 			 */
 			if (autoload) {
-				ret = snprintf(path, sizeof(path),
-						DEFAULT_SESSION_HOME_CONFIGPATH "/"
-						DEFAULT_SESSION_CONFIG_AUTOLOAD, home_path);
+				ret = snprintf(path_buf, sizeof(path_buf),
+						DEFAULT_SESSION_HOME_CONFIGPATH
+						"/" DEFAULT_SESSION_CONFIG_AUTOLOAD,
+						home_path);
 				if (ret < 0) {
 					PERROR("snprintf session autoload home config path");
 					ret = -LTTNG_ERR_INVALID;
@@ -4038,19 +4067,20 @@ int config_load_session(const char *path, const char *session_name,
 				 * avoid any user session daemon to try to load kernel sessions
 				 * automatically and failing all the times.
 				 */
-				ret = validate_path_creds(path);
+				ret = validate_path_creds(path_buf);
 				if (ret) {
-					path_ptr = path;
+					path_ptr = path_buf;
 				}
 			} else {
-				ret = snprintf(path, sizeof(path),
-						DEFAULT_SESSION_HOME_CONFIGPATH, home_path);
+				ret = snprintf(path_buf, sizeof(path_buf),
+						DEFAULT_SESSION_HOME_CONFIGPATH,
+						home_path);
 				if (ret < 0) {
 					PERROR("snprintf session home config path");
 					ret = -LTTNG_ERR_INVALID;
 					goto end;
 				}
-				path_ptr = path;
+				path_ptr = path_buf;
 			}
 			if (path_ptr) {
 				ret = load_session_from_path(path_ptr, session_name,