X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=a2009bae235809b1956106b73cfa959d43b2d7e6;hb=73535baf93cafc2a3e56a4e713e342ab7325f8dd;hp=b270a43ca3a29118a1218c6d32308ec1496fdef0;hpb=54213acc35b30fa5e95dd275c31cfb584d4e4abf;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index b270a43ca..a2009bae2 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- * Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2011 EfficiOS Inc.
+ * Copyright (C) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -28,7 +18,8 @@
 #include "channel.h"
 #include "lttng-sessiond.h"
 #include "kernel.h"
-#include "ust-ctl.h"
+#include "lttng-ust-ctl.h"
+#include "lttng-ust-error.h"
 #include "utils.h"
 #include "ust-app.h"
 #include "agent.h"
@@ -406,7 +397,7 @@ int channel_ust_create(struct ltt_ust_session *usess,
 	/*
 	 * Invalid subbuffer size if it's lower then the page size.
 	 */
-	if (attr->attr.subbuf_size < page_size) {
+	if (attr->attr.subbuf_size < the_page_size) {
 		ret = LTTNG_ERR_INVALID;
 		goto error;
 	}
@@ -470,15 +461,6 @@ int channel_ust_create(struct ltt_ust_session *usess,
 		goto error_free_chan;
 	}
 
-	if (usess->active) {
-		/* Enable channel for global domain */
-		ret = ust_app_create_channel_glb(usess, uchan);
-		if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) {
-			ret = LTTNG_ERR_UST_CHAN_FAIL;
-			goto error_free_chan;
-		}
-	}
-
 	/* Adding the channel to the channel hash table. */
 	rcu_read_lock();
 	if (strncmp(uchan->name, DEFAULT_METADATA_NAME,
@@ -540,6 +522,13 @@ int channel_ust_disable(struct ltt_ust_session *usess,
 		DBG2("Channel UST %s already disabled", uchan->name);
 		goto end;
 	}
+
+	uchan->enabled = 0;
+
+	/*
+	 * If session is inactive we don't notify the tracer right away. We
+	 * wait for the next synchronization.
+	 */
 	if (!usess->active) {
 		goto end;
 	}
@@ -552,8 +541,6 @@ int channel_ust_disable(struct ltt_ust_session *usess,
 		goto error;
 	}
 
-	uchan->enabled = 0;
-
 	DBG2("Channel %s disabled successfully", uchan->name);
 
 	return LTTNG_OK;
@@ -562,3 +549,57 @@ end:
 error:
 	return ret;
 }
+
+struct lttng_channel *trace_ust_channel_to_lttng_channel(
+		const struct ltt_ust_channel *uchan)
+{
+	struct lttng_channel *channel = NULL, *ret = NULL;
+
+	channel = lttng_channel_create_internal();
+	if (!channel) {
+		ERR("Failed to create lttng_channel during conversion from ltt_ust_channel to lttng_channel");
+		goto end;
+	}
+
+	if (lttng_strncpy(channel->name, uchan->name, LTTNG_SYMBOL_NAME_LEN)) {
+		ERR("Failed to set channel name during conversion from ltt_ust_channel to lttng_channel");
+		goto end;
+	}
+
+	channel->attr.overwrite = uchan->attr.overwrite;
+	channel->attr.subbuf_size = uchan->attr.subbuf_size;
+	channel->attr.num_subbuf = uchan->attr.num_subbuf;
+	channel->attr.switch_timer_interval = uchan->attr.switch_timer_interval;
+	channel->attr.read_timer_interval = uchan->attr.read_timer_interval;
+	channel->enabled = uchan->enabled;
+	channel->attr.tracefile_size = uchan->tracefile_size;
+	channel->attr.tracefile_count = uchan->tracefile_count;
+
+	/*
+	 * Map enum lttng_ust_output to enum lttng_event_output.
+	 */
+	switch (uchan->attr.output) {
+	case LTTNG_UST_ABI_MMAP:
+		channel->attr.output = LTTNG_EVENT_MMAP;
+		break;
+	default:
+		/*
+		 * LTTNG_UST_MMAP is the only supported UST
+		 * output mode.
+		 */
+		abort();
+		break;
+	}
+
+	lttng_channel_set_blocking_timeout(
+			channel, uchan->attr.u.s.blocking_timeout);
+	lttng_channel_set_monitor_timer_interval(
+			channel, uchan->monitor_timer_interval);
+
+	ret = channel;
+	channel = NULL;
+
+end:
+	lttng_channel_destroy(channel);
+	return ret;
+}