X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=2187f702954c857518e91ed2fc21a4ed7df80dd1;hp=62f99a1fcfc760e659a3ab1c3a0e775fc79dccec;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=dcabc1905756b2999886313ec33705f7571a3fb9

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 62f99a1fc..2187f7029 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 <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
  *
- * 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
@@ -36,7 +26,10 @@
 /* Mi dependancy */
 #include <common/mi-lttng.h>
 
+#include <lttng/event-internal.h>
+
 #include "../command.h"
+#include "../uprobe.h"
 
 #if (LTTNG_SYMBOL_NAME_LEN == 256)
 #define LTTNG_SYMBOL_NAME_LEN_SCANF_IS_A_BROKEN_API	"255"
@@ -143,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) {
@@ -160,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;
 		}
@@ -179,329 +177,11 @@ end:
 	return ret;
 }
 
-/*
- * Walk the directories in the PATH environment variable to find the target
- * binary passed as parameter.
- *
- * On success, the full path of the binary is copied in binary_full_path out
- * parameter. This buffer is allocated by the caller and must be at least
- * LTTNG_PATH_MAX bytes long.
- * On failure, returns -1;
- */
-static int walk_command_search_path(const char *binary, char *binary_full_path)
-{
-	char *tentative_binary_path = NULL;
-	char *command_search_path = NULL;
-	char *curr_search_dir_end = NULL;
-	char *curr_search_dir = NULL;
-	struct stat stat_output;
-	int ret = 0;
-
-	command_search_path = lttng_secure_getenv("PATH");
-	if (!command_search_path) {
-		ret = -1;
-		goto end;
-	}
-
-	/*
-	 * Duplicate the $PATH string as the char pointer returned by getenv() should
-	 * not be modified.
-	 */
-	command_search_path = strdup(command_search_path);
-	if (!command_search_path) {
-		ret = -1;
-		goto end;
-	}
-
-	/*
-	 * This char array is used to concatenate path to binary to look for
-	 * the binary.
-	 */
-	tentative_binary_path = zmalloc(LTTNG_PATH_MAX * sizeof(char));
-	if (!tentative_binary_path) {
-		ret = -1;
-		goto alloc_error;
-	}
-
-	curr_search_dir = command_search_path;
-	do {
-		/*
-		 * Split on ':'. The return value of this call points to the
-		 * matching character.
-		 */
-		curr_search_dir_end = strchr(curr_search_dir, ':');
-		if (curr_search_dir_end != NULL) {
-			/*
-			 * Add a NULL byte to the end of the first token so it
-			 * can be used as a string.
-			 */
-			curr_search_dir_end[0] = '\0';
-		}
-
-		/* Empty the tentative path */
-		memset(tentative_binary_path, 0, LTTNG_PATH_MAX * sizeof(char));
-
-		/*
-		 * Build the tentative path to the binary using the current
-		 * search directory and the name of the binary.
-		 */
-		ret = snprintf(tentative_binary_path, LTTNG_PATH_MAX, "%s/%s",
-				curr_search_dir, binary);
-		if (ret < 0) {
-			goto free_binary_path;
-		}
-		if (ret < LTTNG_PATH_MAX) {
-			 /*
-			  * Use STAT(2) to see if the file exists.
-			 */
-			ret = stat(tentative_binary_path, &stat_output);
-			if (ret == 0) {
-				/*
-				 * Verify that it is a regular file or a
-				 * symlink and not a special file (e.g.
-				 * device).
-				 */
-				if (S_ISREG(stat_output.st_mode)
-						|| S_ISLNK(stat_output.st_mode)) {
-					/*
-					 * Found a match, set the out parameter
-					 * and return success.
-					 */
-					ret = lttng_strncpy(binary_full_path,
-							tentative_binary_path,
-							LTTNG_PATH_MAX);
-					if (ret == -1) {
-						ERR("Source path does not fit "
-							"in destination buffer.");
-					}
-					goto free_binary_path;
-				}
-			}
-		}
-		/* Go to the next entry in the $PATH variable. */
-		curr_search_dir = curr_search_dir_end + 1;
-	} while (curr_search_dir_end != NULL);
-
-free_binary_path:
-	free(tentative_binary_path);
-alloc_error:
-	free(command_search_path);
-end:
-	return ret;
-}
-
-/*
- * Parse userspace probe options
- * Set the userspace probe fields in the lttng_event struct and set the
- * target_path to the path to the binary.
- */
-static int parse_userspace_probe_opts(struct lttng_event *ev, char *opt)
-{
-	int ret = CMD_SUCCESS;
-	int num_token;
-	char **tokens;
-	char *target_path = NULL;
-	char *unescaped_target_path = NULL;
-	char *real_target_path = NULL;
-	char *symbol_name = NULL, *probe_name = NULL, *provider_name = NULL;
-	struct lttng_userspace_probe_location *probe_location = NULL;
-	struct lttng_userspace_probe_location_lookup_method *lookup_method =
-			NULL;
-
-	if (opt == NULL) {
-		ret = CMD_ERROR;
-		goto end;
-	}
-
-	/*
-	 * userspace probe fields are separated by ':'.
-	 */
-	tokens = strutils_split(opt, ':', 1);
-	num_token = strutils_array_of_strings_len(tokens);
-
-	/*
-	 * Early sanity check that the number of parameter is between 2 and 4
-	 * inclusively.
-	 * elf:PATH:SYMBOL
-	 * std:PATH:PROVIDER_NAME:PROBE_NAME
-	 * PATH:SYMBOL (same behavior as ELF)
-	 */
-	if (num_token < 2 || num_token > 4) {
-		ret = CMD_ERROR;
-		goto end_string;
-	}
-
-	/*
-	 * Looking up the first parameter will tell the technique to use to
-	 * interpret the userspace probe/function description.
-	 */
-	switch (num_token) {
-	case 2:
-		/* When the probe type is omitted we assume ELF for now. */
-	case 3:
-		if (num_token == 3 && strcmp(tokens[0], "elf") == 0) {
-			target_path = tokens[1];
-			symbol_name = tokens[2];
-		} else if (num_token == 2) {
-			target_path = tokens[0];
-			symbol_name = tokens[1];
-		} else {
-			ret = CMD_ERROR;
-			goto end_string;
-		}
-		lookup_method =
-			lttng_userspace_probe_location_lookup_method_function_elf_create();
-		if (!lookup_method) {
-			WARN("Failed to create ELF lookup method");
-			ret = CMD_ERROR;
-			goto end_string;
-		}
-		break;
-	case 4:
-		if (strcmp(tokens[0], "sdt") == 0) {
-			target_path = tokens[1];
-			provider_name = tokens[2];
-			probe_name = tokens[3];
-		} else {
-			ret = CMD_ERROR;
-			goto end_string;
-		}
-		lookup_method =
-			lttng_userspace_probe_location_lookup_method_tracepoint_sdt_create();
-		if (!lookup_method) {
-			WARN("Failed to create ELF lookup method");
-			ret = CMD_ERROR;
-			goto end_string;
-		}
-		break;
-	default:
-		ret = CMD_ERROR;
-		goto end_string;
-	}
-
-	/* strutils_unescape_string allocates a new char *. */
-	unescaped_target_path = strutils_unescape_string(target_path, 0);
-	if (!unescaped_target_path) {
-		ret = -LTTNG_ERR_INVALID;
-		goto end_string;
-	}
-
-	/*
-	 * If there is not forward slash in the path. Walk the $PATH else
-	 * expand.
-	 */
-	if (strchr(target_path, '/') == NULL) {
-		/* Walk the $PATH variable to find the targeted binary. */
-		real_target_path = zmalloc(LTTNG_PATH_MAX * sizeof(char));
-		if (!real_target_path) {
-			PERROR("Error allocating path buffer");
-			ret = CMD_ERROR;
-			goto end_unescaped_string;
-		}
-		ret = walk_command_search_path(target_path, real_target_path);
-		if (ret) {
-			ERR("Binary not found.");
-			ret = CMD_ERROR;
-			goto end_free_path;
-		}
-	} else {
-		/*
-		 * Expand references to `/./` and `/../`. This function does not check
-		 * if the file exists.
-		 */
-		real_target_path = utils_expand_path_keep_symlink(target_path);
-		if (!real_target_path) {
-			ERR("Error expanding the path to binary.");
-			ret = CMD_ERROR;
-			goto end_free_path;
-		}
-
-		/*
-		 * Check if the file exists using access(2). If it does not, walk the
-		 * $PATH.
-		 */
-		ret = access(real_target_path, F_OK);
-		if (ret) {
-			ret = CMD_ERROR;
-			goto end_free_path;
-		}
-	}
-
-	switch (lttng_userspace_probe_location_lookup_method_get_type(lookup_method)) {
-	case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_FUNCTION_ELF:
-		probe_location = lttng_userspace_probe_location_function_create(
-				real_target_path, symbol_name, lookup_method);
-		if (!probe_location) {
-			WARN("Failed to create function probe location");
-			ret = CMD_ERROR;
-			goto end_destroy_lookup_method;
-		}
-
-		/* Ownership transferred to probe_location. */
-		lookup_method = NULL;
-
-		ret = lttng_event_set_userspace_probe_location(ev, probe_location);
-		if (ret) {
-			WARN("Failed to set probe location on event");
-			ret = CMD_ERROR;
-			goto end_destroy_location;
-		}
-		break;
-	case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_TRACEPOINT_SDT:
-		probe_location = lttng_userspace_probe_location_tracepoint_create(
-				real_target_path, provider_name, probe_name, lookup_method);
-		if (!probe_location) {
-			WARN("Failed to create function probe location");
-			ret = CMD_ERROR;
-			goto end_destroy_lookup_method;
-		}
-
-		/* Ownership transferred to probe_location. */
-		lookup_method = NULL;
-
-		ret = lttng_event_set_userspace_probe_location(ev, probe_location);
-		if (ret) {
-			WARN("Failed to set probe location on event");
-			ret = CMD_ERROR;
-			goto end_destroy_location;
-		}
-		break;
-	default:
-		ret = CMD_ERROR;
-		goto end_string;
-	}
-
-	switch (ev->type) {
-	case LTTNG_EVENT_USERSPACE_PROBE:
-		break;
-	default:
-		assert(0);
-	}
-
-	goto end;
-
-end_destroy_location:
-	lttng_userspace_probe_location_destroy(probe_location);
-end_destroy_lookup_method:
-	lttng_userspace_probe_location_lookup_method_destroy(lookup_method);
-end_free_path:
-	/*
-	 * Free path that was allocated by the call to realpath() or when walking
-	 * the PATH.
-	 */
-	free(real_target_path);
-end_unescaped_string:
-	free(unescaped_target_path);
-end_string:
-	strutils_free_null_terminated_array_of_strings(tokens);
-end:
-	return ret;
-}
-
 /*
  * Maps LOG4j loglevel from string to value
  */
