X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=18a958d321e6101d1de0c2c6ff00f75fae9e06bd;hb=6a240cd997676bd36ad7c8f7446191664409633a;hp=b6c18e142ca6c3e7434e616db17f3499df636d45;hpb=c617c0c651432f9d5ae7adf4c5c1a5fd92ad828e;p=lttng-tools.git diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c index b6c18e142..18a958d32 100644 --- a/src/bin/lttng/commands/enable_events.c +++ b/src/bin/lttng/commands/enable_events.c @@ -113,11 +113,11 @@ static void usage(FILE *ofp) fprintf(ofp, " e.g.:\n"); fprintf(ofp, " \"*\"\n"); fprintf(ofp, " \"app_component:na*\"\n"); - fprintf(ofp, " --probe [addr | symbol | symbol+offset]\n"); + fprintf(ofp, " --probe (addr | symbol | symbol+offset)\n"); fprintf(ofp, " Dynamic probe.\n"); fprintf(ofp, " Addr and offset can be octal (0NNN...),\n"); fprintf(ofp, " decimal (NNN...) or hexadecimal (0xNNN...)\n"); - fprintf(ofp, " --function [addr | symbol | symbol+offset]\n"); + fprintf(ofp, " --function (addr | symbol | symbol+offset)\n"); fprintf(ofp, " Dynamic function entry/return probe.\n"); fprintf(ofp, " Addr and offset can be octal (0NNN...),\n"); fprintf(ofp, " decimal (NNN...) or hexadecimal (0xNNN...)\n"); @@ -154,8 +154,8 @@ static void usage(FILE *ofp) fprintf(ofp, " TRACE_DEBUG = 14\n"); fprintf(ofp, " (shortcuts such as \"system\" are allowed)\n"); fprintf(ofp, " --filter \'expression\'\n"); - fprintf(ofp, " Filter expression on event fields,\n"); - fprintf(ofp, " event recording depends on evaluation.\n"); + fprintf(ofp, " Filter expression on event fields and context.\n"); + fprintf(ofp, " Event recording depends on evaluation.\n"); fprintf(ofp, " Only specify on first activation of\n"); fprintf(ofp, " a given event within a session.\n"); fprintf(ofp, " Filter only allowed when enabling\n"); @@ -168,14 +168,27 @@ static void usage(FILE *ofp) fprintf(ofp, " Expression examples:.\n"); fprintf(ofp, " \n"); fprintf(ofp, " 'intfield > 500 && intfield < 503'\n"); - fprintf(ofp, " '(stringfield == \"test\" || intfield != 10) && intfield > 33'\n"); + fprintf(ofp, " '(strfield == \"test\" || intfield != 10) && intfield > 33'\n"); fprintf(ofp, " 'doublefield > 1.1 && intfield < 5.3'\n"); fprintf(ofp, " \n"); fprintf(ofp, " Wildcards are allowed at the end of strings:\n"); fprintf(ofp, " 'seqfield1 == \"te*\"'\n"); fprintf(ofp, " In string literals, the escape character is '\\'.\n"); fprintf(ofp, " Use '\\*' for the '*' character, and '\\\\' for\n"); - fprintf(ofp, " the '\\' character.\n"); + fprintf(ofp, " the '\\' character. Wildcard match any sequence of,\n"); + fprintf(ofp, " characters including an empty sub-string (match 0 or\n"); + fprintf(ofp, " more characters).\n"); + fprintf(ofp, "\n"); + fprintf(ofp, " Context information can be used for filtering. The\n"); + fprintf(ofp, " examples below show usage of context filtering on\n"); + fprintf(ofp, " process name (with a wildcard), process ID range, and\n"); + fprintf(ofp, " unique thread ID for filtering. The process and\n"); + fprintf(ofp, " thread ID of running applications can be found under\n"); + fprintf(ofp, " columns \"PID\" and \"LWP\" of the \"ps -eLf\" command.\n"); + fprintf(ofp, "\n"); + fprintf(ofp, " '$ctx.procname == \"demo*\"'\n"); + fprintf(ofp, " '$ctx.vpid >= 4433 && $ctx.vpid < 4455'\n"); + fprintf(ofp, " '$ctx.vtid == 1234'\n"); fprintf(ofp, "\n"); } @@ -199,7 +212,7 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt) strncpy(ev->attr.probe.symbol_name, name, LTTNG_SYMBOL_NAME_LEN); ev->attr.probe.symbol_name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; DBG("probe symbol %s", ev->attr.probe.symbol_name); - if (strlen(s_hex) == 0) { + if (*s_hex == '\0') { ERR("Invalid probe offset %s", s_hex); ret = -1; goto end; @@ -227,7 +240,7 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt) /* Check for address */ ret = sscanf(opt, "%s", s_hex); if (ret > 0) { - if (strlen(s_hex) == 0) { + if (*s_hex == '\0') { ERR("Invalid probe address %s", s_hex); ret = -1; goto end; @@ -255,7 +268,11 @@ int loglevel_str_to_value(const char *inputstr) int i = 0; char str[LTTNG_SYMBOL_NAME_LEN]; - while (i < LTTNG_SYMBOL_NAME_LEN && inputstr[i] != '\0') { + /* + * Loop up to LTTNG_SYMBOL_NAME_LEN minus one because the NULL bytes is + * added at the end of the loop so a the upper bound we avoid the overflow. + */ + while (i < (LTTNG_SYMBOL_NAME_LEN - 1) && inputstr[i] != '\0') { str[i] = toupper(inputstr[i]); i++; } @@ -319,8 +336,11 @@ static int enable_events(char *session_name) /* Create lttng domain */ if (opt_kernel) { dom.type = LTTNG_DOMAIN_KERNEL; + dom.buf_type = LTTNG_BUFFER_GLOBAL; } else if (opt_userspace) { dom.type = LTTNG_DOMAIN_UST; + /* Default. */ + dom.buf_type = LTTNG_BUFFER_PER_UID; } else { ERR("Please specify a tracer (-k/--kernel or -u/--userspace)"); ret = CMD_ERROR; @@ -422,7 +442,6 @@ static int enable_events(char *session_name) ret = lttng_enable_event_with_filter(handle, &ev, channel_name, opt_filter); if (ret < 0) { - fprintf(stderr, "Ret filter: %d\n", ret); switch (-ret) { case LTTNG_ERR_FILTER_EXIST: WARN("Filter on events is already enabled" @@ -431,9 +450,8 @@ static int enable_events(char *session_name) break; case LTTNG_ERR_FILTER_INVAL: case LTTNG_ERR_FILTER_NOMEM: - ERR("%s", lttng_strerror(ret)); default: - ERR("Setting filter: '%s'", opt_filter); + ERR("%s", lttng_strerror(ret)); break; } goto error; @@ -494,7 +512,7 @@ static int enable_events(char *session_name) if (opt_loglevel) { MSG("Kernel loglevels are not supported."); - ret = CMD_UNDEFINED; + ret = CMD_UNSUPPORTED; goto error; } @@ -527,7 +545,7 @@ static int enable_events(char *session_name) case LTTNG_EVENT_SYSCALL: default: ERR("Event type not available for user-space tracing"); - ret = CMD_UNDEFINED; + ret = CMD_UNSUPPORTED; goto error; } @@ -618,6 +636,7 @@ int cmd_enable_events(int argc, const char **argv) int opt, ret = CMD_SUCCESS; static poptContext pc; char *session_name = NULL; + int event_type = -1; pc = poptGetContext(NULL, argc, argv, long_options, 0); poptReadDefaultConfig(pc, 0); @@ -666,6 +685,17 @@ int cmd_enable_events(int argc, const char **argv) ret = CMD_UNDEFINED; goto end; } + + /* Validate event type. Multiple event type are not supported. */ + if (event_type == -1) { + event_type = opt_event_type; + } else { + if (event_type != opt_event_type) { + ERR("Multiple event type not supported."); + ret = CMD_ERROR; + goto end; + } + } } opt_event_list = (char*) poptGetArg(pc);