Actions
Bug #588
closedlttng-sessiond --help is missing several short program options
Start date:
07/08/2013
Due date:
% Done:
0%
Estimated time:
Description
In lttng-tools-2.2.0\src\bin\lttng-sessiond\main.c
, we have:
/* * usage function on stderr */ static void usage(void) { fprintf(stderr, "Usage: %s OPTIONS\n\nOptions:\n", progname); fprintf(stderr, " -h, --help Display this usage.\n"); ... fprintf(stderr, " --kconsumerd-err-sock PATH Specify path for the kernel consumer error socket\n"); fprintf(stderr, " --kconsumerd-cmd-sock PATH Specify path for the kernel consumer command socket\n"); fprintf(stderr, " --ustconsumerd32-err-sock PATH Specify path for the 32-bit UST consumer error socket\n"); fprintf(stderr, " --ustconsumerd64-err-sock PATH Specify path for the 64-bit UST consumer error socket\n"); fprintf(stderr, " --ustconsumerd32-cmd-sock PATH Specify path for the 32-bit UST consumer command socket\n"); fprintf(stderr, " --ustconsumerd64-cmd-sock PATH Specify path for the 64-bit UST consumer command socket\n"); fprintf(stderr, " --consumerd32-path PATH Specify path for the 32-bit UST consumer daemon binary\n"); fprintf(stderr, " --consumerd32-libdir PATH Specify path for the 32-bit UST consumer daemon libraries\n"); fprintf(stderr, " --consumerd64-path PATH Specify path for the 64-bit UST consumer daemon binary\n"); fprintf(stderr, " --consumerd64-libdir PATH Specify path for the 64-bit UST consumer daemon libraries\n"); ... fprintf(stderr, " --verbose-consumer Verbose mode for consumer. Activate DBG() macro.\n"); fprintf(stderr, " --no-kernel Disable kernel tracer\n"); } /* * daemon argument parsing */ static int parse_args(int argc, char **argv) { ... static struct option long_options[] = { { "client-sock", 1, 0, 'c' }, { "apps-sock", 1, 0, 'a' }, { "kconsumerd-cmd-sock", 1, 0, 'C' }, { "kconsumerd-err-sock", 1, 0, 'E' }, { "ustconsumerd32-cmd-sock", 1, 0, 'G' }, { "ustconsumerd32-err-sock", 1, 0, 'H' }, { "ustconsumerd64-cmd-sock", 1, 0, 'D' }, { "ustconsumerd64-err-sock", 1, 0, 'F' }, { "consumerd32-path", 1, 0, 'u' }, { "consumerd32-libdir", 1, 0, 'U' }, { "consumerd64-path", 1, 0, 't' }, { "consumerd64-libdir", 1, 0, 'T' }, { "daemonize", 0, 0, 'd' }, { "sig-parent", 0, 0, 'S' }, { "help", 0, 0, 'h' }, { "group", 1, 0, 'g' }, { "version", 0, 0, 'V' }, { "quiet", 0, 0, 'q' }, { "verbose", 0, 0, 'v' }, { "verbose-consumer", 0, 0, 'Z' }, { "no-kernel", 0, 0, 'N' }, { "pidfile", 1, 0, 'p' }, { NULL, 0, 0, 0 } };
The lines:
fprintf(stderr, " --kconsumerd-err-sock PATH Specify path for the kernel consumer error socket\n"); fprintf(stderr, " --kconsumerd-cmd-sock PATH Specify path for the kernel consumer command socket\n"); fprintf(stderr, " --ustconsumerd32-err-sock PATH Specify path for the 32-bit UST consumer error socket\n"); fprintf(stderr, " --ustconsumerd64-err-sock PATH Specify path for the 64-bit UST consumer error socket\n"); fprintf(stderr, " --ustconsumerd32-cmd-sock PATH Specify path for the 32-bit UST consumer command socket\n"); fprintf(stderr, " --ustconsumerd64-cmd-sock PATH Specify path for the 64-bit UST consumer command socket\n"); fprintf(stderr, " --consumerd32-path PATH Specify path for the 32-bit UST consumer daemon binary\n"); fprintf(stderr, " --consumerd32-libdir PATH Specify path for the 32-bit UST consumer daemon libraries\n"); fprintf(stderr, " --consumerd64-path PATH Specify path for the 64-bit UST consumer daemon binary\n"); fprintf(stderr, " --consumerd64-libdir PATH Specify path for the 64-bit UST consumer daemon libraries\n"); ... fprintf(stderr, " --verbose-consumer Verbose mode for consumer. Activate DBG() macro.\n"); fprintf(stderr, " --no-kernel Disable kernel tracer\n");
should thus become:
fprintf(stderr, " -E, --kconsumerd-err-sock PATH Specify path for the kernel consumer error socket\n"); fprintf(stderr, " -C, --kconsumerd-cmd-sock PATH Specify path for the kernel consumer command socket\n"); fprintf(stderr, " -H, --ustconsumerd32-err-sock PATH Specify path for the 32-bit UST consumer error socket\n"); fprintf(stderr, " -F, --ustconsumerd64-err-sock PATH Specify path for the 64-bit UST consumer error socket\n"); fprintf(stderr, " -G, --ustconsumerd32-cmd-sock PATH Specify path for the 32-bit UST consumer command socket\n"); fprintf(stderr, " -D, --ustconsumerd64-cmd-sock PATH Specify path for the 64-bit UST consumer command socket\n"); fprintf(stderr, " -u, --consumerd32-path PATH Specify path for the 32-bit UST consumer daemon binary\n"); fprintf(stderr, " -U, --consumerd32-libdir PATH Specify path for the 32-bit UST consumer daemon libraries\n"); fprintf(stderr, " -t, --consumerd64-path PATH Specify path for the 64-bit UST consumer daemon binary\n"); fprintf(stderr, " -T, --consumerd64-libdir PATH Specify path for the 64-bit UST consumer daemon libraries\n"); ... fprintf(stderr, " -Z, --verbose-consumer Verbose mode for consumer. Activate DBG() macro.\n"); fprintf(stderr, " -N, --no-kernel Disable kernel tracer\n");
Actions