X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_context.c;h=ce65024f5f6b912cbf2406d8be8e82018c2b9e90;hp=2d9699ce2c2b4bed3159d5d8b3af8426fecae96e;hb=0cda4f28041a221757fa2dfa8e91706e7a548090;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377

diff --git a/src/bin/lttng/commands/add_context.c b/src/bin/lttng/commands/add_context.c
index 2d9699ce2..ce65024f5 100644
--- a/src/bin/lttng/commands/add_context.c
+++ b/src/bin/lttng/commands/add_context.c
@@ -28,9 +28,7 @@
 
 #include <urcu/list.h>
 
-#include "../cmd.h"
-#include "../conf.h"
-#include "../utils.h"
+#include "../command.h"
 
 #define PRINT_LINE_LEN	80
 
@@ -39,14 +37,18 @@ static char *opt_channel_name;
 static char *opt_session_name;
 static int opt_kernel;
 static int opt_userspace;
+static char *opt_type;
+#if 0
+/* Not implemented yet */
 static char *opt_cmd_name;
 static pid_t opt_pid;
-static char *opt_type;
+#endif
 
 enum {
 	OPT_HELP = 1,
 	OPT_TYPE,
 	OPT_USERSPACE,
+	OPT_LIST_OPTIONS,
 };
 
 static struct lttng_handle *handle;
@@ -65,6 +67,7 @@ enum context_type {
 	CONTEXT_VTID         = 7,
 	CONTEXT_PPID         = 8,
 	CONTEXT_VPPID        = 9,
+	CONTEXT_PTHREAD_ID   = 10,
 };
 
 /*
@@ -140,9 +143,15 @@ 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},
-	{"userspace",      'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 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}
 };
 
@@ -197,6 +206,7 @@ const struct ctx_opts {
 	{ "nice", CONTEXT_NICE },
 	{ "vpid", CONTEXT_VPID },
 	{ "tid", CONTEXT_TID },
+	{ "pthread_id", CONTEXT_PTHREAD_ID },
 	{ "vtid", CONTEXT_VTID },
 	{ "ppid", CONTEXT_PPID },
 	{ "vppid", CONTEXT_VPPID },
@@ -295,28 +305,35 @@ static void usage(FILE *ofp)
 {
 	fprintf(ofp, "usage: lttng add-context -t TYPE\n");
 	fprintf(ofp, "\n");
-	fprintf(ofp, "If no event name is given (-e), the context will be added to the channel\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, "\n");
 	fprintf(ofp, "Options:\n");
 	fprintf(ofp, "  -h, --help               Show this help\n");
-	fprintf(ofp, "  -s, --session            Apply on session name\n");
-	fprintf(ofp, "  -c, --channel NAME       Apply on channel\n");
-	fprintf(ofp, "  -e, --event NAME         Apply on event\n");
-	fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
-	fprintf(ofp, "  -u, --userspace [CMD]    Apply for the user-space tracer\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, "                           or else the domain is UST EXEC_NAME\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, "  -t, --type TYPE          Context type. You can repeat that option on\n");
-	fprintf(ofp, "                           the command line.\n");
+	fprintf(ofp, "                           the command line to specify multiple contexts at once.\n");
+	fprintf(ofp, "                           (--kernel preempts --userspace)\n");
 	fprintf(ofp, "                           TYPE can be one of the strings below:\n");
 	print_ctx_type(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 events\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");
@@ -346,7 +363,7 @@ end:
  */
 static int add_context(char *session_name)
 {
-	int ret = CMD_SUCCESS;
+	int ret = CMD_SUCCESS, warn = 0;
 	struct lttng_event_context context;
 	struct lttng_domain dom;
 	struct ctx_type *type;
@@ -354,28 +371,21 @@ static int add_context(char *session_name)
 
 	if (opt_kernel) {
 		dom.type = LTTNG_DOMAIN_KERNEL;
-	} else if (opt_pid != 0) {
-		dom.type = LTTNG_DOMAIN_UST_PID;
-		dom.attr.pid = opt_pid;
-		DBG("PID %d set to lttng handle", opt_pid);
-	} else if (opt_userspace && opt_cmd_name == NULL) {
+	} else if (opt_userspace) {
 		dom.type = LTTNG_DOMAIN_UST;
-	} else if (opt_userspace && opt_cmd_name != NULL) {
-		dom.type = LTTNG_DOMAIN_UST_EXEC_NAME;
-		strncpy(dom.attr.exec_name, opt_cmd_name, NAME_MAX);
 	} else {
 		ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
-		ret = CMD_NOT_IMPLEMENTED;
+		ret = CMD_ERROR;
 		goto error;
 	}
 
 	handle = lttng_create_handle(session_name, &dom);
 	if (handle == NULL) {
-		ret = -1;
+		ret = CMD_ERROR;
 		goto error;
 	}
 
-	/* Iterate over all context type given */
+	/* Iterate over all the context types given */
 	cds_list_for_each_entry(type, &ctx_type_list.head, list) {
 		context.ctx = type->opt->ctx_type;
 		if (context.ctx == LTTNG_EVENT_CONTEXT_PERF_COUNTER) {
@@ -395,24 +405,46 @@ static int add_context(char *session_name)
 		ret = lttng_add_context(handle, &context, opt_event_name,
 				opt_channel_name);
 		if (ret < 0) {
-			fprintf(stderr, "%s: ", type->opt->symbol);
+			ERR("%s: %s", type->opt->symbol, lttng_strerror(ret));
+			warn = 1;
 			continue;
 		} else {
-			MSG("%s context %s added to %s event in %s",
-					opt_kernel ? "kernel" : "UST", type->opt->symbol,
-					opt_event_name ? opt_event_name : "all",
-					opt_channel_name ? opt_channel_name : "all channels");
+			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) {
+				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)
+			}
 		}
 	}
 
