X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=743b5143893a4364cf5bf4f314e408102f77824d;hp=eea6c0a81d5062e7db0047252f4309d5c3ec7c5c;hb=d7b645e2c77977a8a83362f27094bf6d126f6fb8;hpb=ec2ed7da32f703bcacefca6a57865887700b780a

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index eea6c0a81..743b51438 100644
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-config.c
@@ -177,6 +177,11 @@ LTTNG_HIDDEN const char * const config_event_context_preemptible = "PREEMPTIBLE"
 LTTNG_HIDDEN const char * const config_event_context_need_reschedule = "NEED_RESCHEDULE";
 LTTNG_HIDDEN const char * const config_event_context_migratable = "MIGRATABLE";
 
+enum process_event_node_phase {
+	CREATION = 0,
+	ENABLE = 1,
+};
+
 struct consumer_output {
 	int enabled;
 	char *path;
@@ -1151,17 +1156,16 @@ end:
 }
 
 static
-int create_session_net_output(const char *name, struct lttng_domain *domain,
-	const char *control_uri, const char *data_uri)
+int create_session_net_output(const char *name, const char *control_uri,
+		const char *data_uri)
 {
 	int ret;
 	struct lttng_handle *handle;
 	const char *uri = NULL;
 
 	assert(name);
-	assert(domain);
 
-	handle = lttng_create_handle(name, domain);
+	handle = lttng_create_handle(name, NULL);
 	if (!handle) {
 		ret = -LTTNG_ERR_NOMEM;
 		goto end;
@@ -1343,11 +1347,6 @@ int create_session(const char *name,
 	}
 
 	if (output.control_uri || output.data_uri) {
-		int i;
-		struct lttng_domain *domain;
-		struct lttng_domain *domains[] =
-			{ kernel_domain, ust_domain, jul_domain, log4j_domain };
-
 		/* network destination */
 		if (live_timer_interval && live_timer_interval != UINT64_MAX) {
 			/*
@@ -1363,18 +1362,12 @@ int create_session(const char *name,
 			goto end;
 		}
 
-		for (i = 0; i < (sizeof(domains) / sizeof(domains[0])); i++) {
-			domain = domains[i];
-			if (!domain) {
-				continue;
-			}
-
-			ret = create_session_net_output(name, domain, output.control_uri,
-					output.data_uri);
-			if (ret) {
-				goto end;
-			}
+		ret = create_session_net_output(name, output.control_uri,
+				output.data_uri);
+		if (ret) {
+			goto end;
 		}
+
 	} else {
 		/* either local output or no output */
 		ret = lttng_create_session(name, output.path);
@@ -1467,9 +1460,9 @@ end:
 
 static
 int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
-	const char *channel_name)
+	const char *channel_name, const enum process_event_node_phase phase)
 {
-	int ret, i;
+	int ret = 0, i;
 	xmlNodePtr node;
 	struct lttng_event event;
 	char **exclusions = NULL;
@@ -1720,25 +1713,14 @@ 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);
+	if ((event.enabled && phase == ENABLE) || phase == CREATION) {
+		ret = lttng_enable_event_with_exclusions(handle, &event, channel_name,
+				filter_expression, exclusion_count, exclusions);
+		if (ret < 0) {
+			WARN("Enabling event (name:%s) on load failed.", event.name);
+			ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+			goto end;
+		}
 	}
 end:
 	for (i = 0; i < exclusion_count; i++) {
@@ -1755,6 +1737,7 @@ int process_events_node(xmlNodePtr events_node, struct lttng_handle *handle,
 	const char *channel_name)
 {
 	int ret = 0;
+	struct lttng_event event;
 	xmlNodePtr node;
 
 	assert(events_node);
@@ -1763,11 +1746,33 @@ int process_events_node(xmlNodePtr events_node, struct lttng_handle *handle,
 
 	for (node = xmlFirstElementChild(events_node); node;
 		node = xmlNextElementSibling(node)) {
-		ret = process_event_node(node, handle, channel_name);
+		ret = process_event_node(node, handle, channel_name, CREATION);
+		if (ret) {
+			goto end;
+		}
+	}
+
+	/*
+	 * Disable all events to enable only the necessary events.
+	 * Limitations regarding lttng_disable_events and tuple descriptor
+	 * force this approach.
+	 */
+	memset(&event, 0, sizeof(event));
+	event.loglevel = -1;
+	event.type = LTTNG_EVENT_ALL;
+	ret = lttng_disable_event_ext(handle, &event, channel_name, NULL);
+	if (ret) {
+		goto end;
+	}
+
+	for (node = xmlFirstElementChild(events_node); node;
+			node = xmlNextElementSibling(node)) {
+		ret = process_event_node(node, handle, channel_name, ENABLE);
 		if (ret) {
 			goto end;
 		}
 	}
+
 end:
 	return ret;
 }