X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Ffs.h;h=763136afef7be989fe7b2861f523c2179bbf7ba0;hb=a3f0c7db90f4cfc81090a83a7442b7bc624d5789;hp=4c0aa2efc600a907a155dd79c1cbcd23998c10c6;hpb=d23b766e7b7542ddff2211264b4ece1f3a347773;p=babeltrace.git diff --git a/src/plugins/ctf/fs-src/fs.h b/src/plugins/ctf/fs-src/fs.h index 4c0aa2ef..763136af 100644 --- a/src/plugins/ctf/fs-src/fs.h +++ b/src/plugins/ctf/fs-src/fs.h @@ -75,8 +75,8 @@ struct ctf_fs_component { /* Array of struct ctf_fs_port_data *, owned by this */ GPtrArray *port_data; - /* Array of struct ctf_fs_trace *, owned by this */ - GPtrArray *traces; + /* Owned by this */ + struct ctf_fs_trace *trace; struct ctf_fs_metadata_config metadata_config; }; @@ -84,8 +84,13 @@ struct ctf_fs_component { struct ctf_fs_trace { bt_logging_level log_level; - /* Weak */ + /* + * Weak. These are mostly used to generate log messages or to append + * error causes. They are mutually exclusive, only one of them must be + * set. + */ bt_self_component *self_comp; + bt_self_component_class *self_comp_class; /* Owned by this */ struct ctf_fs_metadata *metadata; @@ -99,9 +104,6 @@ struct ctf_fs_trace { /* Owned by this */ GString *path; - /* Owned by this */ - GString *name; - /* Next automatic stream ID when not provided by packet header */ uint64_t next_stream_id; }; @@ -127,10 +129,15 @@ struct ctf_fs_ds_index_entry { * (in ns since EPOCH). */ int64_t timestamp_begin_ns, timestamp_end_ns; + + /* + * Packet sequence number, or UINT64_MAX if not present in the index. + */ + uint64_t packet_seq_num; }; struct ctf_fs_ds_index { - /* Array of pointer to struct ctf_fs_fd_index_entry. */ + /* Array of pointer to struct ctf_fs_ds_index_entry. */ GPtrArray *entries; }; @@ -159,12 +166,7 @@ struct ctf_fs_ds_file_group { struct ctf_fs_trace *ctf_fs_trace; /* - * Owned by this. May be NULL. - * - * A stream cannot be assumed to be indexed as the indexing might have - * been skipped. Moreover, the index's fields may not all be available - * depending on the producer (e.g. timestamp_begin/end are not - * mandatory). + * Owned by this. */ struct ctf_fs_ds_index *index; }; @@ -184,24 +186,29 @@ struct ctf_fs_msg_iter_data { bt_self_component *self_comp; /* Weak */ - bt_self_message_iterator *pc_msg_iter; + bt_self_message_iterator *self_msg_iter; /* Weak, belongs to ctf_fs_trace */ struct ctf_fs_ds_file_group *ds_file_group; /* Owned by this */ - struct ctf_fs_ds_file *ds_file; + struct ctf_msg_iter *msg_iter; - /* Which file the iterator is _currently_ operating on */ - size_t ds_file_info_index; + /* + * Saved error. If we hit an error in the _next method, but have some + * messages ready to return, we save the error here and return it on + * the next _next call. + */ + bt_message_iterator_class_next_method_status next_saved_status; + const struct bt_error *next_saved_error; - /* Owned by this */ - struct bt_msg_iter *msg_iter; + struct ctf_fs_ds_group_medops_data *msg_iter_medops_data; }; BT_HIDDEN -bt_component_class_init_method_status ctf_fs_init( +bt_component_class_initialize_method_status ctf_fs_init( bt_self_component_source *source, + bt_self_component_source_configuration *config, const bt_value *params, void *init_method_data); BT_HIDDEN @@ -215,22 +222,23 @@ bt_component_class_query_method_status ctf_fs_query( void *method_data, const bt_value **result); BT_HIDDEN -bt_component_class_message_iterator_init_method_status ctf_fs_iterator_init( +bt_message_iterator_class_initialize_method_status ctf_fs_iterator_init( bt_self_message_iterator *self_msg_iter, - bt_self_component_source *self_comp, + bt_self_message_iterator_configuration *config, + bt_self_component *self_comp, bt_self_component_port_output *self_port); BT_HIDDEN void ctf_fs_iterator_finalize(bt_self_message_iterator *it); BT_HIDDEN -bt_component_class_message_iterator_next_method_status ctf_fs_iterator_next( +bt_message_iterator_class_next_method_status ctf_fs_iterator_next( bt_self_message_iterator *iterator, bt_message_array_const msgs, uint64_t capacity, uint64_t *count); BT_HIDDEN -bt_component_class_message_iterator_seek_beginning_method_status ctf_fs_iterator_seek_beginning( +bt_message_iterator_class_seek_beginning_method_status ctf_fs_iterator_seek_beginning( bt_self_message_iterator *message_iterator); /* Create and initialize a new, empty ctf_fs_component. */ @@ -240,18 +248,22 @@ struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level, bt_self_component *self_comp); /* - * Search recursively under all paths in `paths_value` (an array of strings), - * for CTF traces. For each CTF trace found, create a ctf_fs_trace in - * `ctf_fs` representing that trace. + * Create one `struct ctf_fs_trace` from one trace, or multiple traces sharing + * the same UUID. + * + * `paths_value` must be an array of strings, + * + * The created `struct ctf_fs_trace` is assigned to `ctf_fs->trace`. * * `self_comp` and `self_comp_class` are used for logging, only one of them * should be set. */ BT_HIDDEN -int ctf_fs_component_create_ctf_fs_traces( +int ctf_fs_component_create_ctf_fs_trace( struct ctf_fs_component *ctf_fs, const bt_value *paths_value, + const bt_value *trace_name_value, bt_self_component *self_comp, bt_self_component_class *self_comp_class); @@ -266,6 +278,8 @@ void ctf_fs_destroy(struct ctf_fs_component *ctf_fs); * - The mandatory `paths` parameter is returned in `*paths`. * - The optional `clock-class-offset-s` and `clock-class-offset-ns`, if * present, are recorded in the `ctf_fs` structure. + * - The optional `trace-name` parameter is returned in `*trace_name` if + * present, else `*trace_name` is set to NULL. * * `self_comp` and `self_comp_class` are used for logging, only one of them * should be set. @@ -275,7 +289,9 @@ void ctf_fs_destroy(struct ctf_fs_component *ctf_fs); BT_HIDDEN bool read_src_fs_parameters(const bt_value *params, - const bt_value **paths, struct ctf_fs_component *ctf_fs, + const bt_value **paths, + const bt_value **trace_name, + struct ctf_fs_component *ctf_fs, bt_self_component *self_comp, bt_self_component_class *self_comp_class);