X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.cpp;fp=src%2Fbin%2Flttng-sessiond%2Fust-registry.cpp;h=57aa2236fcbe08d7a26710462c038000dc462c98;hp=a6ceece9882dad64dfd20606eb2148446bad05e4;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hpb=52e345b9ac912d033c2a2c25a170a01cf209839d diff --git a/src/bin/lttng-sessiond/ust-registry.cpp b/src/bin/lttng-sessiond/ust-registry.cpp index a6ceece98..57aa2236f 100644 --- a/src/bin/lttng-sessiond/ust-registry.cpp +++ b/src/bin/lttng-sessiond/ust-registry.cpp @@ -7,12 +7,12 @@ #define _LGPL_SOURCE -#include "ust-registry.hpp" #include "lttng-sessiond.hpp" #include "notification-thread-commands.hpp" #include "ust-app.hpp" #include "ust-registry-session-pid.hpp" #include "ust-registry-session-uid.hpp" +#include "ust-registry.hpp" #include "utils.hpp" #include @@ -20,6 +20,7 @@ #include #include #include + #include #include @@ -36,7 +37,7 @@ static void ust_registry_event_destroy_rcu(struct rcu_head *head) DIAGNOSTIC_PUSH DIAGNOSTIC_IGNORE_INVALID_OFFSETOF lttng::sessiond::ust::registry_event *event = - lttng::utils::container_of(head, <tng::sessiond::ust::registry_event::_head); + lttng::utils::container_of(head, <tng::sessiond::ust::registry_event::_head); DIAGNOSTIC_POP lttng::sessiond::ust::registry_event_destroy(event); @@ -47,7 +48,7 @@ static void ust_registry_event_destroy_rcu(struct rcu_head *head) * This MUST be called within a RCU read side lock section. */ void ust_registry_channel_destroy_event(lsu::registry_channel *chan, - lttng::sessiond::ust::registry_event *event) + lttng::sessiond::ust::registry_event *event) { int ret; struct lttng_ht_iter iter; @@ -67,18 +68,25 @@ void ust_registry_channel_destroy_event(lsu::registry_channel *chan, } lsu::registry_session *ust_registry_session_per_uid_create(const lttng::sessiond::trace::abi& abi, - uint32_t major, - uint32_t minor, - const char *root_shm_path, - const char *shm_path, - uid_t euid, - gid_t egid, - uint64_t tracing_id, - uid_t tracing_uid) + uint32_t major, + uint32_t minor, + const char *root_shm_path, + const char *shm_path, + uid_t euid, + gid_t egid, + uint64_t tracing_id, + uid_t tracing_uid) { try { - return new lsu::registry_session_per_uid(abi, major, minor, root_shm_path, shm_path, - euid, egid, tracing_id, tracing_uid); + return new lsu::registry_session_per_uid(abi, + major, + minor, + root_shm_path, + shm_path, + euid, + egid, + tracing_id, + tracing_uid); } catch (const std::exception& ex) { ERR("Failed to create per-uid registry session: %s", ex.what()); return nullptr; @@ -86,18 +94,18 @@ lsu::registry_session *ust_registry_session_per_uid_create(const lttng::sessiond } lsu::registry_session *ust_registry_session_per_pid_create(struct ust_app *app, - const lttng::sessiond::trace::abi& abi, - uint32_t major, - uint32_t minor, - const char *root_shm_path, - const char *shm_path, - uid_t euid, - gid_t egid, - uint64_t tracing_id) + const lttng::sessiond::trace::abi& abi, + uint32_t major, + uint32_t minor, + const char *root_shm_path, + const char *shm_path, + uid_t euid, + gid_t egid, + uint64_t tracing_id) { try { - return new lsu::registry_session_per_pid(*app, abi, major, minor, root_shm_path, - shm_path, euid, egid, tracing_id); + return new lsu::registry_session_per_pid( + *app, abi, major, minor, root_shm_path, shm_path, euid, egid, tracing_id); } catch (const std::exception& ex) { ERR("Failed to create per-pid registry session: %s", ex.what()); return nullptr; @@ -113,9 +121,9 @@ void ust_registry_session_destroy(lsu::registry_session *reg) delete reg; } -lsu::registry_enum::registry_enum( - std::string in_name, enum lst::integer_type::signedness in_signedness) : - name{std::move(in_name)}, signedness{in_signedness} +lsu::registry_enum::registry_enum(std::string in_name, + enum lst::integer_type::signedness in_signedness) : + name{ std::move(in_name) }, signedness{ in_signedness } { cds_lfht_node_init(&this->node.node); this->rcu_head = {};