X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=5aa0cd82b60884782e7a60644c0715e9b8e10176;hp=7c95a0d2194d4e6de2e43e726b98ee05fcb2d2cd;hb=92816cc33a1add3c8276839bd6335e17423577dd;hpb=bdf640139afb02572eb23f014e4a61ad68fdfeb1

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index 7c95a0d21..5aa0cd82b 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -31,6 +31,7 @@
 #include "ust-ctl.h"
 #include "utils.h"
 #include "ust-app.h"
+#include "agent.h"
 
 /*
  * Return allocated channel attributes.
@@ -40,6 +41,7 @@ struct lttng_channel *channel_new_default_attr(int dom,
 {
 	struct lttng_channel *chan;
 	const char *channel_name = DEFAULT_CHANNEL_NAME;
+	struct lttng_channel_extended *extended_attr = NULL;
 
 	chan = zmalloc(sizeof(struct lttng_channel));
 	if (chan == NULL) {
@@ -47,6 +49,14 @@ struct lttng_channel *channel_new_default_attr(int dom,
 		goto error_alloc;
 	}
 
+	extended_attr = zmalloc(sizeof(struct lttng_channel_extended));
+	if (!extended_attr) {
+		PERROR("zmalloc channel extended init");
+		goto error;
+	}
+
+	chan->attr.extended.ptr = extended_attr;
+
 	/* Same for all domains. */
 	chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
 	chan->attr.tracefile_size = DEFAULT_CHANNEL_TRACEFILE_SIZE;
@@ -62,6 +72,9 @@ struct lttng_channel *channel_new_default_attr(int dom,
 		chan->attr.switch_timer_interval = DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER;
 		chan->attr.read_timer_interval = DEFAULT_KERNEL_CHANNEL_READ_TIMER;
 		chan->attr.live_timer_interval = DEFAULT_KERNEL_CHANNEL_LIVE_TIMER;
+		extended_attr->blocking_timeout = DEFAULT_KERNEL_CHANNEL_BLOCKING_TIMEOUT;
+		extended_attr->monitor_timer_interval =
+			DEFAULT_KERNEL_CHANNEL_MONITOR_TIMER;
 		break;
 	case LTTNG_DOMAIN_JUL:
 		channel_name = DEFAULT_JUL_CHANNEL_NAME;
@@ -85,6 +98,9 @@ common_ust:
 				DEFAULT_UST_UID_CHANNEL_READ_TIMER;
 			chan->attr.live_timer_interval =
 				DEFAULT_UST_UID_CHANNEL_LIVE_TIMER;
+			extended_attr->blocking_timeout = DEFAULT_UST_UID_CHANNEL_BLOCKING_TIMEOUT;
+			extended_attr->monitor_timer_interval =
+				DEFAULT_UST_UID_CHANNEL_MONITOR_TIMER;
 			break;
 		case LTTNG_BUFFER_PER_PID:
 		default:
@@ -96,7 +112,10 @@ common_ust:
 			chan->attr.read_timer_interval =
 				DEFAULT_UST_PID_CHANNEL_READ_TIMER;
 			chan->attr.live_timer_interval =
-				DEFAULT_UST_UID_CHANNEL_LIVE_TIMER;
+				DEFAULT_UST_PID_CHANNEL_LIVE_TIMER;
+			extended_attr->blocking_timeout = DEFAULT_UST_PID_CHANNEL_BLOCKING_TIMEOUT;
+			extended_attr->monitor_timer_interval =
+				DEFAULT_UST_PID_CHANNEL_MONITOR_TIMER;
 			break;
 		}
 		break;
@@ -112,11 +131,21 @@ common_ust:
 	return chan;
 
 error:
+	free(extended_attr);
 	free(chan);
 error_alloc:
 	return NULL;
 }
 
+void channel_attr_destroy(struct lttng_channel *channel)
+{
+	if (!channel) {
+		return;
+	}
+	free(channel->attr.extended.ptr);
+	free(channel);
+}
+
 /*
  * Disable kernel channel of the kernel session.
  */
@@ -178,6 +207,28 @@ error:
 	return ret;
 }
 
+static int channel_validate(struct lttng_channel *attr)
+{
+	/*
+	 * The ringbuffer (both in user space and kernel) behaves badly
+	 * in overwrite mode and with less than 2 subbuffers so block it
+	 * right away and send back an invalid attribute error.
+	 */
+	if (attr->attr.overwrite && attr->attr.num_subbuf < 2) {
+		return -1;
+	}
+	return 0;
+}
+
+static int channel_validate_kernel(struct lttng_channel *attr)
+{
+	/* Kernel channels do not support blocking timeout. */
+	if (((struct lttng_channel_extended *)attr->attr.extended.ptr)->blocking_timeout) {
+		return -1;
+	}
+	return 0;
+}
+
 /*
  * Create kernel channel of the kernel session and notify kernel thread.
  */
@@ -200,12 +251,30 @@ int channel_kernel_create(struct ltt_kernel_session *ksession,
 		attr = defattr;
 	}
 
+	/*
+	 * Set the overwrite mode for this channel based on the session
+	 * type unless the client explicitly overrides the channel mode.
+	 */
+	if (attr->attr.overwrite == DEFAULT_CHANNEL_OVERWRITE) {
+		attr->attr.overwrite = !!ksession->snapshot_mode;
+	}
+
+	/* Enforce mmap output for snapshot sessions. */
 	if (ksession->snapshot_mode) {
-		/* Force channel attribute for snapshot mode. */
-		attr->attr.overwrite = 1;
 		attr->attr.output = LTTNG_EVENT_MMAP;
 	}
 
