From 5c32d0aeb3f1e338ff61f9b5c865a01763a3ec4b Mon Sep 17 00:00:00 2001 From: Julien Desfossez Date: Tue, 11 Nov 2014 15:57:47 -0500 Subject: [PATCH] Fix: removed useless key from relay_index MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This field was never used except in debug messages (instead of using the good value that is part of index_n). Signed-off-by: Julien Desfossez Signed-off-by: Jérémie Galarneau --- src/bin/lttng-relayd/index.c | 10 ++++++---- src/bin/lttng-relayd/index.h | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/bin/lttng-relayd/index.c b/src/bin/lttng-relayd/index.c index a3190b714..b7507a022 100644 --- a/src/bin/lttng-relayd/index.c +++ b/src/bin/lttng-relayd/index.c @@ -117,7 +117,7 @@ void relay_index_add(struct relay_index *index, struct relay_index **_index) assert(index); DBG2("Adding relay index with stream id %" PRIu64 " and seqnum %" PRIu64, - index->key.key1, index->key.key2); + index->index_n.key.key1, index->index_n.key.key2); node_ptr = cds_lfht_add_unique(indexes_ht->ht, indexes_ht->hash_fct((void *) &index->index_n.key, lttng_ht_seed), @@ -142,7 +142,8 @@ int relay_index_write(int fd, struct relay_index *index) struct lttng_ht_iter iter; DBG2("Writing index for stream ID %" PRIu64 " and seq num %" PRIu64 - " on fd %d", index->key.key1, index->key.key2, fd); + " on fd %d", index->index_n.key.key1, + index->index_n.key.key2, fd); /* Delete index from hash table. */ iter.iter.node = &index->index_n.node; @@ -184,7 +185,8 @@ void relay_index_delete(struct relay_index *index) struct lttng_ht_iter iter; DBG3("Relay index with stream ID %" PRIu64 " and seq num %" PRIu64 - "deleted.", index->key.key1, index->key.key2); + " deleted.", index->index_n.key.key1, + index->index_n.key.key2); /* Delete index from hash table. */ iter.iter.node = &index->index_n.node; @@ -202,7 +204,7 @@ void relay_index_destroy_by_stream_id(uint64_t stream_id) rcu_read_lock(); cds_lfht_for_each_entry(indexes_ht->ht, &iter.iter, index, index_n.node) { - if (index->key.key1 == stream_id) { + if (index->index_n.key.key1 == stream_id) { relay_index_delete(index); relay_index_free_safe(index); } diff --git a/src/bin/lttng-relayd/index.h b/src/bin/lttng-relayd/index.h index 9a10cea44..e7f9cdbd0 100644 --- a/src/bin/lttng-relayd/index.h +++ b/src/bin/lttng-relayd/index.h @@ -39,7 +39,6 @@ struct relay_index { struct ctf_packet_index index_data; /* key1 = stream_id, key2 = net_seq_num */ - struct lttng_ht_two_u64 key; struct lttng_ht_node_two_u64 index_n; struct rcu_head rcu_node; pthread_mutex_t mutex; -- 2.34.1