X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_context.c;h=6483c9891d83038e929b3a1b96fd3f5cd6ab07c4;hp=b580d037b9924dfbbea909c9561ab7587ed4b3f1;hb=f263b7fd113e51d0737554e8232b8669e142a260;hpb=32a6298d8929c91842c9a5c09f1a3f4660c32eec

diff --git a/src/bin/lttng/commands/add_context.c b/src/bin/lttng/commands/add_context.c
index b580d037b..6483c9891 100644
--- a/src/bin/lttng/commands/add_context.c
+++ b/src/bin/lttng/commands/add_context.c
@@ -31,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;
@@ -67,6 +66,8 @@ enum context_type {
 	CONTEXT_PPID         = 8,
 	CONTEXT_VPPID        = 9,
 	CONTEXT_PTHREAD_ID   = 10,
+	CONTEXT_HOSTNAME     = 11,
+	CONTEXT_IP           = 12,
 };
 
 /*
@@ -140,7 +141,6 @@ 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},
 	{"userspace",      'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0},
 	{"type",           't', POPT_ARG_STRING, &opt_type, OPT_TYPE, 0, 0},
@@ -203,6 +203,8 @@ const struct ctx_opts {
 	{ "vtid", CONTEXT_VTID },
 	{ "ppid", CONTEXT_PPID },
 	{ "vppid", CONTEXT_VPPID },
+	{ "hostname", CONTEXT_HOSTNAME },
+	{ "ip", CONTEXT_IP },
 	/* Perf options */
 	PERF_HW(cpu-cycles, CPU_CYCLES),
 	PERF_HW(cycles, CPU_CYCLES),
@@ -298,11 +300,10 @@ static void usage(FILE *ofp)
 {
 	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, "is added to all events and all channels.\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, "Otherwise the context is 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");
@@ -311,7 +312,6 @@ static void usage(FILE *ofp)
 	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");
 	fprintf(ofp, "  -u, --userspace          Apply to the user-space tracer\n");
 	fprintf(ofp, "\n");
@@ -324,7 +324,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");
@@ -368,7 +368,7 @@ static int add_context(char *session_name)
 	} else if (opt_userspace) {
 		dom.type = LTTNG_DOMAIN_UST;
 	} else {
-		ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
+		print_missing_domain();
 		ret = CMD_ERROR;
 		goto error;
 	}
@@ -385,7 +385,9 @@ static int add_context(char *session_name)
 		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;
-			strcpy(context.u.perf_counter.name, type->opt->symbol);
+			strncpy(context.u.perf_counter.name, type->opt->symbol,
+				LTTNG_SYMBOL_NAME_LEN);
+			context.u.perf_counter.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
 			/* Replace : and - by _ */
 			while ((ptr = strchr(context.u.perf_counter.name, '-')) != NULL) {
 				*ptr = '_';
@@ -396,25 +398,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)
@@ -481,13 +474,13 @@ int cmd_add_context(int argc, const char **argv)
 			}
 
 			type->opt = &ctx_opts[index];
-			if (type->opt->ctx_type == -1) {
+			if (type->opt->symbol == NULL) {
 				ERR("Unknown context type %s", opt_type);
 				free(type);
 				ret = CMD_ERROR;
 				goto end;
 			} else {
-				cds_list_add(&type->list, &ctx_type_list.head);
+				cds_list_add_tail(&type->list, &ctx_type_list.head);
 			}
 			break;
 		case OPT_USERSPACE: