X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fsession-config.c;h=4d12870e8d9bdd469cca73cf5cea127ec9f317f6;hb=194dfca0b76448fb6fa1daa28462031a68c138d8;hp=49047b1d6acc9f573aa5fb537dd9a6826bae8ede;hpb=329f344308786acb81d8939eb8e1ad37307696c2;p=lttng-tools.git

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index 49047b1d6..4d12870e8 100644
--- a/src/common/config/session-config.c
+++ b/src/common/config/session-config.c
@@ -1345,10 +1345,6 @@ end:
 
 static
 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,
 	const struct config_load_session_override_attr *overrides)
@@ -2437,10 +2433,31 @@ int process_domain_node(xmlNodePtr domain_node, const char *session_name)
 	/* create all channels */
 	for (node = xmlFirstElementChild(channels_node); node;
 		node = xmlNextElementSibling(node)) {
+		const enum lttng_domain_type original_domain = domain.type;
 		xmlNodePtr contexts_node = NULL;
 		xmlNodePtr events_node = NULL;
 		xmlNodePtr channel_attr_node;
 
+		/*
+		 * Channels of the "agent" types cannot be created directly.
+		 * They are meant to be created implicitly through the
+		 * activation of events in their domain. However, a user
+		 * can override the default channel configuration attributes
+		 * by creating the underlying UST channel _before_ enabling
+		 * an agent domain event.
+		 *
+		 * Hence, the channel's type is substituted before the creation
+		 * and restored by the time the events are created.
+		 */
+		switch (domain.type) {
+		case LTTNG_DOMAIN_JUL:
+		case LTTNG_DOMAIN_LOG4J:
+		case LTTNG_DOMAIN_PYTHON:
+			domain.type = LTTNG_DOMAIN_UST;
+		default:
+			break;
+		}
+
 		channel = lttng_channel_create(&domain);
 		if (!channel) {
 			ret = -1;
@@ -2462,6 +2479,9 @@ int process_domain_node(xmlNodePtr domain_node, const char *session_name)
 			goto end;
 		}
 
+		/* Restore the original channel domain. */
+		domain.type = original_domain;
+
 		ret = process_events_node(events_node, handle, channel->name);
 		if (ret) {
 			goto end;
@@ -2519,12 +2539,14 @@ int process_session_node(xmlNodePtr session_node, const char *session_name,
 {
 	int ret, started = -1, snapshot_mode = -1;
 	uint64_t live_timer_interval = UINT64_MAX,
-			 rotation_timer_interval = 0;
+			 rotation_timer_interval = 0,
+			 rotation_size = 0;
 	xmlChar *name = NULL;
 	xmlChar *shm_path = NULL;
 	xmlNodePtr domains_node = NULL;
 	xmlNodePtr output_node = NULL;
 	xmlNodePtr node;
+	xmlNodePtr attributes_child;
 	struct lttng_domain *kernel_domain = NULL;
 	struct lttng_domain *ust_domain = NULL;
 	struct lttng_domain *jul_domain = NULL;
@@ -2579,58 +2601,76 @@ int process_session_node(xmlNodePtr session_node, const char *session_name,
 		} else {
 			/*
 			 * attributes, snapshot_mode, live_timer_interval, rotation_size,
-			 * rotation_timer_interval. */
-			xmlNodePtr attributes_child =
-				xmlFirstElementChild(node);
-
-			if (!strcmp((const char *) attributes_child->name,
-				config_element_snapshot_mode)) {
-				/* snapshot_mode */
-				xmlChar *snapshot_mode_content =
-					xmlNodeGetContent(attributes_child);
-				if (!snapshot_mode_content) {
-					ret = -LTTNG_ERR_NOMEM;
-					goto error;
-				}
+			 * rotation_timer_interval.
+			 */
+			for (attributes_child = xmlFirstElementChild(node); attributes_child;
+					attributes_child = xmlNextElementSibling(attributes_child)) {
+				if (!strcmp((const char *) attributes_child->name,
+							config_element_snapshot_mode)) {
+					/* snapshot_mode */
+					xmlChar *snapshot_mode_content =
+						xmlNodeGetContent(attributes_child);
+					if (!snapshot_mode_content) {
+						ret = -LTTNG_ERR_NOMEM;
+						goto error;
+					}
 
-				ret = parse_bool(snapshot_mode_content, &snapshot_mode);
-				free(snapshot_mode_content);
-				if (ret) {
-					ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
-					goto error;
-				}
-			} else if (!strcmp((const char *) attributes_child->name,
-						config_element_live_timer_interval)) {
-				/* live_timer_interval */
-				xmlChar *timer_interval_content =
-					xmlNodeGetContent(attributes_child);
-				if (!timer_interval_content) {
-					ret = -LTTNG_ERR_NOMEM;
-					goto error;
-				}
+					ret = parse_bool(snapshot_mode_content, &snapshot_mode);
+					free(snapshot_mode_content);
+					if (ret) {
+						ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+						goto error;
+					}
+				} else if (!strcmp((const char *) attributes_child->name,
+							config_element_live_timer_interval)) {
+					/* live_timer_interval */
+					xmlChar *timer_interval_content =
+						xmlNodeGetContent(attributes_child);
+					if (!timer_interval_content) {
+						ret = -LTTNG_ERR_NOMEM;
+						goto error;
+					}
 
-				ret = parse_uint(timer_interval_content, &live_timer_interval);
-				free(timer_interval_content);
-				if (ret) {
-					ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
-					goto error;
+					ret = parse_uint(timer_interval_content, &live_timer_interval);
+					free(timer_interval_content);
+					if (ret) {
+						ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+						goto error;
+					}
 				}
-			}
-			if (!strcmp((const char *) attributes_child->name,
-				config_element_rotation_timer_interval)) {
-				/* rotation_timer_interval */
-				xmlChar *timer_interval_content =
-					xmlNodeGetContent(attributes_child);
-				if (!timer_interval_content) {
-					ret = -LTTNG_ERR_NOMEM;
-					goto error;
+				if (!strcmp((const char *) attributes_child->name,
+							config_element_rotation_timer_interval)) {
+					/* rotation_timer_interval */
+					xmlChar *timer_interval_content =
+						xmlNodeGetContent(attributes_child);
+					if (!timer_interval_content) {
+						ret = -LTTNG_ERR_NOMEM;
+						goto error;
+					}
+
+					ret = parse_uint(timer_interval_content, &rotation_timer_interval);
+					free(timer_interval_content);
+					if (ret) {
+						ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+						goto error;
+					}
 				}
+				if (!strcmp((const char *) attributes_child->name,
+							config_element_rotation_size)) {
+					/* rotation_size */
+					xmlChar *rotation_size_content =
+						xmlNodeGetContent(attributes_child);
+					if (!rotation_size_content) {
+						ret = -LTTNG_ERR_NOMEM;
+						goto error;
+					}
 
-				ret = parse_uint(timer_interval_content, &rotation_timer_interval);
-				free(timer_interval_content);
-				if (ret) {
-					ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
-					goto error;
+					ret = parse_uint(rotation_size_content, &rotation_size);
+					free(rotation_size_content);
+					if (ret) {
+						ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+						goto error;
+					}
 				}
 			}
 		}
@@ -2741,13 +2781,11 @@ domain_init_error:
 				overrides);
 	} else if (live_timer_interval &&
 		live_timer_interval != UINT64_MAX) {
-		ret = create_session((const char *) name, kernel_domain,
-				ust_domain, jul_domain, log4j_domain,
+		ret = create_session((const char *) name,
 				output_node, live_timer_interval, overrides);
 	} else {
 		/* regular session */
-		ret = create_session((const char *) name, kernel_domain,
-				ust_domain, jul_domain, log4j_domain,
+		ret = create_session((const char *) name,
 				output_node, UINT64_MAX, overrides);
 	}
 	if (ret) {
@@ -2770,7 +2808,7 @@ domain_init_error:
 		}
 	}
 
-	if (rotation_timer_interval) {
+	if (rotation_timer_interval || rotation_size) {
 		struct lttng_rotation_schedule_attr *rotation_attr = lttng_rotation_schedule_attr_create();
 
 		if (!rotation_attr) {
@@ -2783,6 +2821,7 @@ domain_init_error:
 		}
 		lttng_rotation_schedule_attr_set_timer_period(rotation_attr,
 				rotation_timer_interval);
+		lttng_rotation_schedule_attr_set_size(rotation_attr, rotation_size);
 		ret = lttng_rotation_set_schedule(rotation_attr);
 		lttng_rotation_schedule_attr_destroy(rotation_attr);
 		if (ret) {