stream->relayd_stream_id,
stream->next_net_seq_num - 1);
if (ret < 0) {
- ERR("Relayd send close stream failed. Cleaning up relayd %" PRIu64 ".", relayd->net_seq_idx);
+ ERR("Relayd send close stream failed. Cleaning up relayd %" PRIu64 ".", relayd->id);
lttng_consumer_cleanup_relayd(relayd);
}
pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
uatomic_read(&relayd->destroy_flag)) {
consumer_destroy_relayd(relayd);
}
- stream->net_seq_idx = (uint64_t) -1ULL;
+ stream->relayd_id = (uint64_t) -1ULL;
stream->sent_to_relayd = 0;
}
/* Check and cleanup relayd if needed. */
rcu_read_lock();
- relayd = consumer_find_relayd(stream->net_seq_idx);
+ relayd = consumer_find_relayd(stream->relayd_id);
if (relayd != NULL) {
consumer_stream_relayd_close(stream, relayd);
}
assert(element);
rcu_read_lock();
- if (stream->net_seq_idx != (uint64_t) -1ULL) {
+ if (stream->relayd_id != (uint64_t) -1ULL) {
struct consumer_relayd_sock_pair *relayd;
- relayd = consumer_find_relayd(stream->net_seq_idx);
+ relayd = consumer_find_relayd(stream->relayd_id);
if (relayd) {
pthread_mutex_lock(&relayd->ctrl_sock_mutex);
ret = relayd_send_index(&relayd->control_sock, element,
* Communication error with lttng-relayd,
* perform cleanup now
*/
- ERR("Relayd send index failed. Cleaning up relayd %" PRIu64 ".", relayd->net_seq_idx);
+ ERR("Relayd send index failed. Cleaning up relayd %" PRIu64 ".", relayd->id);
lttng_consumer_cleanup_relayd(relayd);
ret = -1;
}
pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
} else {
ERR("Stream %" PRIu64 " relayd ID %" PRIu64 " unknown. Can't write index.",
- stream->key, stream->net_seq_idx);
+ stream->key, stream->relayd_id);
ret = -1;
}
} else {