X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_context.c;h=45357598362ac9c0fb1c2f031609c0c79fd4ea2b;hp=e499ef3d37894eb3aababec3d4ad59c18abbd964;hb=601d5acf42ebdb05ff8aa19f12fd9bdad3602781;hpb=441c16a7f0bbab56a5e783059d0cddab68544a9a

diff --git a/src/bin/lttng/commands/add_context.c b/src/bin/lttng/commands/add_context.c
index e499ef3d3..453575983 100644
--- a/src/bin/lttng/commands/add_context.c
+++ b/src/bin/lttng/commands/add_context.c
@@ -1,19 +1,18 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -32,7 +31,6 @@
 
 #define PRINT_LINE_LEN	80
 
-static char *opt_event_name;
 static char *opt_channel_name;
 static char *opt_session_name;
 static int opt_kernel;
@@ -68,6 +66,7 @@ enum context_type {
 	CONTEXT_PPID         = 8,
 	CONTEXT_VPPID        = 9,
 	CONTEXT_PTHREAD_ID   = 10,
+	CONTEXT_HOSTNAME     = 11,
 };
 
 /*
@@ -141,15 +140,8 @@ static struct poptOption long_options[] = {
 	{"help",           'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
 	{"session",        's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
 	{"channel",        'c', POPT_ARG_STRING, &opt_channel_name, 0, 0, 0},
-	{"event",          'e', POPT_ARG_STRING, &opt_event_name, 0, 0, 0},
 	{"kernel",         'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
-#if 0
-	/* Not implemented yet */
-	{"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
-	{"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
-#else
 	{"userspace",      'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0},
-#endif
 	{"type",           't', POPT_ARG_STRING, &opt_type, OPT_TYPE, 0, 0},
 	{"list-options",   0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
 	{0, 0, 0, 0, 0, 0, 0}
@@ -210,6 +202,7 @@ const struct ctx_opts {
 	{ "vtid", CONTEXT_VTID },
 	{ "ppid", CONTEXT_PPID },
 	{ "vppid", CONTEXT_VPPID },
+	{ "hostname", CONTEXT_HOSTNAME },
 	/* Perf options */
 	PERF_HW(cpu-cycles, CPU_CYCLES),
 	PERF_HW(cycles, CPU_CYCLES),
@@ -303,28 +296,24 @@ static void print_ctx_type(FILE *ofp)
  */
 static void usage(FILE *ofp)
 {
-	fprintf(ofp, "usage: lttng add-context -t TYPE\n");
+	fprintf(ofp, "usage: lttng add-context -t TYPE [-k|-u] [OPTIONS]\n");
+	fprintf(ofp, "\n");
+	fprintf(ofp, "If no channel is given (-c), the context is added to\n");
+	fprintf(ofp, "all channels.\n");
 	fprintf(ofp, "\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, "Otherwise the context is added only to the channel (-c).\n");
+	fprintf(ofp, "\n");
+	fprintf(ofp, "Exactly one domain (-k or -u) must be specified.\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 NAME       Apply to session name\n");
 	fprintf(ofp, "  -c, --channel NAME       Apply to channel\n");
-	fprintf(ofp, "  -e, --event NAME         Apply to event\n");
 	fprintf(ofp, "  -k, --kernel             Apply to the kernel tracer\n");
-#if 0
-	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, "                           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 to the user-space tracer\n");
-#endif
+	fprintf(ofp, "\n");
+	fprintf(ofp, "Context:\n");
 	fprintf(ofp, "  -t, --type TYPE          Context type. You can repeat that option on\n");
 	fprintf(ofp, "                           the command line to specify multiple contexts at once.\n");
 	fprintf(ofp, "                           (--kernel preempts --userspace)\n");
@@ -333,7 +322,7 @@ static void usage(FILE *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 channels\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");
@@ -390,7 +379,7 @@ static int add_context(char *session_name)
 
 	/* Iterate over all the context types given */
 	cds_list_for_each_entry(type, &ctx_type_list.head, list) {
-		context.ctx = type->opt->ctx_type;
+		context.ctx = (enum lttng_event_context_type) type->opt->ctx_type;
 		if (context.ctx == LTTNG_EVENT_CONTEXT_PERF_COUNTER) {
 			context.u.perf_counter.type = type->opt->u.perf.type;
 			context.u.perf_counter.config = type->opt->u.perf.config;
@@ -405,25 +394,16 @@ static int add_context(char *session_name)
 		}
 		DBG("Adding context...");
 
-		ret = lttng_add_context(handle, &context, opt_event_name,
-				opt_channel_name);
+		ret = lttng_add_context(handle, &context, NULL, opt_channel_name);
 		if (ret < 0) {
 			ERR("%s: %s", type->opt->symbol, lttng_strerror(ret));
 			warn = 1;
 			continue;
 		} else {
-			if (opt_channel_name && opt_event_name) {
-				MSG("%s context %s added to event %s channel %s",
-						opt_kernel ? "kernel" : "UST", type->opt->symbol,
-						opt_channel_name, opt_event_name);
-			} else if (opt_channel_name && !opt_event_name) {
+			if (opt_channel_name) {
 				MSG("%s context %s added to channel %s",
 						opt_kernel ? "kernel" : "UST", type->opt->symbol,
 						opt_channel_name);
-			} else if (!opt_channel_name && opt_event_name) {
-				MSG("%s context %s added to event %s",
-						opt_kernel ? "kernel" : "UST", type->opt->symbol,
-						opt_event_name);
 			} else {
 				MSG("%s context %s added to all channels",
 						opt_kernel ? "kernel" : "UST", type->opt->symbol)
@@ -534,6 +514,10 @@ int cmd_add_context(int argc, const char **argv)
 
 	ret = add_context(session_name);
 
+	if (!opt_session_name) {
+		free(session_name);
+	}
+
 end:
 	/* Cleanup allocated memory */
 	cds_list_for_each_entry_safe(type, tmptype, &ctx_type_list.head, list) {