+	ret = CMD_SUCCESS;
+
 error:
 	lttng_destroy_handle(handle);
 
+	/*
+	 * This means that at least one add_context failed and tells the user to
+	 * look on stderr for error(s).
+	 */
+	if (warn) {
+		ret = CMD_WARNING;
+	}
 	return ret;
 }
 
 /*
- * Add context on channel or event.
+ * Add context to channel or event.
  */
 int cmd_add_context(int argc, const char **argv)
 {
@@ -423,6 +455,7 @@ int cmd_add_context(int argc, const char **argv)
 
 	if (argc < 2) {
 		usage(stderr);
+		ret = CMD_ERROR;
 		goto end;
 	}
 
@@ -432,32 +465,48 @@ int cmd_add_context(int argc, const char **argv)
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case OPT_HELP:
-			usage(stderr);
+			usage(stdout);
 			ret = CMD_SUCCESS;
 			goto end;
 		case OPT_TYPE:
-			type = malloc(sizeof(struct ctx_type));
-			if (type == NULL) {
-				perror("malloc ctx_type");
-				ret = -1;
-				goto end;
-			}
+			/*
+			 * Look up the index of opt_type in ctx_opts[] first, so we don't
+			 * have to free(type) on failure.
+			 */
 			index = find_ctx_type_idx(opt_type);
 			if (index < 0) {
 				ERR("Unknown context type %s", opt_type);
+				ret = CMD_ERROR;
+				goto end;
+			}
+
+			type = malloc(sizeof(struct ctx_type));
+			if (type == NULL) {
+				perror("malloc ctx_type");
+				ret = CMD_FATAL;
 				goto end;
 			}
+
 			type->opt = &ctx_opts[index];
 			if (type->opt->ctx_type == -1) {
 				ERR("Unknown context type %s", opt_type);
+				free(type);
+				ret = CMD_ERROR;
+				goto end;
 			} else {
 				cds_list_add(&type->list, &ctx_type_list.head);
 			}
 			break;
 		case OPT_USERSPACE:
 			opt_userspace = 1;
+#if 0
 			opt_cmd_name = poptGetOptArg(pc);
+#endif
 			break;
+		case OPT_LIST_OPTIONS:
+			list_cmd_options(stdout, long_options);
+			ret = CMD_SUCCESS;
+			goto end;
 		default:
 			usage(stderr);
 			ret = CMD_UNDEFINED;
@@ -468,7 +517,7 @@ int cmd_add_context(int argc, const char **argv)
 	if (!opt_session_name) {
 		session_name = get_session_name();
 		if (session_name == NULL) {
-			ret = -1;
+			ret = CMD_ERROR;
 			goto end;
 		}
 	} else {
@@ -477,11 +526,11 @@ int cmd_add_context(int argc, const char **argv)
 
 	ret = add_context(session_name);
 
+end:
 	/* Cleanup allocated memory */
 	cds_list_for_each_entry_safe(type, tmptype, &ctx_type_list.head, list) {
 		free(type);
 	}
 
-end:
 	return ret;
 }