X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Flttng-live.h;h=39bc5abc5a39b67dbcb8f3b5e869790725ec582f;hb=a3f0c7db90f4cfc81090a83a7442b7bc624d5789;hp=dc49bfb3e5af9213ade919d7baf07e5ff6f3d19f;hpb=f4e38e70bf6dc1ff8c9226d9c8eedaf26fa19f09;p=babeltrace.git diff --git a/src/plugins/ctf/lttng-live/lttng-live.h b/src/plugins/ctf/lttng-live/lttng-live.h index dc49bfb3..39bc5abc 100644 --- a/src/plugins/ctf/lttng-live/lttng-live.h +++ b/src/plugins/ctf/lttng-live/lttng-live.h @@ -30,13 +30,15 @@ */ #include +#include + +#include -#include "common/macros.h" #include +#include "common/macros.h" #include "../common/metadata/decoder.h" #include "../common/msg-iter/msg-iter.h" - #include "viewer-connection.h" struct lttng_live_component; @@ -64,6 +66,9 @@ enum lttng_live_stream_state { /* Iterator over a live stream. */ struct lttng_live_stream_iterator { + bt_logging_level log_level; + bt_self_component *self_comp; + /* Owned by this. */ bt_stream *stream; @@ -74,7 +79,7 @@ struct lttng_live_stream_iterator { * Since only a single iterator per viewer connection, we have * only a single message iterator per stream. */ - struct bt_msg_iter *msg_iter; + struct ctf_msg_iter *msg_iter; uint64_t viewer_stream_id; @@ -105,7 +110,7 @@ struct lttng_live_stream_iterator { * The current message produced by this live stream iterator. Owned by * this. */ - bt_message *current_msg; + const bt_message *current_msg; /* Timestamp in nanoseconds of the current message (current_msg). */ int64_t current_msg_ts_ns; @@ -116,20 +121,44 @@ struct lttng_live_stream_iterator { /* Owned by this. */ GString *name; + + bool has_stream_hung_up; }; struct lttng_live_metadata { - /* Weak reference. */ - struct lttng_live_trace *trace; + bt_logging_level log_level; + bt_self_component *self_comp; uint64_t stream_id; /* Weak reference. */ struct ctf_metadata_decoder *decoder; +}; - bool closed; +enum lttng_live_metadata_stream_state { + /* + * The metadata needs to be updated. This is either because we just + * created the trace and haven't asked yet, or the relay specifically + * told us that new metadata is available. + */ + LTTNG_LIVE_METADATA_STREAM_STATE_NEEDED, + /* + * The metadata was updated and the relay has not told us we need to + * update it yet. + */ + LTTNG_LIVE_METADATA_STREAM_STATE_NOT_NEEDED, + /* + * The relay has closed this metadata stream. We set this in reaction + * to a LTTNG_VIEWER_METADATA_ERR reply to a LTTNG_VIEWER_GET_METADATA + * command to the relay. If this field is set, we have received all the + * metadata that we are ever going to get for that metadata stream. + */ + LTTNG_LIVE_METADATA_STREAM_STATE_CLOSED, }; struct lttng_live_trace { + bt_logging_level log_level; + bt_self_component *self_comp; + /* Back reference to session. */ struct lttng_live_session *session; @@ -150,10 +179,13 @@ struct lttng_live_trace { /* Owned by this. */ GPtrArray *stream_iterators; - bool new_metadata_needed; + enum lttng_live_metadata_stream_state metadata_stream_state; }; struct lttng_live_session { + bt_logging_level log_level; + bt_self_component *self_comp; + /* Weak reference. */ struct lttng_live_msg_iter *lttng_live_msg_iter; @@ -184,8 +216,10 @@ enum session_not_found_action { * A component instance is an iterator on a single session. */ struct lttng_live_component { + bt_logging_level log_level; + /* Weak reference. */ - bt_self_component_source *self_comp; + bt_self_component *self_comp; struct { GString *url; @@ -202,6 +236,9 @@ struct lttng_live_component { }; struct lttng_live_msg_iter { + bt_logging_level log_level; + bt_self_component *self_comp; + /* Weak reference. */ struct lttng_live_component *lttng_live_comp; @@ -219,6 +256,9 @@ struct lttng_live_msg_iter { /* Timestamp in nanosecond of the last message sent downstream. */ int64_t last_msg_ts_ns; + + /* True if the iterator was interrupted. */ + bool was_interrupted; }; enum lttng_live_iterator_status { @@ -240,62 +280,71 @@ enum lttng_live_iterator_status { LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED = -4, }; -bt_self_component_status lttng_live_component_init( +bt_component_class_initialize_method_status lttng_live_component_init( bt_self_component_source *self_comp, + bt_self_component_source_configuration *config, const bt_value *params, void *init_method_data); -bt_query_status lttng_live_query( +bt_component_class_query_method_status lttng_live_query( bt_self_component_class_source *comp_class, - const bt_query_executor *query_exec, + bt_private_query_executor *priv_query_exec, const char *object, const bt_value *params, - bt_logging_level log_level, - const bt_value **result); + void *method_data, const bt_value **result); void lttng_live_component_finalize(bt_self_component_source *component); -bt_self_message_iterator_status lttng_live_msg_iter_next( +bt_message_iterator_class_next_method_status lttng_live_msg_iter_next( bt_self_message_iterator *iterator, bt_message_array_const msgs, uint64_t capacity, uint64_t *count); -bt_self_message_iterator_status lttng_live_msg_iter_init( +bt_message_iterator_class_initialize_method_status lttng_live_msg_iter_init( bt_self_message_iterator *self_msg_it, - bt_self_component_source *self_comp, + bt_self_message_iterator_configuration *config, + bt_self_component *self_comp, bt_self_component_port_output *self_port); void lttng_live_msg_iter_finalize(bt_self_message_iterator *it); -int lttng_live_create_viewer_session(struct lttng_live_msg_iter *lttng_live_msg_iter); -int lttng_live_attach_session(struct lttng_live_session *session); -int lttng_live_detach_session(struct lttng_live_session *session); -enum lttng_live_iterator_status lttng_live_get_new_streams( +enum lttng_live_viewer_status lttng_live_session_attach( + struct lttng_live_session *session, + bt_self_message_iterator *self_msg_iter); + +enum lttng_live_viewer_status lttng_live_session_detach( struct lttng_live_session *session); +enum lttng_live_iterator_status lttng_live_session_get_new_streams( + struct lttng_live_session *session, + bt_self_message_iterator *self_msg_iter); + +struct lttng_live_trace *lttng_live_session_borrow_or_create_trace_by_id( + struct lttng_live_session *session, uint64_t trace_id); + int lttng_live_add_session(struct lttng_live_msg_iter *lttng_live_msg_iter, uint64_t session_id, const char *hostname, const char *session_name); -ssize_t lttng_live_get_one_metadata_packet(struct lttng_live_trace *trace, - FILE *fp); +/* + * lttng_live_get_one_metadata_packet() asks the Relay Daemon for new metadata. + * If new metadata is received, the function writes it to the provided file + * handle and updates the reply_len output parameter. This function should be + * called in loop until _END status is received to ensure all metadata is + * written to the file. + */ +enum lttng_live_get_one_metadata_status lttng_live_get_one_metadata_packet( + struct lttng_live_trace *trace, FILE *fp, size_t *reply_len); + enum lttng_live_iterator_status lttng_live_get_next_index( struct lttng_live_msg_iter *lttng_live_msg_iter, struct lttng_live_stream_iterator *stream, struct packet_index *index); -enum bt_msg_iter_medium_status lttng_live_get_stream_bytes( +enum ctf_msg_iter_medium_status lttng_live_get_stream_bytes( struct lttng_live_msg_iter *lttng_live_msg_iter, struct lttng_live_stream_iterator *stream, uint8_t *buf, uint64_t offset, uint64_t req_len, uint64_t *recv_len); -void lttng_live_add_stream_iterator(struct lttng_live_msg_iter *lttng_live_msg_iter, - struct lttng_live_stream_iterator *stream_iter); -void lttng_live_remove_stream_iterator(struct lttng_live_msg_iter *lttng_live_msg_iter, - struct lttng_live_stream_iterator *stream_iter); - -struct lttng_live_trace *lttng_live_borrow_trace( - struct lttng_live_session *session, uint64_t trace_id); -void lttng_live_need_new_streams(struct lttng_live_msg_iter *lttng_live_msg_iter); -bool lttng_live_graph_is_canceled(struct lttng_live_component *lttng_live); +bool lttng_live_graph_is_canceled(struct lttng_live_msg_iter *msg_iter); #endif /* BABELTRACE_PLUGIN_CTF_LTTNG_LIVE_H */