X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fconfig.c;h=f93c5a678f12df5e8024bc21197a7900df12ce84;hp=bfb2576f4d5bab954b37958d7c1d672bcbfd7c13;hb=6c1c0768320135c6936c371b09731851b508c023;hpb=cf53c06d8c89926284a15f6c27d60cf31761e622

diff --git a/src/common/config/config.c b/src/common/config/config.c
index bfb2576f4..f93c5a678 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>
@@ -117,6 +118,8 @@ const char * const config_element_max_size = "max_size";
 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";
@@ -353,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;
@@ -379,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;
 	}
 
@@ -749,6 +752,10 @@ int get_domain_type(xmlChar *domain)
 		ret = LTTNG_DOMAIN_UST;
 	} else if (!strcmp((char *) domain, config_domain_type_jul)) {
 		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;
 	}
@@ -1236,6 +1243,7 @@ int create_session(const char *name,
 	struct lttng_domain *kernel_domain,
 	struct lttng_domain *ust_domain,
 	struct lttng_domain *jul_domain,
+	struct lttng_domain *log4j_domain,
 	xmlNodePtr output_node,
 	uint64_t live_timer_interval)
 {
@@ -1276,7 +1284,7 @@ int create_session(const char *name,
 		int i;
 		struct lttng_domain *domain;
 		struct lttng_domain *domains[] =
-			{ kernel_domain, ust_domain, jul_domain };
+			{ kernel_domain, ust_domain, jul_domain, log4j_domain};
 
 		/* network destination */
 		if (live_timer_interval && live_timer_interval != UINT64_MAX) {
@@ -1956,7 +1964,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)) {
@@ -2147,6 +2157,8 @@ int process_session_node(xmlNodePtr session_node, const char *session_name,
 	struct lttng_domain *kernel_domain = NULL;
 	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)) {
@@ -2273,6 +2285,20 @@ int process_session_node(xmlNodePtr session_node, const char *session_name,
 			}
 			jul_domain = domain;
 			break;
+		case LTTNG_DOMAIN_LOG4J:
+			if (log4j_domain) {
+				/* Same domain seen twice, invalid! */
+				goto domain_init_error;
+			}
+			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;
@@ -2299,11 +2325,11 @@ domain_init_error:
 	} 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);
+				log4j_domain, output_node, live_timer_interval);
 	} else {
 		/* regular session */
 		ret = create_session(name, kernel_domain, ust_domain, jul_domain,
-				output_node, UINT64_MAX);
+				log4j_domain, output_node, UINT64_MAX);
 	}
 	if (ret) {
 		goto error;
@@ -2334,6 +2360,8 @@ error:
 	free(kernel_domain);
 	free(ust_domain);
 	free(jul_domain);
+	free(log4j_domain);
+	free(python_domain);
 	free(name);
 	return ret;
 }