X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=627b7ebf9ebeaa1a91ee781adcc023b098780073;hp=97a36b31109a57c70217533ba05a646ac2f9df52;hb=4624dad0d79b63be45c5c6d7eb2920ba09746f06;hpb=343af227102f6b274bfd7f6c7220eb3b776ba5e3 diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c index 97a36b311..627b7ebf9 100644 --- a/src/bin/lttng/commands/enable_events.c +++ b/src/bin/lttng/commands/enable_events.c @@ -1,18 +1,8 @@ /* - * Copyright (C) 2011 - David Goulet + * Copyright (C) 2011 David Goulet * - * 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. + * SPDX-License-Identifier: GPL-2.0-only * - * 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _LGPL_SOURCE @@ -28,12 +18,18 @@ #include #include +#include #include +#include /* Mi dependancy */ #include +#include + #include "../command.h" +#include "../loglevel.h" +#include "../uprobe.h" #if (LTTNG_SYMBOL_NAME_LEN == 256) #define LTTNG_SYMBOL_NAME_LEN_SCANF_IS_A_BROKEN_API "255" @@ -51,6 +47,7 @@ static int opt_log4j; static int opt_python; static int opt_enable_all; static char *opt_probe; +static char *opt_userspace_probe; static char *opt_function; static char *opt_channel_name; static char *opt_filter; @@ -66,6 +63,7 @@ enum { OPT_HELP = 1, OPT_TRACEPOINT, OPT_PROBE, + OPT_USERSPACE_PROBE, OPT_FUNCTION, OPT_SYSCALL, OPT_USERSPACE, @@ -92,6 +90,7 @@ static struct poptOption long_options[] = { {"python", 'p', POPT_ARG_VAL, &opt_python, 1, 0, 0}, {"tracepoint", 0, POPT_ARG_NONE, 0, OPT_TRACEPOINT, 0, 0}, {"probe", 0, POPT_ARG_STRING, &opt_probe, OPT_PROBE, 0, 0}, + {"userspace-probe",0, POPT_ARG_STRING, &opt_userspace_probe, OPT_USERSPACE_PROBE, 0, 0}, {"function", 0, POPT_ARG_STRING, &opt_function, OPT_FUNCTION, 0, 0}, {"syscall", 0, POPT_ARG_NONE, 0, OPT_SYSCALL, 0, 0}, {"loglevel", 0, POPT_ARG_STRING, 0, OPT_LOGLEVEL, 0, 0}, @@ -137,7 +136,7 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt) } /* Check for symbol */ - if (isalpha(name[0])) { + if (isalpha(name[0]) || name[0] == '_') { match = sscanf(opt, "%" LTTNG_SYMBOL_NAME_LEN_SCANF_IS_A_BROKEN_API "s", name); if (match == 1) { @@ -154,8 +153,13 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt) /* Check for address */ match = sscanf(opt, "%" S_HEX_LEN_SCANF_IS_A_BROKEN_API "s", s_hex); if (match > 0) { - if (*s_hex == '\0') { - ERR("Invalid probe address %s", s_hex); + /* + * Return an error if the first character of the tentative + * address is NULL or not a digit. It can be "0" if the address + * is in hexadecimal and can be 1 to 9 if it's in decimal. + */ + if (*s_hex == '\0' || !isdigit(*s_hex)) { + ERR("Invalid probe description %s", s_hex); ret = CMD_ERROR; goto end; } @@ -173,190 +177,6 @@ end: return ret; } -/* - * Maps LOG4j loglevel from string to value - */ -static int loglevel_log4j_str_to_value(const char *inputstr) -{ - int i = 0; - char str[LTTNG_SYMBOL_NAME_LEN]; - - if (!inputstr || strlen(inputstr) == 0) { - return -1; - } - - /* - * 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++; - } - str[i] = '\0'; - - if (!strcmp(str, "LOG4J_OFF") || !strcmp(str, "OFF")) { - return LTTNG_LOGLEVEL_LOG4J_OFF; - } else if (!strcmp(str, "LOG4J_FATAL") || !strcmp(str, "FATAL")) { - return LTTNG_LOGLEVEL_LOG4J_FATAL; - } else if (!strcmp(str, "LOG4J_ERROR") || !strcmp(str, "ERROR")) { - return LTTNG_LOGLEVEL_LOG4J_ERROR; - } else if (!strcmp(str, "LOG4J_WARN") || !strcmp(str, "WARN")) { - return LTTNG_LOGLEVEL_LOG4J_WARN; - } else if (!strcmp(str, "LOG4J_INFO") || !strcmp(str, "INFO")) { - return LTTNG_LOGLEVEL_LOG4J_INFO; - } else if (!strcmp(str, "LOG4J_DEBUG") || !strcmp(str, "DEBUG")) { - return LTTNG_LOGLEVEL_LOG4J_DEBUG; - } else if (!strcmp(str, "LOG4J_TRACE") || !strcmp(str, "TRACE")) { - return LTTNG_LOGLEVEL_LOG4J_TRACE; - } else if (!strcmp(str, "LOG4J_ALL") || !strcmp(str, "ALL")) { - return LTTNG_LOGLEVEL_LOG4J_ALL; - } else { - return -1; - } -} - -/* - * Maps JUL loglevel from string to value - */ -static int loglevel_jul_str_to_value(const char *inputstr) -{ - int i = 0; - char str[LTTNG_SYMBOL_NAME_LEN]; - - if (!inputstr || strlen(inputstr) == 0) { - return -1; - } - - /* - * 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++; - } - str[i] = '\0'; - - if (!strcmp(str, "JUL_OFF") || !strcmp(str, "OFF")) { - return LTTNG_LOGLEVEL_JUL_OFF; - } else if (!strcmp(str, "JUL_SEVERE") || !strcmp(str, "SEVERE")) { - return LTTNG_LOGLEVEL_JUL_SEVERE; - } else if (!strcmp(str, "JUL_WARNING") || !strcmp(str, "WARNING")) { - return LTTNG_LOGLEVEL_JUL_WARNING; - } else if (!strcmp(str, "JUL_INFO") || !strcmp(str, "INFO")) { - return LTTNG_LOGLEVEL_JUL_INFO; - } else if (!strcmp(str, "JUL_CONFIG") || !strcmp(str, "CONFIG")) { - return LTTNG_LOGLEVEL_JUL_CONFIG; - } else if (!strcmp(str, "JUL_FINE") || !strcmp(str, "FINE")) { - return LTTNG_LOGLEVEL_JUL_FINE; - } else if (!strcmp(str, "JUL_FINER") || !strcmp(str, "FINER")) { - return LTTNG_LOGLEVEL_JUL_FINER; - } else if (!strcmp(str, "JUL_FINEST") || !strcmp(str, "FINEST")) { - return LTTNG_LOGLEVEL_JUL_FINEST; - } else if (!strcmp(str, "JUL_ALL") || !strcmp(str, "ALL")) { - return LTTNG_LOGLEVEL_JUL_ALL; - } else { - return -1; - } -} - -/* - * Maps Python loglevel from string to value - */ -static int loglevel_python_str_to_value(const char *inputstr) -{ - int i = 0; - char str[LTTNG_SYMBOL_NAME_LEN]; - - if (!inputstr || strlen(inputstr) == 0) { - return -1; - } - - /* - * 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++; - } - str[i] = '\0'; - - if (!strcmp(str, "PYTHON_CRITICAL") || !strcmp(str, "CRITICAL")) { - return LTTNG_LOGLEVEL_PYTHON_CRITICAL; - } else if (!strcmp(str, "PYTHON_ERROR") || !strcmp(str, "ERROR")) { - return LTTNG_LOGLEVEL_PYTHON_ERROR; - } else if (!strcmp(str, "PYTHON_WARNING") || !strcmp(str, "WARNING")) { - return LTTNG_LOGLEVEL_PYTHON_WARNING; - } else if (!strcmp(str, "PYTHON_INFO") || !strcmp(str, "INFO")) { - return LTTNG_LOGLEVEL_PYTHON_INFO; - } else if (!strcmp(str, "PYTNON_DEBUG") || !strcmp(str, "DEBUG")) { - return LTTNG_LOGLEVEL_PYTHON_DEBUG; - } else if (!strcmp(str, "PYTHON_NOTSET") || !strcmp(str, "NOTSET")) { - return LTTNG_LOGLEVEL_PYTHON_NOTSET; - } else { - return -1; - } -} - -/* - * Maps loglevel from string to value - */ -static -int loglevel_str_to_value(const char *inputstr) -{ - int i = 0; - char str[LTTNG_SYMBOL_NAME_LEN]; - - if (!inputstr || strlen(inputstr) == 0) { - return -1; - } - - /* - * 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++; - } - str[i] = '\0'; - if (!strcmp(str, "TRACE_EMERG") || !strcmp(str, "EMERG")) { - return LTTNG_LOGLEVEL_EMERG; - } else if (!strcmp(str, "TRACE_ALERT") || !strcmp(str, "ALERT")) { - return LTTNG_LOGLEVEL_ALERT; - } else if (!strcmp(str, "TRACE_CRIT") || !strcmp(str, "CRIT")) { - return LTTNG_LOGLEVEL_CRIT; - } else if (!strcmp(str, "TRACE_ERR") || !strcmp(str, "ERR")) { - return LTTNG_LOGLEVEL_ERR; - } else if (!strcmp(str, "TRACE_WARNING") || !strcmp(str, "WARNING")) { - return LTTNG_LOGLEVEL_WARNING; - } else if (!strcmp(str, "TRACE_NOTICE") || !strcmp(str, "NOTICE")) { - return LTTNG_LOGLEVEL_NOTICE; - } else if (!strcmp(str, "TRACE_INFO") || !strcmp(str, "INFO")) { - return LTTNG_LOGLEVEL_INFO; - } else if (!strcmp(str, "TRACE_DEBUG_SYSTEM") || !strcmp(str, "DEBUG_SYSTEM") || !strcmp(str, "SYSTEM")) { - return LTTNG_LOGLEVEL_DEBUG_SYSTEM; - } else if (!strcmp(str, "TRACE_DEBUG_PROGRAM") || !strcmp(str, "DEBUG_PROGRAM") || !strcmp(str, "PROGRAM")) { - return LTTNG_LOGLEVEL_DEBUG_PROGRAM; - } else if (!strcmp(str, "TRACE_DEBUG_PROCESS") || !strcmp(str, "DEBUG_PROCESS") || !strcmp(str, "PROCESS")) { - return LTTNG_LOGLEVEL_DEBUG_PROCESS; - } else if (!strcmp(str, "TRACE_DEBUG_MODULE") || !strcmp(str, "DEBUG_MODULE") || !strcmp(str, "MODULE")) { - return LTTNG_LOGLEVEL_DEBUG_MODULE; - } else if (!strcmp(str, "TRACE_DEBUG_UNIT") || !strcmp(str, "DEBUG_UNIT") || !strcmp(str, "UNIT")) { - return LTTNG_LOGLEVEL_DEBUG_UNIT; - } else if (!strcmp(str, "TRACE_DEBUG_FUNCTION") || !strcmp(str, "DEBUG_FUNCTION") || !strcmp(str, "FUNCTION")) { - return LTTNG_LOGLEVEL_DEBUG_FUNCTION; - } else if (!strcmp(str, "TRACE_DEBUG_LINE") || !strcmp(str, "DEBUG_LINE") || !strcmp(str, "LINE")) { - return LTTNG_LOGLEVEL_DEBUG_LINE; - } else if (!strcmp(str, "TRACE_DEBUG") || !strcmp(str, "DEBUG")) { - return LTTNG_LOGLEVEL_DEBUG; - } else { - return -1; - } -} - static const char *print_channel_name(const char *name) { @@ -412,7 +232,7 @@ char *print_exclusions(char **names) { int length = 0; int i; - const char *preamble = " excluding "; + const char preamble[] = " excluding "; char *ret; int count = names ? strutils_array_of_strings_len(names) : 0; @@ -425,9 +245,8 @@ char *print_exclusions(char **names) length += strlen(names[i]) + 4; } - /* add length of preamble + one for NUL - one for last (missing) comma */ - length += strlen(preamble); - ret = zmalloc(length + 1); + length += sizeof(preamble); + ret = zmalloc(length); if (!ret) { return NULL; } @@ -504,7 +323,16 @@ end: return ret; } -static +/* + * FIXME: find a good place to declare this since add trigger also uses it + */ +LTTNG_HIDDEN +int create_exclusion_list_and_validate(const char *event_name, + const char *exclusions_arg, + char ***exclusion_list); + + +LTTNG_HIDDEN int create_exclusion_list_and_validate(const char *event_name, const char *exclusions_arg, char ***exclusion_list) @@ -579,13 +407,19 @@ static int enable_events(char *session_name) int ret = CMD_SUCCESS, command_ret = CMD_SUCCESS; int error_holder = CMD_SUCCESS, warn = 0, error = 0, success = 1; char *event_name, *channel_name = NULL; - struct lttng_event ev; + struct lttng_event *ev; struct lttng_domain dom; char **exclusion_list = NULL; + struct lttng_userspace_probe_location *uprobe_loc = NULL; - memset(&ev, 0, sizeof(ev)); memset(&dom, 0, sizeof(dom)); + ev = lttng_event_create(); + if (!ev) { + ret = CMD_ERROR; + goto error; + } + if (opt_kernel) { if (opt_loglevel) { WARN("Kernel loglevels are not supported."); @@ -635,6 +469,30 @@ static int enable_events(char *session_name) } } + /* + * Adding a filter to a probe, function or userspace-probe would be + * denied by the kernel tracer as it's not supported at the moment. We + * do an early check here to warn the user. + */ + if (opt_filter && opt_kernel) { + switch (opt_event_type) { + case LTTNG_EVENT_ALL: + case LTTNG_EVENT_TRACEPOINT: + case LTTNG_EVENT_SYSCALL: + break; + case LTTNG_EVENT_PROBE: + case LTTNG_EVENT_USERSPACE_PROBE: + case LTTNG_EVENT_FUNCTION: + ERR("Filter expressions are not supported for %s events", + get_event_type_str(opt_event_type)); + ret = CMD_ERROR; + goto error; + default: + ret = CMD_UNDEFINED; + goto error; + } + } + channel_name = opt_channel_name; handle = lttng_create_handle(session_name, &dom); @@ -656,26 +514,43 @@ static int enable_events(char *session_name) if (opt_enable_all) { /* Default setup for enable all */ if (opt_kernel) { - ev.type = opt_event_type; - strcpy(ev.name, "*"); + ev->type = opt_event_type; + strcpy(ev->name, "*"); /* kernel loglevels not implemented */ - ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; + ev->loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; } else { - ev.type = LTTNG_EVENT_TRACEPOINT; - strcpy(ev.name, "*"); - ev.loglevel_type = opt_loglevel_type; + ev->type = LTTNG_EVENT_TRACEPOINT; + strcpy(ev->name, "*"); + ev->loglevel_type = opt_loglevel_type; if (opt_loglevel) { + int name_search_ret; + assert(opt_userspace || opt_jul || opt_log4j || opt_python); + if (opt_userspace) { - ev.loglevel = loglevel_str_to_value(opt_loglevel); + enum lttng_loglevel loglevel; + + name_search_ret = loglevel_name_to_value(opt_loglevel, &loglevel); + ev->loglevel = (int) loglevel; } else if (opt_jul) { - ev.loglevel = loglevel_jul_str_to_value(opt_loglevel); + enum lttng_loglevel_jul loglevel; + + name_search_ret = loglevel_jul_name_to_value(opt_loglevel, &loglevel); + ev->loglevel = (int) loglevel; } else if (opt_log4j) { - ev.loglevel = loglevel_log4j_str_to_value(opt_loglevel); - } else if (opt_python) { - ev.loglevel = loglevel_python_str_to_value(opt_loglevel); + enum lttng_loglevel_log4j loglevel; + + name_search_ret = loglevel_log4j_name_to_value(opt_loglevel, &loglevel); + ev->loglevel = (int) loglevel; + } else { + /* python domain. */ + enum lttng_loglevel_python loglevel; + + name_search_ret = loglevel_python_name_to_value(opt_loglevel, &loglevel); + ev->loglevel = (int) loglevel; } - if (ev.loglevel == -1) { + + if (name_search_ret == -1) { ERR("Unknown loglevel %s", opt_loglevel); ret = -LTTNG_ERR_INVALID; goto error; @@ -683,13 +558,13 @@ static int enable_events(char *session_name) } else { assert(opt_userspace || opt_jul || opt_log4j || opt_python); if (opt_userspace) { - ev.loglevel = -1; + ev->loglevel = -1; } else if (opt_jul) { - ev.loglevel = LTTNG_LOGLEVEL_JUL_ALL; + ev->loglevel = LTTNG_LOGLEVEL_JUL_ALL; } else if (opt_log4j) { - ev.loglevel = LTTNG_LOGLEVEL_LOG4J_ALL; + ev->loglevel = LTTNG_LOGLEVEL_LOG4J_ALL; } else if (opt_python) { - ev.loglevel = LTTNG_LOGLEVEL_PYTHON_DEBUG; + ev->loglevel = LTTNG_LOGLEVEL_PYTHON_DEBUG; } } } @@ -702,13 +577,13 @@ static int enable_events(char *session_name) goto error; } - ev.exclusion = 1; + ev->exclusion = 1; warn_on_truncated_exclusion_names(exclusion_list, &warn); } if (!opt_filter) { ret = lttng_enable_event_with_exclusions(handle, - &ev, channel_name, + ev, channel_name, NULL, exclusion_list ? strutils_array_of_strings_len(exclusion_list) : 0, exclusion_list); @@ -820,7 +695,7 @@ static int enable_events(char *session_name) } if (opt_filter) { - command_ret = lttng_enable_event_with_exclusions(handle, &ev, channel_name, + command_ret = lttng_enable_event_with_exclusions(handle, ev, channel_name, opt_filter, exclusion_list ? strutils_array_of_strings_len(exclusion_list) : 0, exclusion_list); @@ -854,7 +729,7 @@ static int enable_events(char *session_name) } error_holder = command_ret; } else { - ev.filter = 1; + ev->filter = 1; MSG("Filter '%s' successfully set", opt_filter); } } @@ -867,16 +742,16 @@ static int enable_events(char *session_name) * Note: this is strictly for semantic and printing while in * machine interface mode. */ - strcpy(ev.name, "*"); + strcpy(ev->name, "*"); /* If we reach here the events are enabled */ if (!error && !warn) { - ev.enabled = 1; + ev->enabled = 1; } else { - ev.enabled = 0; + ev->enabled = 0; success = 0; } - ret = mi_lttng_event(writer, &ev, 1, handle->domain.type); + ret = mi_lttng_event(writer, ev, 1, handle->domain.type); if (ret) { ret = CMD_ERROR; goto error; @@ -912,9 +787,9 @@ static int enable_events(char *session_name) event_name = strtok(opt_event_list, ","); while (event_name != NULL) { /* Copy name and type of the event */ - strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN); - ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; - ev.type = opt_event_type; + strncpy(ev->name, event_name, LTTNG_SYMBOL_NAME_LEN); + ev->name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; + ev->type = opt_event_type; /* Kernel tracer action */ if (opt_kernel) { @@ -925,30 +800,61 @@ static int enable_events(char *session_name) switch (opt_event_type) { case LTTNG_EVENT_ALL: /* Enable tracepoints and syscalls */ /* If event name differs from *, select tracepoint. */ - if (strcmp(ev.name, "*")) { - ev.type = LTTNG_EVENT_TRACEPOINT; + if (strcmp(ev->name, "*")) { + ev->type = LTTNG_EVENT_TRACEPOINT; } break; case LTTNG_EVENT_TRACEPOINT: break; case LTTNG_EVENT_PROBE: - ret = parse_probe_opts(&ev, opt_probe); + ret = parse_probe_opts(ev, opt_probe); if (ret) { ERR("Unable to parse probe options"); - ret = 0; + ret = CMD_ERROR; goto error; } break; + case LTTNG_EVENT_USERSPACE_PROBE: + assert(ev->type == LTTNG_EVENT_USERSPACE_PROBE); + + ret = parse_userspace_probe_opts(opt_userspace_probe, &uprobe_loc); + if (ret) { + switch (ret) { + case CMD_UNSUPPORTED: + /* + * Error message describing + * what is not supported was + * printed in the function. + */ + break; + case CMD_ERROR: + default: + ERR("Unable to parse userspace probe options"); + break; + } + goto error; + } + + ret = lttng_event_set_userspace_probe_location(ev, uprobe_loc); + if (ret) { + WARN("Failed to set probe location on event"); + ret = CMD_ERROR; + goto error; + } + + /* Ownership of the uprobe location was transferred to the event. */ + uprobe_loc = NULL; + break; case LTTNG_EVENT_FUNCTION: - ret = parse_probe_opts(&ev, opt_function); + ret = parse_probe_opts(ev, opt_function); if (ret) { ERR("Unable to parse function probe options"); - ret = 0; + ret = CMD_ERROR; goto error; } break; case LTTNG_EVENT_SYSCALL: - ev.type = LTTNG_EVENT_SYSCALL; + ev->type = LTTNG_EVENT_SYSCALL; break; default: ret = CMD_UNDEFINED; @@ -956,7 +862,7 @@ static int enable_events(char *session_name) } /* kernel loglevels not implemented */ - ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; + ev->loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; } else if (opt_userspace) { /* User-space tracer action */ DBG("Enabling UST event %s for channel %s, loglevel %s", event_name, print_channel_name(channel_name), opt_loglevel ? : ""); @@ -966,13 +872,14 @@ static int enable_events(char *session_name) /* Fall-through */ case LTTNG_EVENT_TRACEPOINT: /* Copy name and type of the event */ - ev.type = LTTNG_EVENT_TRACEPOINT; - strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN); - ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; + ev->type = LTTNG_EVENT_TRACEPOINT; + strncpy(ev->name, event_name, LTTNG_SYMBOL_NAME_LEN); + ev->name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; break; case LTTNG_EVENT_PROBE: case LTTNG_EVENT_FUNCTION: case LTTNG_EVENT_SYSCALL: + case LTTNG_EVENT_USERSPACE_PROBE: default: ERR("Event type not available for user-space tracing"); ret = CMD_UNSUPPORTED; @@ -980,7 +887,7 @@ static int enable_events(char *session_name) } if (opt_exclude) { - ev.exclusion = 1; + ev->exclusion = 1; if (opt_event_type != LTTNG_EVENT_ALL && opt_event_type != LTTNG_EVENT_TRACEPOINT) { ERR("Exclusion option can only be used with tracepoint events"); ret = CMD_ERROR; @@ -1002,16 +909,20 @@ static int enable_events(char *session_name) exclusion_list, &warn); } - ev.loglevel_type = opt_loglevel_type; + ev->loglevel_type = opt_loglevel_type; if (opt_loglevel) { - ev.loglevel = loglevel_str_to_value(opt_loglevel); - if (ev.loglevel == -1) { + enum lttng_loglevel loglevel; + const int name_search_ret = loglevel_name_to_value(opt_loglevel, &loglevel); + + if (name_search_ret == -1) { ERR("Unknown loglevel %s", opt_loglevel); ret = -LTTNG_ERR_INVALID; goto error; } + + ev->loglevel = (int) loglevel; } else { - ev.loglevel = -1; + ev->loglevel = -1; } } else if (opt_jul || opt_log4j || opt_python) { if (opt_event_type != LTTNG_EVENT_ALL && @@ -1021,32 +932,45 @@ static int enable_events(char *session_name) goto error; } - ev.loglevel_type = opt_loglevel_type; + ev->loglevel_type = opt_loglevel_type; if (opt_loglevel) { + int name_search_ret; + if (opt_jul) { - ev.loglevel = loglevel_jul_str_to_value(opt_loglevel); + enum lttng_loglevel_jul loglevel; + + name_search_ret = loglevel_jul_name_to_value(opt_loglevel, &loglevel); + ev->loglevel = (int) loglevel; } else if (opt_log4j) { - ev.loglevel = loglevel_log4j_str_to_value(opt_loglevel); - } else if (opt_python) { - ev.loglevel = loglevel_python_str_to_value(opt_loglevel); + enum lttng_loglevel_log4j loglevel; + + name_search_ret = loglevel_log4j_name_to_value(opt_loglevel, &loglevel); + ev->loglevel = (int) loglevel; + } else { + /* python domain. */ + enum lttng_loglevel_python loglevel; + + name_search_ret = loglevel_python_name_to_value(opt_loglevel, &loglevel); + ev->loglevel = (int) loglevel; } - if (ev.loglevel == -1) { + + if (name_search_ret) { ERR("Unknown loglevel %s", opt_loglevel); ret = -LTTNG_ERR_INVALID; goto error; } } else { if (opt_jul) { - ev.loglevel = LTTNG_LOGLEVEL_JUL_ALL; + ev->loglevel = LTTNG_LOGLEVEL_JUL_ALL; } else if (opt_log4j) { - ev.loglevel = LTTNG_LOGLEVEL_LOG4J_ALL; + ev->loglevel = LTTNG_LOGLEVEL_LOG4J_ALL; } else if (opt_python) { - ev.loglevel = LTTNG_LOGLEVEL_PYTHON_DEBUG; + ev->loglevel = LTTNG_LOGLEVEL_PYTHON_DEBUG; } } - ev.type = LTTNG_EVENT_TRACEPOINT; - strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN); - ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; + ev->type = LTTNG_EVENT_TRACEPOINT; + strncpy(ev->name, event_name, LTTNG_SYMBOL_NAME_LEN); + ev->name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; } else { assert(0); } @@ -1055,7 +979,7 @@ static int enable_events(char *session_name) char *exclusion_string; command_ret = lttng_enable_event_with_exclusions(handle, - &ev, channel_name, + ev, channel_name, NULL, exclusion_list ? strutils_array_of_strings_len(exclusion_list) : 0, exclusion_list); @@ -1086,6 +1010,12 @@ static int enable_events(char *session_name) error = 1; break; } + case LTTNG_ERR_SDT_PROBE_SEMAPHORE: + ERR("SDT probes %s guarded by semaphores are not supported (channel %s, session %s)", + event_name, print_channel_name(channel_name), + session_name); + error = 1; + break; default: ERR("Event %s%s: %s (channel %s, session %s)", event_name, exclusion_string, @@ -1131,9 +1061,9 @@ static int enable_events(char *session_name) char *exclusion_string; /* Filter present */ - ev.filter = 1; + ev->filter = 1; - command_ret = lttng_enable_event_with_exclusions(handle, &ev, channel_name, + command_ret = lttng_enable_event_with_exclusions(handle, ev, channel_name, opt_filter, exclusion_list ? strutils_array_of_strings_len(exclusion_list) : 0, exclusion_list); @@ -1156,7 +1086,7 @@ static int enable_events(char *session_name) case LTTNG_ERR_TRACE_ALREADY_STARTED: { const char *msg = "The command tried to enable an event in a new domain for a session that has already been started once."; - ERR("Event %s%s: %s (channel %s, session %s, filter \'%s\')", ev.name, + ERR("Event %s%s: %s (channel %s, session %s, filter \'%s\')", ev->name, exclusion_string, msg, print_channel_name(channel_name), @@ -1165,7 +1095,7 @@ static int enable_events(char *session_name) break; } default: - ERR("Event %s%s: %s (channel %s, session %s, filter \'%s\')", ev.name, + ERR("Event %s%s: %s (channel %s, session %s, filter \'%s\')", ev->name, exclusion_string, lttng_strerror(command_ret), command_ret == -LTTNG_ERR_NEED_CHANNEL_NAME @@ -1188,12 +1118,12 @@ static int enable_events(char *session_name) if (lttng_opt_mi) { if (command_ret) { success = 0; - ev.enabled = 0; + ev->enabled = 0; } else { - ev.enabled = 1; + ev->enabled = 1; } - ret = mi_lttng_event(writer, &ev, 1, handle->domain.type); + ret = mi_lttng_event(writer, ev, 1, handle->domain.type); if (ret) { ret = CMD_ERROR; goto error; @@ -1247,12 +1177,14 @@ error: } lttng_destroy_handle(handle); strutils_free_null_terminated_array_of_strings(exclusion_list); + lttng_userspace_probe_location_destroy(uprobe_loc); /* Overwrite ret with error_holder if there was an actual error with * enabling an event. */ ret = error_holder ? error_holder : ret; + lttng_event_destroy(ev); return ret; } @@ -1264,6 +1196,7 @@ int cmd_enable_events(int argc, const char **argv) int opt, ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success = 1; static poptContext pc; char *session_name = NULL; + const char *leftover = NULL; int event_type = -1; pc = poptGetContext(NULL, argc, argv, long_options, 0); @@ -1283,6 +1216,9 @@ int cmd_enable_events(int argc, const char **argv) case OPT_PROBE: opt_event_type = LTTNG_EVENT_PROBE; break; + case OPT_USERSPACE_PROBE: + opt_event_type = LTTNG_EVENT_USERSPACE_PROBE; + break; case OPT_FUNCTION: opt_event_type = LTTNG_EVENT_FUNCTION; break; @@ -1325,7 +1261,9 @@ int cmd_enable_events(int argc, const char **argv) } ret = print_missing_or_multiple_domains( - opt_kernel + opt_userspace + opt_jul + opt_log4j + opt_python); + opt_kernel + opt_userspace + opt_jul + opt_log4j + + opt_python, + true); if (ret) { ret = CMD_ERROR; goto end; @@ -1363,6 +1301,13 @@ int cmd_enable_events(int argc, const char **argv) goto end; } + leftover = poptGetArg(pc); + if (leftover) { + ERR("Unknown argument: %s", leftover); + ret = CMD_ERROR; + goto end; + } + if (!opt_session_name) { session_name = get_session_name(); if (session_name == NULL) {