From: David Goulet <david.goulet@polymtl.ca>
Date: Wed, 30 Nov 2011 21:35:37 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre15~51
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=9fdb49d8eac3ff67f553743fb8ce0edee14c3ab6;hp=55cc08a60ad1b188d59161842e630402e738e62e

Merge branch 'master' of git://git.lttng.org/lttng-tools
---

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");