[lttng-dev] [PATCH] lttng-tools commands/add_context.c: Improve usage()

[David Goulet]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I've merged the last four patches together! :)

Thanks!
David

On 12-01-25 04:53 PM, Thibault, Daniel wrote:
> ------------------------------
> From c8fc3f05c3a2d6124cabac0d531af22c1fec78be Wed, 25 Jan 2012 16:50:54 -0500
> From: Daniel U. Thibault <daniel.thibault at drdc-rddc.gc.ca>
> Date: Wed, 25 Jan 2012 16:50:39 -0500
> Subject: [PATCH] lttng-tools commands/add_context.c: Improve usage()
> 
> diff --git a/src/bin/lttng/commands/add_context.c b/src/bin/lttng/commands/add_context.c
> index 82abc73..075b270 100644
> --- a/src/bin/lttng/commands/add_context.c
> +++ b/src/bin/lttng/commands/add_context.c
> @@ -303,33 +303,35 @@
>  {
>  	fprintf(ofp, "usage: lttng add-context -t TYPE\n");
>  	fprintf(ofp, "\n");
> -	fprintf(ofp, "If no event name is given (-e), the context will be added to the channel\n");
>  	fprintf(ofp, "If no channel and no event is given (-c/-e), the context\n");
>  	fprintf(ofp, "will be added to all events and all channels.\n");
> +	fprintf(ofp, "Otherwise the context will be added only to the channel (-c)\n");
> +	fprintf(ofp, "and/or event (-e) indicated.\n");
>  	fprintf(ofp, "\n");
>  	fprintf(ofp, "Options:\n");
>  	fprintf(ofp, "  -h, --help               Show this help\n");
>  	fprintf(ofp, "      --list-options       Simple listing of options\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");
> +	fprintf(ofp, "  -s, --session NAME       Apply to the session NAME\n");
> +	fprintf(ofp, "  -c, --channel NAME       Apply to the channel NAME\n");
> +	fprintf(ofp, "  -e, --event NAME         Apply to the event NAME\n");
> +	fprintf(ofp, "  -k, --kernel             Apply to the kernel tracer\n");
>  #if 0
> -	fprintf(ofp, "  -u, --userspace [CMD]    Apply for the user-space tracer\n");
> +	fprintf(ofp, "  -u, --userspace [CMD]    Apply to the user-space tracer\n");
>  	fprintf(ofp, "                           If no CMD, the domain used is UST global\n");
> -	fprintf(ofp, "                           or else the domain is UST EXEC_NAME\n");
> +	fprintf(ofp, "                           otherwise the domain is UST EXEC_NAME\n");
>  	fprintf(ofp, "  -p, --pid PID            If -u, apply to specific PID (domain: UST PID)\n");
>  #else
> -	fprintf(ofp, "  -u, --userspace          Apply for the user-space tracer\n");
> +	fprintf(ofp, "  -u, --userspace          Apply to the user-space tracer\n");
>  #endif
> -	fprintf(ofp, "  -t, --type TYPE          Context type. You can repeat that option on\n");
> -	fprintf(ofp, "                           the command line.\n");
> +	fprintf(ofp, "                           (--kernel preempts --userspace)\n");
> +	fprintf(ofp, "  -t, --type TYPE          Context type. You can repeat that option on the\n");
> +	fprintf(ofp, "                           command line to specify multiple contexts at once.\n");
>  	fprintf(ofp, "                           TYPE can be one of the strings below:\n");
>  	print_ctx_type(ofp);
>  	fprintf(ofp, "\n");
>  	fprintf(ofp, "Example:\n");
>  	fprintf(ofp, "This command will add the context information 'prio' and two perf\n"
> -			"counters: hardware branch misses and cache misses, to all events\n"
> +			"counters (hardware branch misses and cache misses), to all events\n"
>  			"in the trace data output:\n");
>  	fprintf(ofp, "# lttng add-context -k -t prio -t perf:branch-misses -t perf:cache-misses\n");
>  	fprintf(ofp, "\n");
> ------------------------------
> 
> Daniel U. Thibault
> R & D pour la défense Canada - Valcartier (RDDC Valcartier) / Defence R&D Canada - Valcartier (DRDC Valcartier)
> Système de systèmes (SdS) / System of Systems (SoS)
> Solutions informatiques et expérimentations (SIE) / Computing Solutions and Experimentations (CSE)
> 2459 Boul. Pie XI Nord
> Québec, QC  G3J 1X5
> CANADA
> Vox : (418) 844-4000 x4245
> Fax : (418) 844-4538
> NAC: 918V QSDJ
> Gouvernement du Canada / Government of Canada
> <http://www.valcartier.drdc-rddc.gc.ca/>
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
> 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQEcBAEBAgAGBQJPIsvNAAoJEELoaioR9I02N/MH/3DYE6PWKx5spl4A4rTgeZP6
QO9NZXejzeOCwLExEc1Qq51uPb1slv5x5TWPntHh2rSflG6Rmi4ix+PreLunvSCL
MjcsYSvUGld0vYUdQrJv1bs4Z6x09cOLbLOis4DU/iY0RMHHv4ArUcCOvbegKefI
txlmfdXvZN2QA6ikTpnC3jipuCMDZUPppuydRAzGlKK2kcxZdQQIxjHxKXGg5cp4
BN0NCl1nn21Q5SUMtrZNAAZkIdfVGdyqN3JH5BFbWxlWvurZIc2QVB64RmKMNEnQ
FRQ/FbhqYGabLK/QcD/vUAPlJDy2Y8/fRf2HHCNNQ1eCZ8FVUrm+bQD1Qq5sBFs=
=+y4J
-----END PGP SIGNATURE-----