X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fstream.h;h=c88e725c012955473de8dc50df6d707b9ff35537;hp=151ae25c1ad2be5f3243bc22094c186556a61b29;hb=94f73d0839c106a783f3c805aa74a2dbfb6bd5f5;hpb=7a45c7e6401baebe3715b317a3d871ee49921057 diff --git a/src/bin/lttng-relayd/stream.h b/src/bin/lttng-relayd/stream.h index 151ae25c1..c88e725c0 100644 --- a/src/bin/lttng-relayd/stream.h +++ b/src/bin/lttng-relayd/stream.h @@ -26,14 +26,34 @@ #include #include +#include +#include +#include #include "session.h" #include "stream-fd.h" #include "tracefile-array.h" -struct relay_stream_chunk_id { - bool is_set; - uint64_t value; +struct lttcomm_relayd_index; + +struct relay_stream_rotation { + /* + * Indicates if the stream's data and index have been rotated. A + * rotation is considered completed when both rotations have occurred. + */ + bool data_rotated; + bool index_rotated; + /* + * Packet sequence number of the first packet of the new trace chunk to + * which the stream is rotating. + */ + uint64_t packet_seq_num; + /* + * Monotonically increasing previous network sequence number of first + * data packet of the new trace chunk to which the stream is rotating. + */ + uint64_t prev_data_net_seq; + struct lttng_trace_chunk *next_trace_chunk; }; /* @@ -52,10 +72,12 @@ struct relay_stream { * inside the ctf_trace lock. */ pthread_mutex_t lock; - uint64_t prev_seq; /* previous data sequence number encountered. */ + /* previous data sequence number written to disk. */ + uint64_t prev_data_seq; /* previous index sequence number written to disk. */ uint64_t prev_index_seq; - uint64_t last_net_seq_num; /* seq num to encounter before closing. */ + /* seq num to encounter before closing. */ + uint64_t last_net_seq_num; /* FD on which to write the stream data. */ struct stream_fd *stream_fd; @@ -68,7 +90,18 @@ struct relay_stream { /* On-disk circular buffer of tracefiles. */ uint64_t tracefile_size; uint64_t tracefile_size_current; + /* Max number of trace files for this stream. */ uint64_t tracefile_count; + /* + * Index of the currently active file for this stream's on-disk + * ring buffer. + */ + uint64_t tracefile_current_index; + /* + * Indicates that the on-disk buffer has wrapped around. Stream + * files shall be unlinked before being opened after this has occurred. + */ + bool tracefile_wrapped_around; /* * Position in the tracefile where we have the full index also on disk. @@ -83,6 +116,12 @@ struct relay_stream { */ uint64_t index_received_seqcount; + /* + * Packet sequence number of the last received packet index. + * Only populated when interacting with CTF_INDEX 1.1+. + */ + LTTNG_OPTIONAL(uint64_t) received_packet_seq_num; + /* * Tracefile array is an index of the stream trace files, * indexed by position. It allows keeping track of the oldest @@ -115,7 +154,7 @@ struct relay_stream { bool data_pending_check_done; /* Is this stream a metadata stream ? */ - int32_t is_metadata; + bool is_metadata; /* Amount of metadata received (bytes). */ uint64_t metadata_received; @@ -134,7 +173,10 @@ struct relay_stream { */ bool in_recv_list; struct cds_list_head recv_node; - bool published; /* Protected by session lock. */ + /* Protected by session lock. */ + bool published; + /* Notified viewer that no new metadata is available. */ + bool no_new_metadata_notified; /* * Node of stream within global stream hash table. */ @@ -142,38 +184,43 @@ struct relay_stream { bool in_stream_ht; /* is stream in stream hash table. */ struct rcu_head rcu_node; /* For call_rcu teardown. */ /* - * When we have written the data and index corresponding to this - * seq_num, rotate the tracefile (session rotation). The path_name is - * already up-to-date. - * This is set to -1ULL when no rotation is pending. - * - * Always access with stream lock held. - */ - uint64_t rotate_at_seq_num; - /* - * This is the id of the chunk where we are writing to if no rotation is - * pending (rotate_at_seq_num == -1ULL). If a rotation is pending, this - * is the chunk_id we will have after the rotation. It must be updated - * atomically with rotate_at_seq_num. - * - * Always access with stream lock held. - * - * This attribute is not set if the stream is created by a pre-2.11 - * consumer. - */ - struct relay_stream_chunk_id current_chunk_id; + * The trace chunk to which the file currently being produced (if any) + * belongs. + */ + struct lttng_trace_chunk *trace_chunk; + LTTNG_OPTIONAL(struct relay_stream_rotation) ongoing_rotation; }; 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, const struct relay_stream_chunk_id *chunk_id); + uint64_t tracefile_count); struct relay_stream *stream_get_by_id(uint64_t stream_id); bool stream_get(struct relay_stream *stream); void stream_put(struct relay_stream *stream); +int stream_rotate_output_files(struct relay_session *session, + struct relay_stream *stream); +int stream_set_pending_rotation(struct relay_stream *stream, + struct lttng_trace_chunk *next_trace_chunk, + uint64_t rotation_sequence_number); void try_stream_close(struct relay_stream *stream); void stream_publish(struct relay_stream *stream); +int stream_init_packet(struct relay_stream *stream, size_t packet_size, + bool *file_rotated); +int stream_write(struct relay_stream *stream, + const struct lttng_buffer_view *packet, size_t padding_len); +/* Called after the reception of a complete data packet. */ +int stream_update_index(struct relay_stream *stream, uint64_t net_seq_num, + bool rotate_index, bool *flushed, uint64_t total_size); +int stream_complete_packet(struct relay_stream *stream, + size_t packet_total_size, uint64_t sequence_number, + bool index_flushed); +/* Index info is in host endianness. */ +int stream_add_index(struct relay_stream *stream, + const struct lttcomm_relayd_index *index_info); +int stream_reset_file(struct relay_stream *stream); + void print_relay_streams(void); #endif /* _STREAM_H */