X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=d53ec0aa530ae88201932675c2bcb7e6b6dff719;hb=0d4bab5e4bd1654515ce754a3d9699cafe9b41b2;hp=87e9c03c8f667a65efee86dead199f77d7ee8884;hpb=f40ef1d56886bc58f5d7e147d77f818f46b66456;p=lttng-tools.git

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index 87e9c03c8..d53ec0aa5 100644
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-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>
@@ -95,17 +96,23 @@ const char * const config_element_output_type = "output_type";
 const char * const config_element_tracefile_size = "tracefile_size";
 const char * const config_element_tracefile_count = "tracefile_count";
 const char * const config_element_live_timer_interval = "live_timer_interval";
+LTTNG_HIDDEN const char * const config_element_discarded_events = "discarded_events";
+LTTNG_HIDDEN const char * const config_element_lost_packets = "lost_packets";
 const char * const config_element_type = "type";
 const char * const config_element_buffer_type = "buffer_type";
 const char * const config_element_session = "session";
 const char * const config_element_sessions = "sessions";
-const char * const config_element_perf = "perf";
+LTTNG_HIDDEN const char * const config_element_context_perf = "perf";
+LTTNG_HIDDEN const char * const config_element_context_app = "app";
+LTTNG_HIDDEN const char * const config_element_context_app_provider_name = "provider_name";
+LTTNG_HIDDEN const char * const config_element_context_app_ctx_name = "ctx_name";
 const char * const config_element_config = "config";
 const char * const config_element_started = "started";
 const char * const config_element_snapshot_mode = "snapshot_mode";
 const char * const config_element_loglevel = "loglevel";
 const char * const config_element_loglevel_type = "loglevel_type";
 const char * const config_element_filter = "filter";
+LTTNG_HIDDEN const char * const config_element_filter_expression = "filter_expression";
 const char * const config_element_snapshot_outputs = "snapshot_outputs";
 const char * const config_element_consumer_output = "consumer_output";
 const char * const config_element_destination = "destination";
@@ -165,6 +172,19 @@ const char * const config_event_context_pthread_id = "PTHREAD_ID";
 const char * const config_event_context_hostname = "HOSTNAME";
 const char * const config_event_context_ip = "IP";
 const char * const config_event_context_perf_thread_counter = "PERF_THREAD_COUNTER";
+LTTNG_HIDDEN const char * const config_event_context_app = "APP";
+LTTNG_HIDDEN const char * const config_event_context_interruptible = "INTERRUPTIBLE";
+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";
+
+/* Deprecated symbols */
+const char * const config_element_perf;
+
+enum process_event_node_phase {
+	CREATION = 0,
+	ENABLE = 1,
+};
 
 struct consumer_output {
 	int enabled;
@@ -449,7 +469,40 @@ int config_writer_open_element(struct config_writer *writer,
 	ret = xmlTextWriterStartElement(writer->writer, encoded_element_name);
 	xmlFree(encoded_element_name);
 end:
-	return ret > 0 ? 0 : ret;
+	return ret >= 0 ? 0 : ret;
+}
+
+LTTNG_HIDDEN
+int config_writer_write_attribute(struct config_writer *writer,
+		const char *name, const char *value)
+{
+	int ret;
+	xmlChar *encoded_name = NULL;
+	xmlChar *encoded_value = NULL;
+
+	if (!writer || !writer->writer || !name || !name[0]) {
+		ret = -1;
+		goto end;
+	}
+
+	encoded_name = encode_string(name);
+	if (!encoded_name) {
+		ret = -1;
+		goto end;
+	}
+
+	encoded_value = encode_string(value);
+	if (!encoded_value) {
+		ret = -1;
+		goto end;
+	}
+
+	ret = xmlTextWriterWriteAttribute(writer->writer, encoded_name,
+			encoded_value);
+end:
+	xmlFree(encoded_name);
+	xmlFree(encoded_value);
+	return ret >= 0 ? 0 : ret;
 }
 
 LTTNG_HIDDEN
@@ -464,7 +517,7 @@ int config_writer_close_element(struct config_writer *writer)
 
 	ret = xmlTextWriterEndElement(writer->writer);
 end:
-	return ret > 0 ? 0 : ret;
+	return ret >= 0 ? 0 : ret;
 }
 
 LTTNG_HIDDEN
