X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.c;h=4d4094e7361836c5617e42eb61ecea84d56e1ba1;hp=615078b66bd97793713ded0ee3cad8b95d86e242;hb=1f4962443;hpb=98b73e886719378d507d500058dd4e4d7e5488bf diff --git a/src/bin/lttng-sessiond/ust-registry.c b/src/bin/lttng-sessiond/ust-registry.c index 615078b66..4d4094e73 100644 --- a/src/bin/lttng-sessiond/ust-registry.c +++ b/src/bin/lttng-sessiond/ust-registry.c @@ -558,8 +558,8 @@ struct ust_registry_enum * struct lttng_ht_iter iter; cds_lfht_lookup(session->enums->ht, - ht_hash_enum((void *) ®_enum_lookup, lttng_ht_seed), - ht_match_enum, ®_enum_lookup, &iter.iter); + ht_hash_enum((void *) reg_enum_lookup, lttng_ht_seed), + ht_match_enum, reg_enum_lookup, &iter.iter); node = lttng_ht_iter_get_node_str(&iter); if (!node) { goto end; @@ -880,7 +880,9 @@ int ust_registry_session_init(struct ust_registry_session **sessionp, const char *root_shm_path, const char *shm_path, uid_t euid, - gid_t egid) + gid_t egid, + uint64_t tracing_id, + uid_t tracing_uid) { int ret; struct ust_registry_session *session; @@ -962,6 +964,9 @@ int ust_registry_session_init(struct ust_registry_session **sessionp, goto error; } + session->tracing_id = tracing_id; + session->tracing_uid = tracing_uid; + pthread_mutex_lock(&session->lock); ret = ust_metadata_session_statedump(session, app, major, minor); pthread_mutex_unlock(&session->lock); @@ -1031,7 +1036,8 @@ void ust_registry_session_destroy(struct ust_registry_session *reg) * Try deleting the directory hierarchy. */ (void) run_as_rmdir_recursive(reg->root_shm_path, - reg->uid, reg->gid); + reg->uid, reg->gid, + LTTNG_DIRECTORY_HANDLE_SKIP_NON_EMPTY_FLAG); } /* Destroy the enum hash table */ if (reg->enums) {