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 <jdesfossez@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
assert(index);
DBG2("Adding relay index with stream id %" PRIu64 " and seqnum %" PRIu64,
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),
node_ptr = cds_lfht_add_unique(indexes_ht->ht,
indexes_ht->hash_fct((void *) &index->index_n.key, lttng_ht_seed),
struct lttng_ht_iter iter;
DBG2("Writing index for stream ID %" PRIu64 " and seq num %" PRIu64
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;
/* Delete index from hash table. */
iter.iter.node = &index->index_n.node;
struct lttng_ht_iter iter;
DBG3("Relay index with stream ID %" PRIu64 " and seq num %" PRIu64
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;
/* Delete index from hash table. */
iter.iter.node = &index->index_n.node;
rcu_read_lock();
cds_lfht_for_each_entry(indexes_ht->ht, &iter.iter, index, index_n.node) {
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);
}
relay_index_delete(index);
relay_index_free_safe(index);
}
struct ctf_packet_index index_data;
/* key1 = stream_id, key2 = net_seq_num */
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;
struct lttng_ht_node_two_u64 index_n;
struct rcu_head rcu_node;
pthread_mutex_t mutex;