X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.c;h=7faf8b128bc9baba7941ec781b24ac0b475df501;hb=b01b201a053f492b09bde7e970d950ad636eb75c;hp=7345bcbddcca8d646a1751179b7bc4de3c5865a0;hpb=f75c5439a7fe3d47edf68098f249421b701fceaf;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/ust-registry.c b/src/bin/lttng-sessiond/ust-registry.c index 7345bcbdd..7faf8b128 100644 --- a/src/bin/lttng-sessiond/ust-registry.c +++ b/src/bin/lttng-sessiond/ust-registry.c @@ -549,8 +549,8 @@ static void destroy_enum_rcu(struct rcu_head *head) * Lookup enumeration by name and comparing enumeration entries. * Needs to be called from RCU read-side critical section. */ -struct ust_registry_enum * - ust_registry_lookup_enum(struct ust_registry_session *session, +static struct ust_registry_enum *ust_registry_lookup_enum( + struct ust_registry_session *session, const struct ust_registry_enum *reg_enum_lookup) { struct ust_registry_enum *reg_enum = NULL; @@ -681,7 +681,7 @@ end: * the enumeration. * This MUST be called within a RCU read side lock section. */ -void ust_registry_destroy_enum(struct ust_registry_session *reg_session, +static void ust_registry_destroy_enum(struct ust_registry_session *reg_session, struct ust_registry_enum *reg_enum) { int ret; @@ -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);