X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fconfig.c;h=431cd2989b1329bb400ad6658bd8bda2610dc89a;hp=a1ad95e462d7d3ef1060beff9ac3347b6d9b7cc6;hb=065321e96273c671652d316800faacf2ed20025e;hpb=5cdb6027a2b78fd93aa7f61174625190b5fc3459

diff --git a/src/common/config/config.c b/src/common/config/config.c
index a1ad95e46..431cd2989 100644
--- a/src/common/config/config.c
+++ b/src/common/config/config.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -118,6 +119,7 @@ const char * const config_domain_type_kernel = "KERNEL";
 const char * const config_domain_type_ust = "UST";
 const char * const config_domain_type_jul = "JUL";
 const char * const config_domain_type_log4j = "LOG4J";
+const char * const config_domain_type_python = "PYTHON";
 
 const char * const config_buffer_type_per_pid = "PER_PID";
 const char * const config_buffer_type_per_uid = "PER_UID";
@@ -354,7 +356,7 @@ end:
 }
 
 LTTNG_HIDDEN
-struct config_writer *config_writer_create(int fd_output)
+struct config_writer *config_writer_create(int fd_output, int indent)
 {
 	int ret;
 	struct config_writer *writer;
@@ -380,12 +382,12 @@ struct config_writer *config_writer_create(int fd_output)
 
 	ret = xmlTextWriterSetIndentString(writer->writer,
 		BAD_CAST config_xml_indent_string);
-	if (ret)  {
+	if (ret) {
 		goto error_destroy;
 	}
 
-	ret = xmlTextWriterSetIndent(writer->writer, 1);
-	if (ret)  {
+	ret = xmlTextWriterSetIndent(writer->writer, indent);
+	if (ret) {
 		goto error_destroy;
 	}
 
@@ -752,6 +754,8 @@ int get_domain_type(xmlChar *domain)
 		ret = LTTNG_DOMAIN_JUL;
 	} else if (!strcmp((char *) domain, config_domain_type_log4j)) {
 		ret = LTTNG_DOMAIN_LOG4J;
+	} else if (!strcmp((char *) domain, config_domain_type_python)) {
+		ret = LTTNG_DOMAIN_PYTHON;
 	} else {
 		goto error;
 	}
@@ -1636,6 +1640,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]);
@@ -1960,7 +1982,9 @@ int process_context_node(xmlNodePtr context_node,
 		xmlNodePtr perf_attr_node;
 
 		/* perf */
-		context.ctx = LTTNG_EVENT_CONTEXT_PERF_COUNTER;
+		context.ctx = handle->domain.type == LTTNG_DOMAIN_KERNEL ?
+			LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER :
+			LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER;
 		for (perf_attr_node = xmlFirstElementChild(context_child_node);
 			perf_attr_node; perf_attr_node =
 				xmlNextElementSibling(perf_attr_node)) {
@@ -2152,6 +2176,7 @@ int process_session_node(xmlNodePtr session_node, const char *session_name,
 	struct lttng_domain *ust_domain = NULL;
 	struct lttng_domain *jul_domain = NULL;
 	struct lttng_domain *log4j_domain = NULL;
+	struct lttng_domain *python_domain = NULL;
 
 	for (node = xmlFirstElementChild(session_node); node;
 		node = xmlNextElementSibling(node)) {
@@ -2285,6 +2310,13 @@ int process_session_node(xmlNodePtr session_node, const char *session_name,
 			}
 			log4j_domain = domain;
 			break;
+		case LTTNG_DOMAIN_PYTHON:
+			if (python_domain) {
+				/* Same domain seen twice, invalid! */
+				goto domain_init_error;
+			}
+			python_domain = domain;
+			break;
 		default:
 			WARN("Invalid domain type");
 			goto domain_init_error;
@@ -2347,6 +2379,7 @@ error:
 	free(ust_domain);
 	free(jul_domain);
 	free(log4j_domain);
+	free(python_domain);
 	free(name);
 	return ret;
 }