X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_channels.c;h=194ec541eae167077597997fce467e3f10c101bd;hb=81663f073dbfb4b61c06a0ceb8ca33c4fc41b1c5;hp=b4e2942c3bb5cab0477adb3bc08cc30c33f4475d;hpb=2a1135fa25ad1fcad3b395e795aa6d41afc90c54;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c
index b4e2942c3..194ec541e 100644
--- a/src/bin/lttng/commands/enable_channels.c
+++ b/src/bin/lttng/commands/enable_channels.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
  *
- * 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
@@ -24,13 +14,14 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <inttypes.h>
-#include <assert.h>
 #include <ctype.h>
 
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/utils.h>
 #include <common/mi-lttng.h>
 
+#include <lttng/domain-internal.h>
+
 #include "../command.h"
 #include "../utils.h"
 
@@ -189,7 +180,7 @@ static int enable_channel(char *session_name)
 		}
 	} else {
 		/* Checked by the caller. */
-		assert(0);
+		abort();
 	}
 
 	set_default_attr(&dom);
@@ -230,7 +221,7 @@ static int enable_channel(char *session_name)
 
 	/* Mi open channels element */
 	if (lttng_opt_mi) {
-		assert(writer);
+		LTTNG_ASSERT(writer);
 		ret = mi_lttng_channels_open(writer);
 		if (ret) {
 			ret = CMD_ERROR;
@@ -244,7 +235,7 @@ static int enable_channel(char *session_name)
 		void *extended_ptr;
 
 		/* Validate channel name's length */
-		if (strlen(channel_name) >= NAME_MAX) {
+		if (strlen(channel_name) >= sizeof(chan_opts.name)) {
 			ERR("Channel name is too long (max. %zu characters)",
 					sizeof(chan_opts.name) - 1);
 			error = 1;
@@ -314,7 +305,8 @@ static int enable_channel(char *session_name)
 			}
 		} else {
 			MSG("%s channel %s enabled for session %s",
-					get_domain_str(dom.type), channel_name, session_name);
+					lttng_domain_type_str(dom.type),
+					channel_name, session_name);
 			success = 1;
 		}
 
@@ -434,7 +426,7 @@ int cmd_enable_channels(int argc, const char **argv)
 			}
 
 			order = get_count_order_u64(chan_opts.attr.subbuf_size);
-			assert(order >= 0);
+			LTTNG_ASSERT(order >= 0);
 			rounded_size = 1ULL << order;
 			if (rounded_size < chan_opts.attr.subbuf_size) {
 				ERR("The subbuf size (%" PRIu64 ") is rounded and overflows!",
@@ -450,7 +442,7 @@ int cmd_enable_channels(int argc, const char **argv)
 			}
 
 			/* Should now be power of 2 */
-			assert(!((chan_opts.attr.subbuf_size - 1) & chan_opts.attr.subbuf_size));
+			LTTNG_ASSERT(!((chan_opts.attr.subbuf_size - 1) & chan_opts.attr.subbuf_size));
 
 			DBG("Channel subbuf size set to %" PRIu64, chan_opts.attr.subbuf_size);
 			break;
@@ -470,7 +462,7 @@ int cmd_enable_channels(int argc, const char **argv)
 			}
 
 			order = get_count_order_u64(chan_opts.attr.num_subbuf);
-			assert(order >= 0);
+			LTTNG_ASSERT(order >= 0);
 			rounded_size = 1ULL << order;
 			if (rounded_size < chan_opts.attr.num_subbuf) {
 				ERR("The number of subbuffers (%" PRIu64 ") is rounded and overflows!",
@@ -486,7 +478,7 @@ int cmd_enable_channels(int argc, const char **argv)
 			}
 
 			/* Should now be power of 2 */
-			assert(!((chan_opts.attr.num_subbuf - 1) & chan_opts.attr.num_subbuf));
+			LTTNG_ASSERT(!((chan_opts.attr.num_subbuf - 1) & chan_opts.attr.num_subbuf));
 
 			DBG("Channel subbuf num set to %" PRIu64, chan_opts.attr.num_subbuf);
 			break;
@@ -654,7 +646,8 @@ int cmd_enable_channels(int argc, const char **argv)
 		}
 	}
 
-	ret = print_missing_or_multiple_domains(opt_kernel + opt_userspace);
+	ret = print_missing_or_multiple_domains(
+			opt_kernel + opt_userspace, false);
 	if (ret) {
 		ret = CMD_ERROR;
 		goto end;