X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fconfig.c;h=b2a0912b8f5531d75c530875e5593812335803b8;hb=cc39f2e03be0419a5a200b1534c633e00709ba2c;hp=bfb2576f4d5bab954b37958d7c1d672bcbfd7c13;hpb=7ca03e9d1136386160ceea87ec694e9ff7ccf7cf;p=lttng-tools.git

diff --git a/src/common/config/config.c b/src/common/config/config.c
index bfb2576f4..b2a0912b8 100644
--- a/src/common/config/config.c
+++ b/src/common/config/config.c
@@ -1632,6 +1632,24 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 
 	ret = lttng_enable_event_with_exclusions(handle, &event, channel_name,
 			filter_expression, exclusion_count, exclusions);
+	if (ret) {
+		goto end;
+	}
+
+	if (!event.enabled) {
+		/*
+		 * Note that we should use lttng_disable_event_ext() (2.6+) to
+		 * eliminate the risk of clashing on events of the same
+		 * name (with different event types and loglevels).
+		 *
+		 * Unfortunately, lttng_disable_event_ext() only performs a
+		 * match on the name and event type and errors out if any other
+		 * event attribute is not set to its default value.
+		 *
+		 * This will disable all events that match this name.
+		 */
+		ret = lttng_disable_event(handle, event.name, channel_name);
+	}
 end:
 	for (i = 0; i < exclusion_count; i++) {
 		free(exclusions[i]);
@@ -2140,7 +2158,7 @@ int process_session_node(xmlNodePtr session_node, const char *session_name,
 {
 	int ret, started = -1, snapshot_mode = -1;
 	uint64_t live_timer_interval = UINT64_MAX;
-	char *name = NULL;
+	xmlChar *name = NULL;
 	xmlNodePtr domains_node = NULL;
 	xmlNodePtr output_node = NULL;
 	xmlNodePtr node;
@@ -2159,7 +2177,7 @@ int process_session_node(xmlNodePtr session_node, const char *session_name,
 				goto error;
 			}
 
-			name = (char *) node_content;
+			name = node_content;
 		} else if (!domains_node && !strcmp((const char *) node->name,
 			config_element_domains)) {
 			/* domains */
@@ -2229,7 +2247,7 @@ int process_session_node(xmlNodePtr session_node, const char *session_name,
 		goto error;
 	}
 
-	if (session_name && strcmp(name, session_name)) {
+	if (session_name && strcmp((char *) name, session_name)) {
 		/* This is not the session we are looking for */
 		ret = -LTTNG_ERR_NO_SESSION;
 		goto error;
@@ -2286,7 +2304,7 @@ domain_init_error:
 
 	if (override) {
 		/* Destroy session if it exists */
-		ret = lttng_destroy_session(name);
+		ret = lttng_destroy_session((const char *) name);
 		if (ret && ret != -LTTNG_ERR_SESS_NOT_FOUND) {
 			ERR("Failed to destroy existing session.");
 			goto error;
@@ -2295,15 +2313,17 @@ domain_init_error:
 
 	/* Create session type depending on output type */
 	if (snapshot_mode && snapshot_mode != -1) {
-		ret = create_snapshot_session(name, output_node);
+		ret = create_snapshot_session((const char *) name, output_node);
 	} else if (live_timer_interval &&
 		live_timer_interval != UINT64_MAX) {
-		ret = create_session(name, kernel_domain, ust_domain, jul_domain,
-				output_node, live_timer_interval);
+		ret = create_session((const char *) name, kernel_domain,
+				ust_domain, jul_domain, output_node,
+				live_timer_interval);
 	} else {
 		/* regular session */
-		ret = create_session(name, kernel_domain, ust_domain, jul_domain,
-				output_node, UINT64_MAX);
+		ret = create_session((const char *) name, kernel_domain,
+				ust_domain, jul_domain, output_node,
+				UINT64_MAX);
 	}
 	if (ret) {
 		goto error;
@@ -2311,14 +2331,14 @@ domain_init_error:
 
 	for (node = xmlFirstElementChild(domains_node); node;
 		node = xmlNextElementSibling(node)) {
-		ret = process_domain_node(node, name);
+		ret = process_domain_node(node, (const char *) name);
 		if (ret) {
 			goto end;
 		}
 	}
 
 	if (started) {
-		ret = lttng_start_tracing(name);
+		ret = lttng_start_tracing((const char *) name);
 		if (ret) {
 			goto end;
 		}
@@ -2326,15 +2346,16 @@ domain_init_error:
 
 end:
 	if (ret < 0) {
-		ERR("Failed to load session %s: %s", name, lttng_strerror(ret));
-		lttng_destroy_session(name);
+		ERR("Failed to load session %s: %s", (const char *) name,
+			lttng_strerror(ret));
+		lttng_destroy_session((const char *) name);
 	}
 
 error:
 	free(kernel_domain);
 	free(ust_domain);
 	free(jul_domain);
-	free(name);
+	xmlFree(name);
 	return ret;
 }