-static int loglevel_log4j_str_to_value(const char *inputstr)
+LTTNG_HIDDEN
+int loglevel_log4j_str_to_value(const char *inputstr)
 {
 	int i = 0;
 	char str[LTTNG_SYMBOL_NAME_LEN];
@@ -544,7 +224,8 @@ static int loglevel_log4j_str_to_value(const char *inputstr)
 /*
  * Maps JUL loglevel from string to value
  */
-static int loglevel_jul_str_to_value(const char *inputstr)
+LTTNG_HIDDEN
+int loglevel_jul_str_to_value(const char *inputstr)
 {
 	int i = 0;
 	char str[LTTNG_SYMBOL_NAME_LEN];
@@ -589,7 +270,8 @@ static int loglevel_jul_str_to_value(const char *inputstr)
 /*
  * Maps Python loglevel from string to value
  */
-static int loglevel_python_str_to_value(const char *inputstr)
+LTTNG_HIDDEN
+int loglevel_python_str_to_value(const char *inputstr)
 {
 	int i = 0;
 	char str[LTTNG_SYMBOL_NAME_LEN];
@@ -628,7 +310,7 @@ static int loglevel_python_str_to_value(const char *inputstr)
 /*
  * Maps loglevel from string to value
  */
-static
+LTTNG_HIDDEN
 int loglevel_str_to_value(const char *inputstr)
 {
 	int i = 0;
@@ -737,7 +419,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;
 
@@ -750,9 +432,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;
 	}
@@ -829,7 +510,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)
@@ -907,6 +597,7 @@ static int enable_events(char *session_name)
 	struct lttng_event *ev;
 	struct lttng_domain dom;
 	char **exclusion_list = NULL;
+	struct lttng_userspace_probe_location *uprobe_loc = NULL;
 
 	memset(&dom, 0, sizeof(dom));
 
@@ -965,6 +656,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);
@@ -1270,12 +985,35 @@ static int enable_events(char *session_name)
 				}
 				break;
 			case LTTNG_EVENT_USERSPACE_PROBE:
-				ret = parse_userspace_probe_opts(ev, opt_userspace_probe);
+				assert(ev->type == LTTNG_EVENT_USERSPACE_PROBE);
+
+				ret = parse_userspace_probe_opts(opt_userspace_probe, &uprobe_loc);
 				if (ret) {
-					ERR("Unable to parse userspace probe options");
+					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);
@@ -1592,6 +1330,7 @@ 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.
@@ -1675,7 +1414,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;