X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fstream.c;h=4716f9d7923f8d5ddd4ea8a2cf6ee52c790bf846;hb=23c8ff5013f1e8c132cab7845ca608dbed4fca7f;hp=0ababf28d8d112c55b304d5a1baafb252077fe0e;hpb=7a45c7e6401baebe3715b317a3d871ee49921057;p=lttng-tools.git diff --git a/src/bin/lttng-relayd/stream.c b/src/bin/lttng-relayd/stream.c index 0ababf28d..4716f9d79 100644 --- a/src/bin/lttng-relayd/stream.c +++ b/src/bin/lttng-relayd/stream.c @@ -82,15 +82,17 @@ struct relay_stream *stream_create(struct ctf_trace *trace, } stream->stream_handle = stream_handle; - stream->prev_seq = -1ULL; + stream->prev_data_seq = -1ULL; stream->prev_index_seq = -1ULL; stream->last_net_seq_num = -1ULL; stream->ctf_stream_id = -1ULL; stream->tracefile_size = tracefile_size; stream->tracefile_count = tracefile_count; stream->path_name = path_name; + stream->prev_path_name = NULL; stream->channel_name = channel_name; stream->rotate_at_seq_num = -1ULL; + stream->beacon_ts_end = -1ULL; lttng_ht_node_init_u64(&stream->node, stream->stream_handle); pthread_mutex_init(&stream->lock, NULL); urcu_ref_init(&stream->ref); @@ -255,6 +257,7 @@ static void stream_destroy(struct relay_stream *stream) tracefile_array_destroy(stream->tfa); } free(stream->path_name); + free(stream->prev_path_name); free(stream->channel_name); free(stream); } @@ -377,7 +380,7 @@ void try_stream_close(struct relay_stream *stream) } if (stream->last_net_seq_num != -1ULL && - ((int64_t) (stream->prev_seq - stream->last_net_seq_num)) < 0 + ((int64_t) (stream->prev_data_seq - stream->last_net_seq_num)) < 0 && !session_aborted) { /* * Don't close since we still have data pending. This