Clean-up: ust-consumer: fix -Wshadow issues in lttng_ustconsumer_recv_cmd

[lttng-tools.git] / include / lttng / userspace-probe-internal.h

diff --git a/include/lttng/userspace-probe-internal.h b/include/lttng/userspace-probe-internal.h
index d9e5de254c6937cae82495c5e7a15a837b46476f..b530e2963b70dfe4a2e9155e8754bbe0fd0b951c 100644 (file)
--- a/include/lttng/userspace-probe-internal.h
+++ b/include/lttng/userspace-probe-internal.h
@@ -11,6 +11,7 @@
 
 #include <lttng/userspace-probe.h>
 #include <common/macros.h>
+#include <common/fd-handle.h>
 #include <stdbool.h>
 
 struct lttng_payload;
@@ -20,6 +21,8 @@ struct lttng_dynamic_buffer;
 typedef bool (*userspace_probe_location_equal_cb)(
                const struct lttng_userspace_probe_location *a,
                const struct lttng_userspace_probe_location *b);
+typedef unsigned long (*userspace_probe_location_hash_cb)(
+               const struct lttng_userspace_probe_location *location);
 
 /*
  * No elf-specific comm structure is defined since no elf-specific payload is
@@ -87,6 +90,7 @@ 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;
+       userspace_probe_location_hash_cb hash;
 };
 
 struct lttng_userspace_probe_location_function {
@@ -97,9 +101,8 @@ struct lttng_userspace_probe_location_function {
         * 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;
+       struct fd_handle *binary_fd_handle;
        enum lttng_userspace_probe_location_function_instrumentation_type instrumentation_type;
 };
 
@@ -112,9 +115,8 @@ struct lttng_userspace_probe_location_tracepoint {
         * 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;
+       struct fd_handle *binary_fd_handle;
 };
 
 LTTNG_HIDDEN
@@ -127,14 +129,6 @@ int lttng_userspace_probe_location_create_from_payload(
                struct lttng_payload_view *view,
                struct lttng_userspace_probe_location **probe_location);
 
-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
@@ -159,4 +153,8 @@ bool lttng_userspace_probe_location_is_equal(
                const struct lttng_userspace_probe_location *a,
                const struct lttng_userspace_probe_location *b);
 
+LTTNG_HIDDEN
+unsigned long lttng_userspace_probe_location_hash(
+               const struct lttng_userspace_probe_location *location);
+
 #endif /* LTTNG_USERSPACE_PROBE_INTERNAL_H */