X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fconfig.c;h=0b119c4f16995b573b4ba6008bb3c29b16e06160;hb=440e7c9b2a9f4b1df8fbd16d021fbbed361cb84c;hp=35d9bb2543284811ced1a899a1a8644ff3fda5ff;hpb=dc5141b9bf8323b45582c255fd3afd541fa63e14;p=lttng-tools.git

diff --git a/src/common/config/config.c b/src/common/config/config.c
index 35d9bb254..0b119c4f1 100644
--- a/src/common/config/config.c
+++ b/src/common/config/config.c
@@ -26,6 +26,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <stdbool.h>
 
 #include <common/defaults.h>
 #include <common/error.h>
@@ -330,11 +331,10 @@ static xmlChar *encode_string(const char *in_str)
 
 	in_len = strlen(in_str);
 	/*
-	 * Add 1 byte for the NULL terminted character. The factor 2 here is
-	 * because UTF-8 can be on two bytes so this fits the worst case for each
-	 * bytes.
+	 * Add 1 byte for the NULL terminted character. The factor 4 here is
+	 * used because UTF-8 characters can take up to 4 bytes.
 	 */
-	out_len = (in_len * 2) + 1;
+	out_len = (in_len * 4) + 1;
 	out_str = xmlMalloc(out_len);
 	if (!out_str) {
 		goto end;
@@ -1416,6 +1416,23 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 
 	memset(&event, 0, sizeof(event));
 
+	/* Initialize default log level which varies by domain */
+	switch (handle->domain.type)
+	{
+	case LTTNG_DOMAIN_JUL:
+		event.loglevel = LTTNG_LOGLEVEL_JUL_ALL;
+		break;
+	case LTTNG_DOMAIN_LOG4J:
+		event.loglevel = LTTNG_LOGLEVEL_LOG4J_ALL;
+		break;
+	case LTTNG_DOMAIN_UST:
+	case LTTNG_DOMAIN_KERNEL:
+		event.loglevel = LTTNG_LOGLEVEL_DEBUG;
+		break;
+	default:
+		assert(0);
+	}
+
 	for (node = xmlFirstElementChild(event_node); node;
 		node = xmlNextElementSibling(node)) {
 		if (!strcmp((const char *) node->name, config_element_name)) {
@@ -1528,6 +1545,7 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 				goto end;
 			}
 
+			free(filter_expression);
 			filter_expression = strdup((char *) content);
 			free(content);
 			if (!filter_expression) {
@@ -2578,8 +2596,8 @@ end:
 		}
 	}
 
-	if (!session_found) {
-		ret = -LTTNG_ERR_LOAD_SESSION_NOENT;
+	if (session_found) {
+		ret = 0;
 	}
 
 	return ret;
@@ -2624,6 +2642,7 @@ int config_load_session(const char *path, const char *session_name,
 		int override, unsigned int autoload)
 {
 	int ret;
+	bool session_loaded = false;
 	const char *path_ptr = NULL;
 	struct session_config_validation_ctx validation_ctx = { 0 };
 
@@ -2682,6 +2701,7 @@ int config_load_session(const char *path, const char *session_name,
 				 * Continue even if the session was found since we have to try
 				 * the system wide sessions.
 				 */
+				session_loaded = true;
 			}
 		}
 
@@ -2704,6 +2724,9 @@ int config_load_session(const char *path, const char *session_name,
 		if (path_ptr) {
 			ret = load_session_from_path(path_ptr, session_name,
 					&validation_ctx, override);
+			if (!ret) {
+				session_loaded = true;
+			}
 		}
 	} else {
 		ret = access(path, F_OK);
@@ -2736,5 +2759,10 @@ end:
 		 */
 		ret = 0;
 	}
+
+	if (session_loaded && ret == -LTTNG_ERR_LOAD_SESSION_NOENT) {
+		/* A matching session was found in one of the search paths. */
+		ret = 0;
+	}
 	return ret;
 }