X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fstream.c;h=326ec4bf2ff2b970d6d46465c1abe9b949c65456;hb=5ae0c80e1f9a3ed89044a6e810d7d844fab6ba24;hp=5ed37c58ec1d2c0956b550ac837bac314d1e33a0;hpb=d3ecc5503007bc81faa8049fac945f163b6356f3;p=lttng-tools.git diff --git a/src/bin/lttng-relayd/stream.c b/src/bin/lttng-relayd/stream.c index 5ed37c58e..326ec4bf2 100644 --- a/src/bin/lttng-relayd/stream.c +++ b/src/bin/lttng-relayd/stream.c @@ -68,7 +68,8 @@ end: struct relay_stream *stream_create(struct ctf_trace *trace, uint64_t stream_handle, char *path_name, char *channel_name, uint64_t tracefile_size, - uint64_t tracefile_count) + uint64_t tracefile_count, + const struct relay_stream_chunk_id *chunk_id) { int ret; struct relay_stream *stream = NULL; @@ -94,6 +95,7 @@ struct relay_stream *stream_create(struct ctf_trace *trace, urcu_ref_init(&stream->ref); ctf_trace_get(trace); stream->trace = trace; + stream->current_chunk_id = *chunk_id; stream->indexes_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64); if (!stream->indexes_ht) { @@ -361,6 +363,7 @@ void try_stream_close(struct relay_stream *stream) * a packet. Since those are sent in that order, we take * care of consumerd crashes. */ + DBG("relay_index_close_partial_fd"); relay_index_close_partial_fd(stream); /* * Use the highest net_seq_num we currently have pending @@ -368,6 +371,7 @@ void try_stream_close(struct relay_stream *stream) * at -1ULL if we cannot find any index. */ stream->last_net_seq_num = relay_index_find_last(stream); + DBG("Updating stream->last_net_seq_num to %" PRIu64, stream->last_net_seq_num); /* Fall-through into the next check. */ }