+	/* Validate common channel properties. */
+	if (channel_validate(attr) < 0) {
+		ret = LTTNG_ERR_INVALID;
+		goto error;
+	}
+
+	if (channel_validate_kernel(attr) < 0) {
+		ret = LTTNG_ERR_INVALID;
+		goto error;
+	}
+
 	/* Channel not found, creating it */
 	ret = kernel_create_channel(ksession, attr);
 	if (ret < 0) {
@@ -222,7 +291,7 @@ int channel_kernel_create(struct ltt_kernel_session *ksession,
 
 	ret = LTTNG_OK;
 error:
-	free(defattr);
+	channel_attr_destroy(defattr);
 	return ret;
 }
 
@@ -272,6 +341,7 @@ int channel_ust_create(struct ltt_ust_session *usess,
 	int ret = LTTNG_OK;
 	struct ltt_ust_channel *uchan = NULL;
 	struct lttng_channel *defattr = NULL;
+	enum lttng_domain_type domain = LTTNG_DOMAIN_UST;
 
 	assert(usess);
 
@@ -283,14 +353,39 @@ int channel_ust_create(struct ltt_ust_session *usess,
 			goto error;
 		}
 		attr = defattr;
+	} else {
+		/*
+		 * HACK: Set the channel's subdomain (JUL, Log4j, Python, etc.)
+		 * based on the default name.
+		 */
+		if (!strcmp(attr->name, DEFAULT_JUL_CHANNEL_NAME)) {
+			domain = LTTNG_DOMAIN_JUL;
+		} else if (!strcmp(attr->name, DEFAULT_LOG4J_CHANNEL_NAME)) {
+			domain = LTTNG_DOMAIN_LOG4J;
+		} else if (!strcmp(attr->name, DEFAULT_PYTHON_CHANNEL_NAME)) {
+			domain = LTTNG_DOMAIN_PYTHON;
+		}
+	}
+
+	/*
+	 * Set the overwrite mode for this channel based on the session
+	 * type unless the client explicitly overrides the channel mode.
+	 */
+	if (attr->attr.overwrite == DEFAULT_CHANNEL_OVERWRITE) {
+		attr->attr.overwrite = !!usess->snapshot_mode;
 	}
 
+	/* Enforce mmap output for snapshot sessions. */
 	if (usess->snapshot_mode) {
-		/* Force channel attribute for snapshot mode. */
-		attr->attr.overwrite = 1;
 		attr->attr.output = LTTNG_EVENT_MMAP;
 	}
 
+	/* Validate common channel properties. */
+	if (channel_validate(attr) < 0) {
+		ret = LTTNG_ERR_INVALID;
+		goto error;
+	}
+
 	/*
 	 * Validate UST buffer size and number of buffers: must both be power of 2
 	 * and nonzero. We validate right here for UST, because applications will
@@ -343,24 +438,12 @@ int channel_ust_create(struct ltt_ust_session *usess,
 	}
 
 	/* Create UST channel */
-	uchan = trace_ust_create_channel(attr, LTTNG_DOMAIN_UST);
+	uchan = trace_ust_create_channel(attr, domain);
 	if (uchan == NULL) {
 		ret = LTTNG_ERR_FATAL;
 		goto error;
 	}
 
-	/*
-	 * HACK: Set the channel's subdomain (JUL, Log4j, Python, etc.)
-	 * based on the default name.
-	 */
-	if (!strcmp(uchan->name, DEFAULT_JUL_CHANNEL_NAME)) {
-		uchan->domain = LTTNG_DOMAIN_JUL;
-	} else if (!strcmp(uchan->name, DEFAULT_LOG4J_CHANNEL_NAME)) {
-		uchan->domain = LTTNG_DOMAIN_LOG4J;
-	} else if (!strcmp(uchan->name, DEFAULT_PYTHON_CHANNEL_NAME)) {
-		uchan->domain = LTTNG_DOMAIN_PYTHON;
-	}
-
 	uchan->enabled = 1;
 	if (trace_ust_is_max_id(usess->used_channel_id)) {
 		ret = LTTNG_ERR_UST_CHAN_FAIL;
@@ -405,8 +488,20 @@ int channel_ust_create(struct ltt_ust_session *usess,
 	rcu_read_unlock();
 
 	DBG2("Channel %s created successfully", uchan->name);
+	if (domain != LTTNG_DOMAIN_UST) {
+		struct agent *agt = trace_ust_find_agent(usess, domain);
+
+		if (!agt) {
+			agt = agent_create(domain);
+			if (!agt) {
+				ret = LTTNG_ERR_NOMEM;
+				goto error_free_chan;
+			}
+			agent_add(agt, usess->agents);
+		}
+	}
 
-	free(defattr);
+	channel_attr_destroy(defattr);
 	return LTTNG_OK;
 
 error_free_chan:
@@ -416,7 +511,7 @@ error_free_chan:
 	 */
 	trace_ust_destroy_channel(uchan);
 error:
-	free(defattr);
+	channel_attr_destroy(defattr);
 	return ret;
 }