X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng%2Fuserspace-probe-internal.h;h=ef6a5726e1edf64710dea6826ea8472e5aa9555a;hp=9c580323c822be55cdcef4ff8eb7fe3321921eef;hb=refs%2Fheads%2Fsow-2019-0002-rev1;hpb=394357fe3de7a15a81b5a25bddf3d82a64c1f65a;ds=sidebyside

diff --git a/include/lttng/userspace-probe-internal.h b/include/lttng/userspace-probe-internal.h
index 9c580323c..ef6a5726e 100644
--- a/include/lttng/userspace-probe-internal.h
+++ b/include/lttng/userspace-probe-internal.h
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2017 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
- * Copyright (C) 2018 - Francis Deslauriers <francis.deslauriers@efficios.com>
+ * Copyright (C) 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2018 Francis Deslauriers <francis.deslauriers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library 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 Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef LTTNG_USERSPACE_PROBE_INTERNAL_H
@@ -24,6 +14,10 @@
 #include <common/dynamic-buffer.h>
 #include <common/buffer-view.h>
 
+typedef bool (*userspace_probe_location_equal_cb)(
+		const struct lttng_userspace_probe_location *a,
+		const struct lttng_userspace_probe_location *b);
+
 /*
  * No elf-specific comm structure is defined since no elf-specific payload is
  * currently needed.
@@ -44,6 +38,10 @@ struct lttng_userspace_probe_location_lookup_method_elf {
 	struct lttng_userspace_probe_location_lookup_method parent;
 };
 
+struct lttng_userspace_probe_location_lookup_method_sdt {
+	struct lttng_userspace_probe_location_lookup_method parent;
+};
+
 struct lttng_userspace_probe_location_comm {
 	/* enum lttng_userspace_probe_location_type */
 	int8_t type;
@@ -67,10 +65,25 @@ struct lttng_userspace_probe_location_function_comm {
 	char payload[];
 } LTTNG_PACKED;
 
+struct lttng_userspace_probe_location_tracepoint_comm {
+	/* The three lengths include the trailing \0. */
+	uint32_t probe_name_len;
+	uint32_t provider_name_len;
+	uint32_t binary_path_len;
+	/*
+	 * Payload is composed of, in that order,
+	 *   - probe name (with trailing \0),
+	 *   - provider name (with trailing \0),
+	 *   - absolute binary path (with trailing \0)
+	 */
+	char payload[];
+} LTTNG_PACKED;
+
 /* Common ancestor of all userspace probe locations. */
 struct lttng_userspace_probe_location {
 	enum lttng_userspace_probe_location_type type;
 	struct lttng_userspace_probe_location_lookup_method *lookup_method;
+	userspace_probe_location_equal_cb equal;
 };
 
 struct lttng_userspace_probe_location_function {
@@ -84,6 +97,21 @@ struct lttng_userspace_probe_location_function {
 	 * Set to -1 if not open.
 	 */
 	int binary_fd;
+	enum lttng_userspace_probe_location_function_instrumentation_type instrumentation_type;
+};
+
+struct lttng_userspace_probe_location_tracepoint {
+	struct lttng_userspace_probe_location parent;
+	char *probe_name;
+	char *provider_name;
+	char *binary_path;
+	/*
+	 * binary_fd is a file descriptor to the executable file. It's open
+	 * early on to keep the backing inode valid over the course of the
+	 * intrumentation and use. It prevents deletion and reuse races.
+	 * Set to -1 if not open.
+	 */
+	int binary_fd;
 };
 
 LTTNG_HIDDEN
@@ -101,6 +129,10 @@ LTTNG_HIDDEN
 int lttng_userspace_probe_location_function_set_binary_fd(
 		struct lttng_userspace_probe_location *location, int binary_fd);
 
+LTTNG_HIDDEN
+int lttng_userspace_probe_location_tracepoint_set_binary_fd(
+		struct lttng_userspace_probe_location *location, int binary_fd);
+
 /*
  * Returns a version of the location that is serialized to a contiguous region
  * of memory. Pass NULL to buffer to only get the storage requirement of the
@@ -115,4 +147,13 @@ LTTNG_HIDDEN
 struct lttng_userspace_probe_location *lttng_userspace_probe_location_copy(
 		const struct lttng_userspace_probe_location *location);
 
+LTTNG_HIDDEN
+bool lttng_userspace_probe_location_is_equal(
+		const struct lttng_userspace_probe_location *a,
+		const struct lttng_userspace_probe_location *b);
+
+LTTNG_HIDDEN
+int lttng_userspace_probe_location_set_binary_fd(
+		struct lttng_userspace_probe_location *location, int fd);
+
 #endif /* LTTNG_USERSPACE_PROBE_INTERNAL_H */