X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_context.c;h=aec2d4df70d8ef991f3d54fdfa1fd4d315ffc019;hp=ed4f87fb4e84fd11c4518fa866194d8611da6903;hb=94e60b1f03ae2c3c9450ffc3eca8e052e2c37fb4;hpb=ae8564917fa3cb3497ec17951d8ac0ee28de9c81

diff --git a/src/bin/lttng/commands/add_context.c b/src/bin/lttng/commands/add_context.c
index ed4f87fb4..aec2d4df7 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
@@ -68,6 +67,7 @@ enum context_type {
 	CONTEXT_PPID         = 8,
 	CONTEXT_VPPID        = 9,
 	CONTEXT_PTHREAD_ID   = 10,
+	CONTEXT_HOSTNAME     = 11,
 };
 
 /*
@@ -143,13 +143,7 @@ static struct poptOption long_options[] = {
 	{"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 +204,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,13 +298,16 @@ 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 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, "is added to all events and all channels.\n");
+	fprintf(ofp, "\n");
+	fprintf(ofp, "Otherwise the context is added only to the channel (-c)\n");
 	fprintf(ofp, "and/or event (-e) indicated.\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");
@@ -317,14 +315,9 @@ static void usage(FILE *ofp)
 	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");
@@ -369,6 +362,9 @@ static int add_context(char *session_name)
 	struct ctx_type *type;
 	char *ptr;
 
+	memset(&context, 0, sizeof(context));
+	memset(&dom, 0, sizeof(dom));
+
 	if (opt_kernel) {
 		dom.type = LTTNG_DOMAIN_KERNEL;
 	} else if (opt_userspace) {
@@ -387,7 +383,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;
@@ -531,6 +527,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) {