Clean-up: modernize pretty_xml.cpp

[lttng-tools.git] / src / bin / lttng-relayd / index.cpp

diff --git a/src/bin/lttng-relayd/index.cpp b/src/bin/lttng-relayd/index.cpp
index 426a34b2470e3b7acf0053bbba60fd58edc9b751..e3b8bde8230717a4f5e225d124f307aba135a4f1 100644 (file)
--- a/src/bin/lttng-relayd/index.cpp
+++ b/src/bin/lttng-relayd/index.cpp
@@ -16,6 +16,7 @@
 
 #include <common/common.hpp>
 #include <common/compat/endian.hpp>
+#include <common/urcu.hpp>
 #include <common/utils.hpp>
 
 /*
@@ -42,13 +43,13 @@ static struct relay_index *relay_index_create(struct relay_stream *stream, uint6
        if (!stream_get(stream)) {
                ERR("Cannot get stream");
                free(index);
-               index = NULL;
+               index = nullptr;
                goto end;
        }
        index->stream = stream;
 
        lttng_ht_node_init_u64(&index->index_n, net_seq_num);
-       pthread_mutex_init(&index->lock, NULL);
+       pthread_mutex_init(&index->lock, nullptr);
        urcu_ref_init(&index->ref);
 
 end:
@@ -81,7 +82,7 @@ static struct relay_index *relay_index_add_unique(struct relay_stream *stream,
        if (node_ptr != &index->index_n.node) {
                _index = caa_container_of(node_ptr, struct relay_index, index_n.node);
        } else {
-               _index = NULL;
+               _index = nullptr;
        }
        return _index;
 }
@@ -113,13 +114,13 @@ struct relay_index *relay_index_get_by_id_or_create(struct relay_stream *stream,
 {
        struct lttng_ht_node_u64 *node;
        struct lttng_ht_iter iter;
-       struct relay_index *index = NULL;
+       struct relay_index *index = nullptr;
 
        DBG3("Finding index for stream id %" PRIu64 " and seq_num %" PRIu64,
             stream->stream_handle,
             net_seq_num);
 
-       rcu_read_lock();
+       lttng::urcu::read_lock_guard read_lock;
        lttng_ht_lookup(stream->indexes_ht, &net_seq_num, &iter);
        node = lttng_ht_iter_get_node_u64(&iter);
        if (node) {
@@ -140,7 +141,7 @@ struct relay_index *relay_index_get_by_id_or_create(struct relay_stream *stream,
                        relay_index_put(index);
                        index = oldindex;
                        if (!relay_index_get(index)) {
-                               index = NULL;
+                               index = nullptr;
                        }
                } else {
                        stream->indexes_in_flight++;
@@ -148,7 +149,6 @@ struct relay_index *relay_index_get_by_id_or_create(struct relay_stream *stream,
                }
        }
 end:
-       rcu_read_unlock();
        DBG2("Index %sfound or created in HT for stream ID %" PRIu64 " and seqnum %" PRIu64,
             (index == NULL) ? "NOT " : "",
             stream->stream_handle,
@@ -219,7 +219,7 @@ static void index_release(struct urcu_ref *ref)
 
        if (index->index_file) {
                lttng_index_file_put(index->index_file);
-               index->index_file = NULL;
+               index->index_file = nullptr;
        }
        if (index->in_hash_table) {
                /* Delete index from hash table. */
@@ -230,7 +230,7 @@ static void index_release(struct urcu_ref *ref)
        }
 
        stream_put(index->stream);
-       index->stream = NULL;
+       index->stream = nullptr;
 
        call_rcu(&index->rcu_node, index_destroy_rcu);
 }
@@ -249,14 +249,13 @@ void relay_index_put(struct relay_index *index)
        /*
         * Ensure existence of index->lock for index unlock.
         */
-       rcu_read_lock();
+       lttng::urcu::read_lock_guard read_lock;
        /*
         * Index lock ensures that concurrent test and update of stream
         * ref is atomic.
         */
        LTTNG_ASSERT(index->ref.refcount != 0);
        urcu_ref_put(&index->ref, index_release);
-       rcu_read_unlock();
 }
 
 /*
@@ -306,12 +305,12 @@ void relay_index_close_all(struct relay_stream *stream)
        struct lttng_ht_iter iter;
        struct relay_index *index;
 
-       rcu_read_lock();
+       lttng::urcu::read_lock_guard read_lock;
+
        cds_lfht_for_each_entry (stream->indexes_ht->ht, &iter.iter, index, index_n.node) {
                /* Put self-ref from index. */
                relay_index_put(index);
        }
-       rcu_read_unlock();
 }
 
 void relay_index_close_partial_fd(struct relay_stream *stream)
@@ -319,7 +318,8 @@ void relay_index_close_partial_fd(struct relay_stream *stream)
        struct lttng_ht_iter iter;
        struct relay_index *index;
 
-       rcu_read_lock();
+       lttng::urcu::read_lock_guard read_lock;
+
        cds_lfht_for_each_entry (stream->indexes_ht->ht, &iter.iter, index, index_n.node) {
                if (!index->index_file) {
                        continue;
@@ -331,7 +331,6 @@ void relay_index_close_partial_fd(struct relay_stream *stream)
                 */
                relay_index_put(index);
        }
-       rcu_read_unlock();
 }
 
 uint64_t relay_index_find_last(struct relay_stream *stream)
@@ -340,13 +339,14 @@ uint64_t relay_index_find_last(struct relay_stream *stream)
        struct relay_index *index;
        uint64_t net_seq_num = -1ULL;
 
-       rcu_read_lock();
+       lttng::urcu::read_lock_guard read_lock;
+
        cds_lfht_for_each_entry (stream->indexes_ht->ht, &iter.iter, index, index_n.node) {
                if (net_seq_num == -1ULL || index->index_n.key > net_seq_num) {
                        net_seq_num = index->index_n.key;
                }
        }
-       rcu_read_unlock();
+
        return net_seq_num;
 }
 
@@ -390,16 +390,16 @@ int relay_index_switch_all_files(struct relay_stream *stream)
        struct relay_index *index;
        int ret = 0;
 
-       rcu_read_lock();
+       lttng::urcu::read_lock_guard read_lock;
+
        cds_lfht_for_each_entry (stream->indexes_ht->ht, &iter.iter, index, index_n.node) {
                ret = relay_index_switch_file(
                        index, stream->index_file, stream->pos_after_last_complete_data_index);
                if (ret) {
-                       goto end;
+                       return ret;
                }
        }
-end:
-       rcu_read_unlock();
+
        return ret;
 }