static char *opt_channel_name;
static char *opt_kernel;
static char *opt_cmd_name;
+static char *opt_session_name;
static int opt_pid_all;
static int opt_userspace;
static pid_t opt_pid;
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
{"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
+ {"session", 's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
{"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
{"userspace", 'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, 0, OPT_USERSPACE, 0, 0},
{"all", 0, POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
fprintf(ofp, "usage: lttng add-channel NAME [options] [channel_options]\n");
fprintf(ofp, "\n");
fprintf(ofp, " -h, --help Show this help\n");
+ fprintf(ofp, " -s, --session Apply on session name\n");
fprintf(ofp, " -k, --kernel Apply on the kernel tracer\n");
fprintf(ofp, " -u, --userspace [CMD] Apply on the user-space tracer\n");
fprintf(ofp, " --all If -u, apply on all traceable apps\n");
{
int ret = CMD_SUCCESS;
- if (set_session_name() < 0) {
+ if (set_session_name(opt_session_name) < 0) {
ret = CMD_ERROR;
goto error;
}
static char *opt_event_name;
static char *opt_channel_name;
static char *opt_perf_name;
+static char *opt_session_name;
static int *opt_kernel;
static int opt_pid_all;
static int opt_userspace;
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
{"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
+ {"session", 's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
{"channel", 'c', POPT_ARG_STRING, &opt_channel_name, 0, 0, 0},
{"event", 'e', POPT_ARG_STRING, &opt_event_name, 0, 0, 0},
{"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
fprintf(ofp, "\n");
fprintf(ofp, "Options:\n");
fprintf(ofp, " -h, --help Show this help\n");
+ fprintf(ofp, " -s, --session Apply on session name\n");
fprintf(ofp, " -c, --channel NAME Apply on channel\n");
fprintf(ofp, " -e, --event NAME Apply on event\n");
fprintf(ofp, " -k, --kernel Apply for the kernel tracer\n");
int ret = CMD_SUCCESS;
struct lttng_kernel_context context;
- if (set_session_name() < 0) {
+ if (set_session_name(opt_session_name) < 0) {
ret = CMD_ERROR;
goto error;
}
static char *opt_channels;
static char *opt_kernel;
+static char *opt_session_name;
static int opt_pid_all;
static int opt_userspace;
static pid_t opt_pid;
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
{"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
+ {"session", 's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
{"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
{"userspace", 'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0},
{"all", 0, POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
fprintf(ofp, "usage: lttng disable-channel NAME[,NAME2,...] [options]\n");
fprintf(ofp, "\n");
fprintf(ofp, " -h, --help Show this help\n");
+ fprintf(ofp, " -s, --session Apply on session name\n");
fprintf(ofp, " -k, --kernel Apply for the kernel tracer\n");
fprintf(ofp, " -u, --userspace Apply for the user-space tracer\n");
fprintf(ofp, " --all If -u, apply on all traceable apps\n");
int ret = CMD_SUCCESS;
char *channel_name;
- if (set_session_name() < 0) {
+ if (set_session_name(opt_session_name) < 0) {
ret = CMD_ERROR;
goto error;
}
static char *opt_kernel;
static char *opt_cmd_name;
static char *opt_channel_name;
+static char *opt_session_name;
static int opt_pid_all;
static int opt_userspace;
static int opt_disable_all;
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
{"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
+ {"session", 's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
{"all-events", 'a', POPT_ARG_VAL, &opt_disable_all, 1, 0, 0},
{"channel", 'c', POPT_ARG_STRING, &opt_channel_name, 0, 0, 0},
{"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
fprintf(ofp, "usage: lttng disable-event NAME[,NAME2,...] [options]\n");
fprintf(ofp, "\n");
fprintf(ofp, " -h, --help Show this help\n");
+ fprintf(ofp, " -s, --session Apply on session name\n");
fprintf(ofp, " -c, --channel Apply on this channel\n");
fprintf(ofp, " -a, --all-events Enable all tracepoints\n");
fprintf(ofp, " -k, --kernel Apply for the kernel tracer\n");
char *event_name, *channel_name;
struct lttng_event ev;
- if (set_session_name() < 0) {
+ if (set_session_name(opt_session_name) < 0) {
ret = CMD_ERROR;
goto error;
}
static char *opt_channels;
static char *opt_kernel;
+static char *opt_session_name;
static int opt_pid_all;
static int opt_userspace;
static pid_t opt_pid;
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
{"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
+ {"session", 's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
{"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
{"userspace", 'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0},
{"all", 0, POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
fprintf(ofp, "usage: lttng enable-channel NAME[,NAME2,...] [options]\n");
fprintf(ofp, "\n");
fprintf(ofp, " -h, --help Show this help\n");
+ fprintf(ofp, " -s, --session Apply on session name\n");
fprintf(ofp, " -k, --kernel Apply for the kernel tracer\n");
fprintf(ofp, " -u, --userspace Apply for the user-space tracer\n");
fprintf(ofp, " --all If -u, apply on all traceable apps\n");
int ret = CMD_SUCCESS;
char *channel_name;
- if (set_session_name() < 0) {
+ if (set_session_name(opt_session_name) < 0) {
ret = CMD_ERROR;
goto error;
}
static int opt_event_type;
static char *opt_kernel;
static char *opt_cmd_name;
+static char *opt_session_name;
static int opt_pid_all;
static int opt_userspace;
static int opt_enable_all;
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
{"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
+ {"session", 's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
{"all-events", 'a', POPT_ARG_VAL, &opt_enable_all, 1, 0, 0},
{"channel", 'c', POPT_ARG_STRING, &opt_channel_name, 0, 0, 0},
{"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
fprintf(ofp, "usage: lttng enable-event NAME[,NAME2,...] [options] [event_options]\n");
fprintf(ofp, "\n");
fprintf(ofp, " -h, --help Show this help\n");
+ fprintf(ofp, " -s, --session Apply on session name\n");
fprintf(ofp, " -c, --channel Apply on this channel\n");
fprintf(ofp, " -a, --all-events Enable all tracepoints\n");
fprintf(ofp, " -k, --kernel Apply for the kernel tracer\n");
char *event_name, *channel_name;
struct lttng_event ev;
- if (set_session_name() < 0) {
+ if (set_session_name(opt_session_name) < 0) {
ret = CMD_ERROR;
goto error;
}
*
* Get session name and set it for the lttng control lib.
*/
-int set_session_name(void)
+int set_session_name(char *name)
{
int ret;
char *session_name;
- session_name = get_session_name();
- if (session_name == NULL) {
- ret = -1;
- goto error;
+ if (name != NULL) {
+ session_name = name;
+ } else {
+ session_name = get_session_name();
+ if (session_name == NULL) {
+ ret = -1;
+ goto error;
+ }
}
lttng_set_session_name(session_name);
char *get_config_file_path(void);
char *get_session_name(void);
-int set_session_name(void);
+int set_session_name(char *name);
#endif /* _LTTNG_UTILS_H */