projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always print GIT_VERSION even if empty
[lttng-tools.git]
/
src
/
bin
/
lttng
/
lttng.c
diff --git
a/src/bin/lttng/lttng.c
b/src/bin/lttng/lttng.c
index c4443e7fb22c8e60d285bcb10dc1952f6e82c1a1..41232bef9e6e4a2efdc40f90ec9b70dff69ea76c 100644
(file)
--- a/
src/bin/lttng/lttng.c
+++ b/
src/bin/lttng/lttng.c
@@
-55,6
+55,7
@@
static struct option long_options[] = {
{"group", 1, NULL, 'g'},
{"verbose", 0, NULL, 'v'},
{"quiet", 0, NULL, 'q'},
{"group", 1, NULL, 'g'},
{"verbose", 0, NULL, 'v'},
{"quiet", 0, NULL, 'q'},
+ {"mi", 1, NULL, 'm'},
{"no-sessiond", 0, NULL, 'n'},
{"sessiond-path", 1, NULL, OPT_SESSION_PATH},
{"relayd-path", 1, NULL, OPT_RELAYD_PATH},
{"no-sessiond", 0, NULL, 'n'},
{"sessiond-path", 1, NULL, OPT_SESSION_PATH},
{"relayd-path", 1, NULL, OPT_RELAYD_PATH},
@@
-81,6
+82,7
@@
static struct cmd_struct commands[] = {
{ "view", cmd_view},
{ "snapshot", cmd_snapshot},
{ "save", cmd_save},
{ "view", cmd_view},
{ "snapshot", cmd_snapshot},
{ "save", cmd_save},
+ { "load", cmd_load},
{ "enable-consumer", cmd_enable_consumer}, /* OBSOLETE */
{ "disable-consumer", cmd_disable_consumer}, /* OBSOLETE */
{ NULL, NULL} /* Array closure */
{ "enable-consumer", cmd_enable_consumer}, /* OBSOLETE */
{ "disable-consumer", cmd_disable_consumer}, /* OBSOLETE */
{ NULL, NULL} /* Array closure */
@@
-88,7
+90,7
@@
static struct cmd_struct commands[] = {
static void usage(FILE *ofp)
{
static void usage(FILE *ofp)
{
- fprintf(ofp, "LTTng Trace Control " VERSION
" - " VERSION_NAME
"\n\n");
+ fprintf(ofp, "LTTng Trace Control " VERSION
" - " VERSION_NAME" - " GIT_VERSION
"\n\n");
fprintf(ofp, "usage: lttng [OPTIONS] <COMMAND> [<ARGS>]\n");
fprintf(ofp, "\n");
fprintf(ofp, "Options:\n");
fprintf(ofp, "usage: lttng [OPTIONS] <COMMAND> [<ARGS>]\n");
fprintf(ofp, "\n");
fprintf(ofp, "Options:\n");
@@
-98,6
+100,8
@@
static void usage(FILE *ofp)
fprintf(ofp, " --list-commands Simple listing of lttng commands\n");
fprintf(ofp, " -v, --verbose Increase verbosity\n");
fprintf(ofp, " -q, --quiet Quiet mode\n");
fprintf(ofp, " --list-commands Simple listing of lttng commands\n");
fprintf(ofp, " -v, --verbose Increase verbosity\n");
fprintf(ofp, " -q, --quiet Quiet mode\n");
+ fprintf(ofp, " -m, --mi TYPE Machine Interface mode.\n");
+ fprintf(ofp, " Type: xml\n");
fprintf(ofp, " -g, --group NAME Unix tracing group name. (default: tracing)\n");
fprintf(ofp, " -n, --no-sessiond Don't spawn a session daemon\n");
fprintf(ofp, " --sessiond-path PATH Session daemon full path\n");
fprintf(ofp, " -g, --group NAME Unix tracing group name. (default: tracing)\n");
fprintf(ofp, " -n, --no-sessiond Don't spawn a session daemon\n");
fprintf(ofp, " --sessiond-path PATH Session daemon full path\n");
@@
-120,6
+124,7
@@
static void usage(FILE *ofp)
fprintf(ofp, " version Show version information\n");
fprintf(ofp, " view Start trace viewer\n");
fprintf(ofp, " save Save session configuration\n");
fprintf(ofp, " version Show version information\n");
fprintf(ofp, " view Start trace viewer\n");
fprintf(ofp, " save Save session configuration\n");
+ fprintf(ofp, " load Load session configuration\n");
fprintf(ofp, "\n");
fprintf(ofp, "Each command also has its own -h, --help option.\n");
fprintf(ofp, "\n");
fprintf(ofp, "\n");
fprintf(ofp, "Each command also has its own -h, --help option.\n");
fprintf(ofp, "\n");
@@
-129,10
+134,29
@@
static void usage(FILE *ofp)
static void version(FILE *ofp)
{
static void version(FILE *ofp)
{
- fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME"\n",
+ fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME"
- " GIT_VERSION "
\n",
progname);
}
progname);
}
+/*
+ * Find the MI output type enum from a string. This function is for the support
+ * of machine interface output.
+ */
+static int mi_output_type(const char *output_type)
+{
+ int ret = 0;
+
+ if (!strncasecmp("xml", output_type, 3)) {
+ ret = LTTNG_MI_XML;
+ } else {
+ /* Invalid output format */
+ ERR("MI output format not supported");
+ ret = -LTTNG_ERR_MI_OUTPUT_TYPE;
+ }
+
+ return ret;
+}
+
/*
* list_options
*
/*
* list_options
*
@@
-424,7
+448,7
@@
static int parse_args(int argc, char **argv)
clean_exit(EXIT_FAILURE);
}
clean_exit(EXIT_FAILURE);
}
- while ((opt = getopt_long(argc, argv, "+Vhnvqg:", long_options, NULL)) != -1) {
+ while ((opt = getopt_long(argc, argv, "+Vhnvqg:
m:
", long_options, NULL)) != -1) {
switch (opt) {
case 'V':
version(stdout);
switch (opt) {
case 'V':
version(stdout);
@@
-435,11
+459,21
@@
static int parse_args(int argc, char **argv)
ret = 0;
goto end;
case 'v':
ret = 0;
goto end;
case 'v':
- lttng_opt_verbose += 1;
+ /* There is only 3 possible level of verbosity. (-vvv) */
+ if (lttng_opt_verbose < 3) {
+ lttng_opt_verbose += 1;
+ }
break;
case 'q':
lttng_opt_quiet = 1;
break;
break;
case 'q':
lttng_opt_quiet = 1;
break;
+ case 'm':
+ lttng_opt_mi = mi_output_type(optarg);
+ if (lttng_opt_mi < 0) {
+ ret = lttng_opt_mi;
+ goto error;
+ }
+ break;
case 'g':
lttng_set_tracing_group(optarg);
break;
case 'g':
lttng_set_tracing_group(optarg);
break;
This page took
0.025265 seconds
and
4
git commands to generate.