Initialize all stack variables to zero, fix uninitialized loglevel variables

[lttng-tools.git] / src / bin / lttng / commands / add_context.c

diff --git a/src/bin/lttng/commands/add_context.c b/src/bin/lttng/commands/add_context.c
index a7ab4268ac5401805d83d675639962d834f0fb50..e499ef3d37894eb3aababec3d4ad59c18abbd964 100644 (file)
--- a/src/bin/lttng/commands/add_context.c
+++ b/src/bin/lttng/commands/add_context.c
@@ -67,6 +67,7 @@ enum context_type {
        CONTEXT_VTID         = 7,
        CONTEXT_PPID         = 8,
        CONTEXT_VPPID        = 9,
+       CONTEXT_PTHREAD_ID   = 10,
 };
 
 /*
@@ -205,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 },
@@ -311,14 +313,14 @@ static void usage(FILE *ofp)
        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 on session name\n");
-       fprintf(ofp, "  -c, --channel NAME       Apply on channel\n");
-       fprintf(ofp, "  -e, --event NAME         Apply on event\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");
@@ -367,6 +369,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) {
@@ -383,7 +388,7 @@ static int add_context(char *session_name)
                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) {
@@ -403,14 +408,26 @@ static int add_context(char *session_name)
                ret = lttng_add_context(handle, &context, opt_event_name,
                                opt_channel_name);
                if (ret < 0) {
-                       ERR("%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)
+                       }
                }
        }
 
@@ -430,7 +447,7 @@ error:
 }
 
 /*
- * Add context on channel or event.
+ * Add context to channel or event.
  */
 int cmd_add_context(int argc, const char **argv)
 {
@@ -441,6 +458,7 @@ int cmd_add_context(int argc, const char **argv)
 
        if (argc < 2) {
                usage(stderr);
+               ret = CMD_ERROR;
                goto end;
        }
 
@@ -450,17 +468,9 @@ int cmd_add_context(int argc, const char **argv)
        while ((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case OPT_HELP:
-                       usage(stderr);
-                       ret = CMD_SUCCESS;
+                       usage(stdout);
                        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.
@@ -468,11 +478,23 @@ int cmd_add_context(int argc, const char **argv)
                        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);
                        }
@@ -485,7 +507,6 @@ int cmd_add_context(int argc, const char **argv)
                        break;
                case OPT_LIST_OPTIONS:
                        list_cmd_options(stdout, long_options);
-                       ret = CMD_SUCCESS;
                        goto end;
                default:
                        usage(stderr);
@@ -494,10 +515,17 @@ int cmd_add_context(int argc, const char **argv)
                }
        }
 
+       if (!opt_type) {
+               ERR("Missing mandatory -t TYPE");
+               usage(stderr);
+               ret = CMD_ERROR;
+               goto end;
+       }
+
        if (!opt_session_name) {
                session_name = get_session_name();
                if (session_name == NULL) {
-                       ret = -1;
+                       ret = CMD_ERROR;
                        goto end;
                }
        } else {
@@ -506,11 +534,12 @@ 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:
+       poptFreeContext(pc);
        return ret;
 }