@@ -489,7 +542,7 @@ int config_writer_write_element_unsigned_int(struct config_writer *writer,
 		encoded_element_name, "%" PRIu64, value);
 	xmlFree(encoded_element_name);
 end:
-	return ret > 0 ? 0 : ret;
+	return ret >= 0 ? 0 : ret;
 }
 
 LTTNG_HIDDEN
@@ -514,7 +567,7 @@ int config_writer_write_element_signed_int(struct config_writer *writer,
 		encoded_element_name, "%" PRIi64, value);
 	xmlFree(encoded_element_name);
 end:
-	return ret > 0 ? 0 : ret;
+	return ret >= 0 ? 0 : ret;
 }
 
 LTTNG_HIDDEN
@@ -556,7 +609,7 @@ int config_writer_write_element_string(struct config_writer *writer,
 end:
 	xmlFree(encoded_element_name);
 	xmlFree(encoded_value);
-	return ret > 0 ? 0 : ret;
+	return ret >= 0 ? 0 : ret;
 }
 
 static
@@ -946,6 +999,18 @@ int get_context_type(xmlChar *context_type)
 	} else if (!strcmp((char *) context_type,
 		config_event_context_ip)) {
 		ret = LTTNG_EVENT_CONTEXT_IP;
+	} else if (!strcmp((char *) context_type,
+		config_event_context_interruptible)) {
+		ret = LTTNG_EVENT_CONTEXT_INTERRUPTIBLE;
+	} else if (!strcmp((char *) context_type,
+		config_event_context_preemptible)) {
+		ret = LTTNG_EVENT_CONTEXT_PREEMPTIBLE;
+	} else if (!strcmp((char *) context_type,
+		config_event_context_need_reschedule)) {
+		ret = LTTNG_EVENT_CONTEXT_NEED_RESCHEDULE;
+	} else if (!strcmp((char *) context_type,
+		config_event_context_migratable)) {
+		ret = LTTNG_EVENT_CONTEXT_MIGRATABLE;
 	} else {
 		goto error;
 	}
@@ -1095,17 +1160,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;
@@ -1287,11 +1351,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) {
 			/*
@@ -1307,18 +1366,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);
@@ -1411,9 +1464,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;
@@ -1558,6 +1611,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) {
@@ -1664,25 +1718,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++) {
@@ -1699,6 +1742,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);
@@ -1707,11 +1751,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;
 }
@@ -1991,6 +2057,7 @@ int process_context_node(xmlNodePtr context_node,
 		config_element_type)) {
 		/* type */
 		xmlChar *content = xmlNodeGetContent(context_child_node);
+
 		if (!content) {
 			ret = -LTTNG_ERR_NOMEM;
 			goto end;
@@ -2004,10 +2071,11 @@ int process_context_node(xmlNodePtr context_node,
 		}
 
 		context.ctx = ret;
-	} else {
+	} else if (!strcmp((const char *) context_child_node->name,
+		config_element_context_perf)) {
+		/* perf */
 		xmlNodePtr perf_attr_node;
 
-		/* perf */
 		context.ctx = handle->domain.type == LTTNG_DOMAIN_KERNEL ?
 			LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER :
 			LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER;
@@ -2085,9 +2153,41 @@ int process_context_node(xmlNodePtr context_node,
 				free(content);
 			}
 		}
+	} else if (!strcmp((const char *) context_child_node->name,
+		config_element_context_app)) {
+		/* application context */
+		xmlNodePtr app_ctx_node;
+
+		context.ctx = LTTNG_EVENT_CONTEXT_APP_CONTEXT;
+		for (app_ctx_node = xmlFirstElementChild(context_child_node);
+				app_ctx_node; app_ctx_node =
+				xmlNextElementSibling(app_ctx_node)) {
+			xmlChar *content;
+			char **target = strcmp(
+				(const char *) app_ctx_node->name,
+				config_element_context_app_provider_name) == 0 ?
+					&context.u.app_ctx.provider_name :
+					&context.u.app_ctx.ctx_name;
+
+			content = xmlNodeGetContent(app_ctx_node);
+			if (!content) {
+				ret = -LTTNG_ERR_NOMEM;
+				goto end;
+			}
+
+			*target = (char *) content;
+		}
+	} else {
+		/* Unrecognized context type */
+		ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+		goto end;
 	}
 
 	ret = lttng_add_context(handle, &context, NULL, channel_name);
