Clean-up: modernize pretty_xml.cpp

[lttng-tools.git] / src / bin / lttng-sessiond / ust-registry-session.cpp

diff --git a/src/bin/lttng-sessiond/ust-registry-session.cpp b/src/bin/lttng-sessiond/ust-registry-session.cpp
index 0bca522d1bc66d5518f23dd93eaddafda78f322a..d0891fe9a87325a3d245e52cbe001c5a2c401c41 100644 (file)
--- a/src/bin/lttng-sessiond/ust-registry-session.cpp
+++ b/src/bin/lttng-sessiond/ust-registry-session.cpp
@@ -240,7 +240,7 @@ lsu::registry_session::registry_session(const struct lst::abi& in_abi,
        lst::trace_class(in_abi, generate_uuid_or_throw()),
        _root_shm_path{ root_shm_path ? root_shm_path : "" },
        _shm_path{ shm_path ? shm_path : "" },
-       _metadata_path{ _shm_path.size() > 0 ? fmt::format("{}/metadata", _shm_path) :
+       _metadata_path{ _shm_path.size() > 0 ? lttng::format("{}/metadata", _shm_path) :
                                               std::string("") },
        _uid{ euid },
        _gid{ egid },
@@ -252,7 +252,7 @@ lsu::registry_session::registry_session(const struct lst::abi& in_abi,
                [this](const std::string& fragment) { _append_metadata_fragment(fragment); }) },
        _packet_header{ _create_packet_header() }
 {
-       pthread_mutex_init(&_lock, NULL);
+       pthread_mutex_init(&_lock, nullptr);
        if (_shm_path.size() > 0) {
                if (run_as_mkdir_recursive(_shm_path.c_str(), S_IRWXU | S_IRWXG, euid, egid)) {
                        LTTNG_THROW_POSIX("run_as_mkdir_recursive", errno);
@@ -268,7 +268,7 @@ lsu::registry_session::registry_session(const struct lst::abi& in_abi,
                                            egid);
                if (ret < 0) {
                        LTTNG_THROW_POSIX(
-                               fmt::format(
+                               lttng::format(
                                        "Failed to open metadata file during registry session creation: path = {}",
                                        _metadata_path),
                                errno);
@@ -283,8 +283,8 @@ lsu::registry_session::registry_session(const struct lst::abi& in_abi,
        }
 
        /* hash/match functions are specified at call site. */
-       _enums->match_fct = NULL;
-       _enums->hash_fct = NULL;
+       _enums->match_fct = nullptr;
+       _enums->hash_fct = nullptr;
 
        _channels.reset(lttng_ht_new(0, LTTNG_HT_TYPE_U64));
        if (!_channels) {
@@ -451,7 +451,7 @@ void lsu::registry_session::add_channel(uint64_t key)
         * the metadata can be dumped for that event.
         */
        if (is_max_channel_id(_used_channel_id)) {
-               LTTNG_THROW_ERROR(fmt::format(
+               LTTNG_THROW_ERROR(lttng::format(
                        "Failed to allocate unique id for channel under session while adding channel"));
        }
 
@@ -496,8 +496,8 @@ lttng::sessiond::ust::registry_channel& lsu::registry_session::channel(uint64_t
        lttng_ht_lookup(_channels.get(), &channel_key, &iter);
        node = lttng_ht_iter_get_node_u64(&iter);
        if (!node) {
-               LTTNG_THROW_INVALID_ARGUMENT_ERROR(
-                       fmt::format("Invalid channel key provided: channel key = {}", channel_key));
+               LTTNG_THROW_INVALID_ARGUMENT_ERROR(lttng::format(
+                       "Invalid channel key provided: channel key = {}", channel_key));
        }
 
        DIAGNOSTIC_PUSH
@@ -702,7 +702,7 @@ void lsu::registry_session::regenerate_metadata()
 lsu::registry_enum::const_rcu_protected_reference
 lsu::registry_session::enumeration(const char *enum_name, uint64_t enum_id) const
 {
-       lsu::registry_enum *reg_enum = NULL;
+       lsu::registry_enum *reg_enum = nullptr;
        struct lttng_ht_node_str *node;
        struct lttng_ht_iter iter;
        lttng::urcu::unique_read_lock rcu_lock;
@@ -722,7 +722,7 @@ lsu::registry_session::enumeration(const char *enum_name, uint64_t enum_id) cons
                        &iter.iter);
        node = lttng_ht_iter_get_node_str(&iter);
        if (!node) {
-               LTTNG_THROW_PROTOCOL_ERROR(fmt::format(
+               LTTNG_THROW_PROTOCOL_ERROR(lttng::format(
                        "Unknown enumeration referenced by application event field: enum name = `{}`, enum id = {}",
                        enum_name,
                        enum_id));
@@ -743,7 +743,7 @@ lsu::registry_session::enumeration(const char *enum_name, uint64_t enum_id) cons
 lsu::registry_enum *
 lsu::registry_session::_lookup_enum(const lsu::registry_enum *reg_enum_lookup) const
 {
-       lsu::registry_enum *reg_enum = NULL;
+       lsu::registry_enum *reg_enum = nullptr;
        struct lttng_ht_node_str *node;
        struct lttng_ht_iter iter;
 
@@ -783,10 +783,10 @@ void lsu::registry_session::create_or_find_enum(int session_objd,
                                                uint64_t *enum_id)
 {
        struct cds_lfht_node *nodep;
-       lsu::registry_enum *reg_enum = NULL, *old_reg_enum;
+       lsu::registry_enum *reg_enum = nullptr, *old_reg_enum;
        lttng::urcu::read_lock_guard read_lock_guard;
-       auto entries =
-               lttng::make_unique_wrapper<lttng_ust_ctl_enum_entry, lttng::free>(raw_entries);
+       auto entries = lttng::make_unique_wrapper<lttng_ust_ctl_enum_entry, lttng::memory::free>(
+               raw_entries);
 
        LTTNG_ASSERT(enum_name);
 
@@ -795,12 +795,12 @@ void lsu::registry_session::create_or_find_enum(int session_objd,
         * external party, don't assert and simply validate values.
         */
        if (session_objd < 0) {
-               LTTNG_THROW_INVALID_ARGUMENT_ERROR(fmt::format(
+               LTTNG_THROW_INVALID_ARGUMENT_ERROR(lttng::format(
                        "Invalid parameters used to create or look-up enumeration from registry session: session_objd = {}",
                        session_objd));
        }
        if (nr_entries == 0) {
-               LTTNG_THROW_INVALID_ARGUMENT_ERROR(fmt::format(
+               LTTNG_THROW_INVALID_ARGUMENT_ERROR(lttng::format(
                        "Invalid parameters used to create or look-up enumeration from registry session: nr_entries = {}",
                        nr_entries));
        }