From b213d387af126945209442b161ab438401cb4f34 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 30 Nov 2011 15:39:11 -0500 Subject: [PATCH] Remove function:entry option to discourage its use Removed from kernel tracer. Signed-off-by: Mathieu Desnoyers --- lttng/commands/calibrate.c | 8 ++++++++ lttng/commands/enable_events.c | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/lttng/commands/calibrate.c b/lttng/commands/calibrate.c index 1219685e7..3fa87e3ec 100644 --- a/lttng/commands/calibrate.c +++ b/lttng/commands/calibrate.c @@ -63,7 +63,13 @@ static struct poptOption long_options[] = { {"marker", 0, POPT_ARG_NONE, 0, OPT_MARKER, 0, 0}, {"probe", 0, POPT_ARG_NONE, 0, OPT_PROBE, 0, 0}, {"function", 0, POPT_ARG_NONE, 0, OPT_FUNCTION, 0, 0}, +#if 0 + /* + * Removed from options to discourage its use. Not in kernel + * tracer anymore. + */ {"function:entry", 0, POPT_ARG_NONE, 0, OPT_FUNCTION_ENTRY, 0, 0}, +#endif {"syscall", 0, POPT_ARG_NONE, 0, OPT_SYSCALL, 0, 0}, {0, 0, 0, 0, 0, 0, 0} }; @@ -87,8 +93,10 @@ static void usage(FILE *ofp) fprintf(ofp, " Dynamic probe.\n"); fprintf(ofp, " --function\n"); fprintf(ofp, " Dynamic function entry/return probe.\n"); +#if 0 fprintf(ofp, " --function:entry symbol\n"); fprintf(ofp, " Function tracer event\n"); +#endif fprintf(ofp, " --syscall System call eventl\n"); fprintf(ofp, " --marker User-space marker (deprecated)\n"); fprintf(ofp, "\n"); diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c index dd1a04928..123278bc0 100644 --- a/lttng/commands/enable_events.c +++ b/lttng/commands/enable_events.c @@ -72,7 +72,13 @@ static struct poptOption long_options[] = { {"marker", 0, POPT_ARG_NONE, 0, OPT_MARKER, 0, 0}, {"probe", 0, POPT_ARG_STRING, &opt_probe, OPT_PROBE, 0, 0}, {"function", 0, POPT_ARG_STRING, &opt_function, OPT_FUNCTION, 0, 0}, +#if 0 + /* + * Currently removed from lttng kernel tracer. Removed from + * lttng UI to discourage its use. + */ {"function:entry", 0, POPT_ARG_STRING, &opt_function_entry_symbol, OPT_FUNCTION_ENTRY, 0, 0}, +#endif {"syscall", 0, POPT_ARG_NONE, 0, OPT_SYSCALL, 0, 0}, {0, 0, 0, 0, 0, 0, 0} }; @@ -103,8 +109,10 @@ static void usage(FILE *ofp) fprintf(ofp, " Dynamic function entry/return probe.\n"); fprintf(ofp, " Addr and offset can be octal (0NNN...),\n"); fprintf(ofp, " decimal (NNN...) or hexadecimal (0xNNN...)\n"); +#if 0 fprintf(ofp, " --function:entry symbol\n"); fprintf(ofp, " Function tracer event\n"); +#endif fprintf(ofp, " --syscall System call event\n"); fprintf(ofp, " --marker User-space marker (deprecated)\n"); fprintf(ofp, "\n"); -- 2.34.1