+	if (context.ctx == LTTNG_EVENT_CONTEXT_APP_CONTEXT) {
+		free(context.u.app_ctx.provider_name);
+		free(context.u.app_ctx.ctx_name);
+	}
 end:
 	return ret;
 }
@@ -2295,7 +2395,7 @@ end:
 
 static
 int process_session_node(xmlNodePtr session_node, const char *session_name,
-		int override)
+		int overwrite)
 {
 	int ret, started = -1, snapshot_mode = -1;
 	uint64_t live_timer_interval = UINT64_MAX;
@@ -2470,7 +2570,7 @@ domain_init_error:
 		goto error;
 	}
 
-	if (override) {
+	if (overwrite) {
 		/* Destroy session if it exists */
 		ret = lttng_destroy_session((const char *) name);
 		if (ret && ret != -LTTNG_ERR_SESS_NOT_FOUND) {
@@ -2565,7 +2665,7 @@ valid:
 
 static
 int load_session_from_file(const char *path, const char *session_name,
-	struct session_config_validation_ctx *validation_ctx, int override)
+	struct session_config_validation_ctx *validation_ctx, int overwrite)
 {
 	int ret, session_found = !session_name;
 	xmlDocPtr doc = NULL;
@@ -2607,7 +2707,7 @@ int load_session_from_file(const char *path, const char *session_name,
 		session_node; session_node =
 			xmlNextElementSibling(session_node)) {
 		ret = process_session_node(session_node,
-			session_name, override);
+			session_name, overwrite);
 		if (session_name && ret == 0) {
 			/* Target session found and loaded */
 			session_found = 1;
@@ -2641,7 +2741,7 @@ struct dirent *alloc_dirent(const char *path)
 
 static
 int load_session_from_path(const char *path, const char *session_name,
-	struct session_config_validation_ctx *validation_ctx, int override)
+	struct session_config_validation_ctx *validation_ctx, int overwrite)
 {
 	int ret, session_found = !session_name;
 	DIR *directory = NULL;
@@ -2716,7 +2816,7 @@ int load_session_from_path(const char *path, const char *session_name,
 			file_path[path_len + file_name_len] = '\0';
 
 			ret = load_session_from_file(file_path, session_name,
-				validation_ctx, override);
+				validation_ctx, overwrite);
 			if (session_name && !ret) {
 				session_found = 1;
 				break;
@@ -2727,7 +2827,7 @@ int load_session_from_path(const char *path, const char *session_name,
 		free(file_path);
 	} else {
 		ret = load_session_from_file(path, session_name,
-			validation_ctx, override);
+			validation_ctx, overwrite);
 		if (ret) {
 			goto end;
 		} else {
@@ -2742,8 +2842,8 @@ end:
 		}
 	}
 
-	if (!session_found) {
-		ret = -LTTNG_ERR_LOAD_SESSION_NOENT;
+	if (session_found && !ret) {
+		ret = 0;
 	}
 
 	return ret;
@@ -2785,9 +2885,10 @@ invalid:
 
 LTTNG_HIDDEN
 int config_load_session(const char *path, const char *session_name,
-		int override, unsigned int autoload)
+		int overwrite, unsigned int autoload)
 {
 	int ret;
+	bool session_loaded = false;
 	const char *path_ptr = NULL;
 	struct session_config_validation_ctx validation_ctx = { 0 };
 
@@ -2838,7 +2939,7 @@ 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);
+						&validation_ctx, overwrite);
 				if (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT) {
 					goto end;
 				}
@@ -2846,6 +2947,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;
 			}
 		}
 
@@ -2867,7 +2969,10 @@ 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);
+					&validation_ctx, overwrite);
+			if (!ret) {
+				session_loaded = true;
+			}
 		}
 	} else {
 		ret = access(path, F_OK);
@@ -2889,7 +2994,7 @@ int config_load_session(const char *path, const char *session_name,
 		}
 
 		ret = load_session_from_path(path, session_name,
-			&validation_ctx, override);
+			&validation_ctx, overwrite);
 	}
 end:
 	fini_session_config_validation_ctx(&validation_ctx);
@@ -2900,5 +3005,16 @@ 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;
 }
+
+static
+void __attribute__((destructor)) session_config_exit(void)
+{
+	xmlCleanupParser();
+}