X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fconfig.c;h=d84e38b9fa7b25b71de57bdc07ecb90997811b72;hb=fae9a062a468c47fc71ef7aa96374bf9d87d137e;hp=e44710b5ae0872b7e3eded59460a6f70865b30f7;hpb=14ce5bd8eefa248c5abedc32b02394ef74307e81;p=lttng-tools.git

diff --git a/src/common/config/config.c b/src/common/config/config.c
index e44710b5a..d84e38b9f 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>
@@ -31,6 +32,7 @@
 #include <common/error.h>
 #include <common/macros.h>
 #include <common/utils.h>
+#include <common/compat/getenv.h>
 #include <lttng/lttng-error.h>
 #include <libxml/parser.h>
 #include <libxml/valid.h>
@@ -113,11 +115,14 @@ const char * const config_element_net_output = "net_output";
 const char * const config_element_control_uri = "control_uri";
 const char * const config_element_data_uri = "data_uri";
 const char * const config_element_max_size = "max_size";
+const char * const config_element_pid = "pid";
+const char * const config_element_pids = "pids";
 
 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";
@@ -593,7 +598,7 @@ static
 char *get_session_config_xsd_path()
 {
 	char *xsd_path;
-	const char *base_path = getenv(DEFAULT_SESSION_CONFIG_XSD_PATH_ENV);
+	const char *base_path = lttng_secure_getenv(DEFAULT_SESSION_CONFIG_XSD_PATH_ENV);
 	size_t base_path_len;
 	size_t max_path_len;
 
@@ -752,6 +757,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;
 	}
@@ -1280,7 +1287,7 @@ int create_session(const char *name,
 		int i;
 		struct lttng_domain *domain;
 		struct lttng_domain *domains[] =
-			{ kernel_domain, ust_domain, jul_domain, log4j_domain};
+			{ kernel_domain, ust_domain, jul_domain, log4j_domain };
 
 		/* network destination */
 		if (live_timer_interval && live_timer_interval != UINT64_MAX) {
@@ -1636,6 +1643,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]);
@@ -2154,6 +2179,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)) {
@@ -2287,6 +2313,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;
@@ -2349,6 +2382,7 @@ error:
 	free(ust_domain);
 	free(jul_domain);
 	free(log4j_domain);
+	free(python_domain);
 	free(name);
 	return ret;
 }