Fix: skip uid registry when metadata key is 0

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

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 54c22df766f2badb44a9a1e4ae66dab17984c2c4..d3369fe39f536c45b461fc8368785b5113a8a13f 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -4084,7 +4084,9 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess,
                         */
                        continue;
                }
-               if (!trace_ust_pid_tracker_lookup(usess, app->pid)) {
+               if (!(trace_ust_id_tracker_lookup(LTTNG_TRACKER_VPID, usess, app->pid)
+                               && trace_ust_id_tracker_lookup(LTTNG_TRACKER_VUID, usess, app->uid)
+                               && trace_ust_id_tracker_lookup(LTTNG_TRACKER_VGID, usess, app->gid))) {
                        /* Skip. */
                        continue;
                }
@@ -5059,7 +5061,9 @@ void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app)
                return;
        }
 
-       if (trace_ust_pid_tracker_lookup(usess, app->pid)) {
+       if (trace_ust_id_tracker_lookup(LTTNG_TRACKER_VPID, usess, app->pid)
+                       && trace_ust_id_tracker_lookup(LTTNG_TRACKER_VUID, usess, app->uid)
+                       && trace_ust_id_tracker_lookup(LTTNG_TRACKER_VGID, usess, app->gid)) {
                ust_app_global_create(usess, app);
        } else {
                ust_app_global_destroy(usess, app);
@@ -5862,6 +5866,11 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess,
                        struct buffer_reg_channel *reg_chan;
                        struct consumer_socket *socket;
 
+                       if (!reg->registry->reg.ust->metadata_key) {
+                               /* Skip since no metadata is present */
+                               continue;
+                       }
+
                        /* Get consumer socket to use to push the metadata.*/
                        socket = consumer_find_socket_by_bitness(reg->bits_per_long,
                                        usess->consumer);