X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_channels.c;h=e49559e4f416cb390c26549397f78449ab4c5886;hp=1878096bf511bef95c50ba45dfdae70ce8c22b66;hb=751667bdf3d5d79ca89a6dcf1a2d8155c8cfbc3c;hpb=6e2d116c6138874c0357b1afb1db5aa7cd80ceb6

diff --git a/lttng/commands/enable_channels.c b/lttng/commands/enable_channels.c
index 1878096bf..e49559e4f 100644
--- a/lttng/commands/enable_channels.c
+++ b/lttng/commands/enable_channels.c
@@ -24,6 +24,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <inttypes.h>
 
 #include "../cmd.h"
 #include "../conf.h"
@@ -49,6 +50,8 @@ enum {
 	OPT_USERSPACE,
 };
 
+static struct lttng_handle *handle;
+
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
 	{"help",           'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
@@ -59,10 +62,10 @@ static struct poptOption long_options[] = {
 	{"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
 	{"discard",        0,   POPT_ARG_NONE, 0, OPT_DISCARD, 0, 0},
 	{"overwrite",      0,   POPT_ARG_NONE, 0, OPT_OVERWRITE, 0, 0},
-	{"subbuf_size",    0,   POPT_ARG_DOUBLE, 0, OPT_SUBBUF_SIZE, 0, 0},
-	{"num_subbuf",     0,   POPT_ARG_INT, 0, OPT_NUM_SUBBUF, 0, 0},
-	{"switch_timer",   0,   POPT_ARG_INT, 0, OPT_SWITCH_TIMER, 0, 0},
-	{"read_timer",     0,   POPT_ARG_INT, 0, OPT_READ_TIMER, 0, 0},
+	{"subbuf-size",    0,   POPT_ARG_DOUBLE, 0, OPT_SUBBUF_SIZE, 0, 0},
+	{"num-subbuf",     0,   POPT_ARG_INT, 0, OPT_NUM_SUBBUF, 0, 0},
+	{"switch-timer",   0,   POPT_ARG_INT, 0, OPT_SWITCH_TIMER, 0, 0},
+	{"read-timer",     0,   POPT_ARG_INT, 0, OPT_READ_TIMER, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -83,10 +86,10 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "Channel options:\n");
 	fprintf(ofp, "      --discard            Discard event when buffers are full (default)\n");
 	fprintf(ofp, "      --overwrite          Flight recorder mode\n");
-	fprintf(ofp, "      --subbuf_size        Subbuffer size in bytes (default: 4096)\n");
-	fprintf(ofp, "      --num_subbuf         Number of subbufers (default: 2)\n");
-	fprintf(ofp, "      --switch_timer       Switch timer interval in usec (default: 0)\n");
-	fprintf(ofp, "      --read_timer         Read timer interval in usec (default: 200)\n");
+	fprintf(ofp, "      --subbuf-size        Subbuffer size in bytes (default: 4096)\n");
+	fprintf(ofp, "      --num-subbuf         Number of subbufers (default: 2)\n");
+	fprintf(ofp, "      --switch-timer       Switch timer interval in usec (default: 0)\n");
+	fprintf(ofp, "      --read-timer         Read timer interval in usec (default: 200)\n");
 	fprintf(ofp, "\n");
 }
 
@@ -95,21 +98,22 @@ static void usage(FILE *ofp)
  *
  *  Adding channel using the lttng API.
  */
-static int enable_channel(void)
+static int enable_channel(char *session_name)
 {
 	int ret = CMD_SUCCESS;
 	char *channel_name;
 	struct lttng_domain dom;
 
-	if (set_session_name(opt_session_name) < 0) {
-		ret = CMD_ERROR;
-		goto error;
-	}
-
 	if (opt_kernel) {
 		dom.type = LTTNG_DOMAIN_KERNEL;
 	}
 
+	handle = lttng_create_handle(session_name, &dom);
+	if (handle == NULL) {
+		ret = -1;
+		goto error;
+	}
+
 	/* Strip event list */
 	channel_name = strtok(opt_channels, ",");
 	while (channel_name != NULL) {
@@ -121,7 +125,7 @@ static int enable_channel(void)
 			strncpy(chan.name, channel_name, NAME_MAX);
 			chan.name[NAME_MAX - 1] = '\0';
 
-			ret = lttng_enable_channel(&dom, &chan);
+			ret = lttng_enable_channel(handle, &chan);
 			if (ret < 0) {
 				goto error;
 			} else {
@@ -137,7 +141,7 @@ static int enable_channel(void)
 			ret = CMD_NOT_IMPLEMENTED;
 			goto error;
 		} else {
-			ERR("Please specify a tracer (kernel or user-space)");
+			ERR("Please specify a tracer (--kernel or --userspace)");
 			goto error;
 		}
 
@@ -146,6 +150,8 @@ static int enable_channel(void)
 	}
 
 error:
+	lttng_destroy_handle(handle);
+
 	return ret;
 }
 
@@ -171,6 +177,7 @@ int cmd_enable_channels(int argc, const char **argv)
 {
 	int opt, ret;
 	static poptContext pc;
+	char *session_name = NULL;
 
 	init_channel_config();
 
@@ -197,11 +204,11 @@ int cmd_enable_channels(int argc, const char **argv)
 			break;
 		case OPT_SUBBUF_SIZE:
 			chan.attr.subbuf_size = atol(poptGetOptArg(pc));
-			DBG("Channel subbuf size set to %lu", chan.attr.subbuf_size);
+			DBG("Channel subbuf size set to %" PRIu64, chan.attr.subbuf_size);
 			break;
 		case OPT_NUM_SUBBUF:
 			chan.attr.num_subbuf = atoi(poptGetOptArg(pc));
-			DBG("Channel subbuf num set to %lu", chan.attr.num_subbuf);
+			DBG("Channel subbuf num set to %" PRIu64, chan.attr.num_subbuf);
 			break;
 		case OPT_SWITCH_TIMER:
 			chan.attr.switch_timer_interval = atoi(poptGetOptArg(pc));
@@ -226,7 +233,17 @@ int cmd_enable_channels(int argc, const char **argv)
 		goto end;
 	}
 
-	ret = enable_channel();
+	if (!opt_session_name) {
+		session_name = get_session_name();
+		if (session_name == NULL) {
+			ret = -1;
+			goto end;
+		}
+	} else {
+		session_name = opt_session_name;
+	}
+
+	ret = enable_channel(session_name);
 
 end:
 	return ret;