Fix: userspace probe accessors are not const-correct

[lttng-tools.git] / src / bin / lttng-sessiond / kernel.c

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index e13925e27c715d2dc796184f105bdef759df3257..e7f1d54a02bde7ecb72ec2e16e122982aeae319c 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -203,16 +203,15 @@ error:
  */
 static
 int extract_userspace_probe_offset_function_elf(
-               struct lttng_userspace_probe_location *probe_location,
+               const struct lttng_userspace_probe_location *probe_location,
                struct ltt_kernel_session *session, uint64_t *offset)
 {
        int fd;
        int ret = 0;
        const char *symbol = NULL;
-       struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
+       const struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
        enum lttng_userspace_probe_location_lookup_method_type lookup_method_type;
 
-
        assert(lttng_userspace_probe_location_get_type(probe_location) ==
                        LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION);
 
@@ -266,12 +265,12 @@ end:
  */
 static
 int extract_userspace_probe_offset_tracepoint_sdt(
-               struct lttng_userspace_probe_location *probe_location,
+               const struct lttng_userspace_probe_location *probe_location,
                struct ltt_kernel_session *session, uint64_t **offsets,
                uint32_t *offsets_count)
 {
        enum lttng_userspace_probe_location_lookup_method_type lookup_method_type;
-       struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
+       const struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
        const char *probe_name = NULL, *provider_name = NULL;
        int ret = 0;
        int fd, i;
@@ -342,9 +341,9 @@ static
 int userspace_probe_add_callsites(struct lttng_event *ev,
                        struct ltt_kernel_session *session, int fd)
 {
-       struct lttng_userspace_probe_location_lookup_method *lookup_method = NULL;
+       const struct lttng_userspace_probe_location_lookup_method *lookup_method = NULL;
        enum lttng_userspace_probe_location_lookup_method_type type;
-       struct lttng_userspace_probe_location *location = NULL;
+       const struct lttng_userspace_probe_location *location = NULL;
        int ret;
 
        assert(ev);
@@ -492,6 +491,13 @@ int kernel_create_event(struct lttng_event *ev,
                }
        }
 
+       if (ev->type == LTTNG_EVENT_USERSPACE_PROBE) {
+               ret = userspace_probe_add_callsites(ev, channel->session, event->fd);
+               if (ret) {
+                       goto add_callsite_error;
+               }
+       }
+
        err = kernctl_enable(event->fd);
        if (err < 0) {
                switch (-err) {
@@ -514,6 +520,7 @@ int kernel_create_event(struct lttng_event *ev,
 
        return 0;
 
+add_callsite_error:
 enable_error:
 filter_error:
        {