From 3087ef18ecb79a3fcef9c8bb8a3e9dc1ea228ff0 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Thu, 30 Jun 2011 17:20:06 -0400 Subject: [PATCH] Add set session command to lttng cli This command change the session name in the config file of the config directory (.lttng). Signed-off-by: David Goulet --- lttng/Makefile.am | 2 +- lttng/cmd.h | 1 + lttng/commands/set_session.c | 133 +++++++++++++++++++++++++++++++++++ lttng/lttng.c | 2 + 4 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 lttng/commands/set_session.c diff --git a/lttng/Makefile.am b/lttng/Makefile.am index 159d81728..6aefbae31 100644 --- a/lttng/Makefile.am +++ b/lttng/Makefile.am @@ -7,7 +7,7 @@ lttng_SOURCES = conf.c commands/start.c commands/add_channel.c \ commands/stop.c commands/enable_events.c \ commands/disable_events.c commands/enable_channels.c \ commands/disable_channels.c commands/add_context.c \ - utils.c lttng.c + commands/set_session.c utils.c lttng.c lttng_LDADD = \ $(top_builddir)/liblttngctl/liblttngctl.la diff --git a/lttng/cmd.h b/lttng/cmd.h index a59a7f5aa..e882be245 100644 --- a/lttng/cmd.h +++ b/lttng/cmd.h @@ -48,5 +48,6 @@ extern int cmd_disable_events(int argc, const char **argv); extern int cmd_enable_channels(int argc, const char **argv); extern int cmd_disable_channels(int argc, const char **argv); extern int cmd_add_context(int argc, const char **argv); +extern int cmd_set_session(int argc, const char **argv); #endif /* _LTTNG_CMD_H */ diff --git a/lttng/commands/set_session.c b/lttng/commands/set_session.c new file mode 100644 index 000000000..f89545fd4 --- /dev/null +++ b/lttng/commands/set_session.c @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2011 - David Goulet + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include + +#include "cmd.h" +#include "conf.h" +#include "utils.h" + +static char *opt_session_name; + +enum { + OPT_HELP = 1, +}; + +static struct poptOption long_options[] = { + /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ + {"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0}, + {0, 0, 0, 0, 0, 0, 0} +}; + +/* + * usage + */ +static void usage(FILE *ofp) +{ + fprintf(ofp, "usage: lttng set-session NAME\n"); + fprintf(ofp, "\n"); + fprintf(ofp, "Options:\n"); + fprintf(ofp, " -h, --help Show this help\n"); + fprintf(ofp, "\n"); +} + +/* + * set_session + */ +static int set_session(void) +{ + int ret = CMD_SUCCESS; + char *path, *alloc_path; + + alloc_path = config_get_default_path(); + if (alloc_path == NULL) { + ERR("Unable to find config directory"); + ret = CMD_ERROR; + goto error; + } + + path = config_generate_dir_path(alloc_path); + if (path == NULL) { + ret = CMD_FATAL; + goto error; + } + + ret = config_init(path); + if (ret < 0) { + ERR("Init config directory and file failed"); + ret = CMD_ERROR; + goto error; + } + + ret = config_add_session_name(path, opt_session_name); + if (ret < 0) { + ERR("Unable to add session name to config"); + ret = CMD_ERROR; + goto error; + } + + MSG("Session set to %s", opt_session_name); + ret = CMD_SUCCESS; + +error: + return ret; +} + +/* + * cmd_set_session + */ +int cmd_set_session(int argc, const char **argv) +{ + int opt, ret = CMD_SUCCESS; + static poptContext pc; + + pc = poptGetContext(NULL, argc, argv, long_options, 0); + poptReadDefaultConfig(pc, 0); + + while ((opt = poptGetNextOpt(pc)) != -1) { + switch (opt) { + case OPT_HELP: + usage(stderr); + ret = CMD_SUCCESS; + goto end; + default: + usage(stderr); + ret = CMD_UNDEFINED; + goto end; + } + } + + opt_session_name = (char *) poptGetArg(pc); + if (opt_session_name == NULL) { + ERR("Missing session name"); + usage(stderr); + goto end; + } + + ret = set_session(); + +end: + return ret; +} diff --git a/lttng/lttng.c b/lttng/lttng.c index d32f563dd..e1b52c848 100644 --- a/lttng/lttng.c +++ b/lttng/lttng.c @@ -67,6 +67,7 @@ static struct cmd_struct commands[] = { { "enable-channel", cmd_enable_channels}, { "disable-channel", cmd_disable_channels}, { "add-context", cmd_add_context}, + { "set-session", cmd_set_session}, { NULL, NULL} /* Array closure */ }; @@ -93,6 +94,7 @@ static void usage(FILE *ofp) fprintf(ofp, " disable-channel Disable tracing channel\n"); fprintf(ofp, " disable-event Disable tracing event\n"); fprintf(ofp, " list List possible tracing options\n"); + fprintf(ofp, " set-session Set current session name\n"); fprintf(ofp, " start Start tracing\n"); fprintf(ofp, " stop Stop tracing\n"); fprintf(ofp, " version Show version information\n"); -- 2.34.1