X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.h;h=534cb6b513cc2ec7afeaa6a485970d31e31ecc3a;hb=d4393e0875e7b08f6ee97d617cc5f2c9286742a4;hp=63b299a09288bae6187b3bd6eaf389628eb52cd2;hpb=1a9f7075566704f314c36f92339c2e2fed697523;p=babeltrace.git diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h index 63b299a0..534cb6b5 100644 --- a/plugins/ctf/fs-src/fs.h +++ b/plugins/ctf/fs-src/fs.h @@ -30,17 +30,14 @@ #include #include -#include -#include -#include "data-stream.h" +#include +#include "data-stream-file.h" +#include "metadata.h" BT_HIDDEN extern bool ctf_fs_debug; struct ctf_fs_file { - /* Weak */ - struct ctf_fs_component *ctf_fs; - /* Owned by this */ GString *path; @@ -52,7 +49,7 @@ struct ctf_fs_file { struct ctf_fs_metadata { /* Owned by this */ - struct bt_ctf_trace *trace; + struct bt_trace *trace; /* Owned by this */ char *text; @@ -62,45 +59,8 @@ struct ctf_fs_metadata { int bo; }; -struct ctf_fs_stream { - /* Owned by this */ - struct ctf_fs_file *file; - - /* Owned by this */ - struct bt_ctf_stream *stream; - - /* Owned by this */ - struct bt_clock_class_priority_map *cc_prio_map; - - /* Owned by this */ - struct bt_ctf_notif_iter *notif_iter; - - /* A stream is assumed to be indexed. */ - struct index index; - void *mmap_addr; - /* Max length of chunk to mmap() when updating the current mapping. */ - size_t mmap_max_len; - /* Length of the current mapping. */ - size_t mmap_len; - /* Length of the current mapping which *exists* in the backing file. */ - size_t mmap_valid_len; - /* Offset in the file where the current mapping starts. */ - off_t mmap_offset; - /* - * Offset, in the current mapping, of the address to return on the next - * request. - */ - off_t request_offset; - bool end_reached; -}; - -struct ctf_fs_component_options { - uint64_t clock_offset; - uint64_t clock_offset_ns; -}; - struct ctf_fs_component { - /* Weak */ + /* Weak, guaranteed to exist */ struct bt_private_component *priv_comp; /* Array of struct ctf_fs_port_data *, owned by this */ @@ -109,36 +69,82 @@ struct ctf_fs_component { /* Array of struct ctf_fs_trace *, owned by this */ GPtrArray *traces; - struct ctf_fs_component_options options; - FILE *error_fp; - size_t page_size; + struct ctf_fs_metadata_config metadata_config; }; struct ctf_fs_trace { - /* Weak */ - struct ctf_fs_component *ctf_fs; - /* Owned by this */ struct ctf_fs_metadata *metadata; /* Owned by this */ struct bt_clock_class_priority_map *cc_prio_map; + /* Array of struct ctf_fs_ds_file_group *, owned by this */ + GPtrArray *ds_file_groups; + /* 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; }; -struct ctf_fs_port_data { +struct ctf_fs_ds_file_group { + /* + * Array of struct ctf_fs_ds_file_info, owned by this. + * + * This is an _ordered_ array of data stream file infos which + * belong to this group (a single stream instance). + * + * You can call ctf_fs_ds_file_create() with one of those paths + * and the CTF IR stream below. + */ + GPtrArray *ds_file_infos; + /* Owned by this */ - GString *path; + struct bt_stream_class *stream_class; - /* Weak */ + /* Owned by this */ + struct bt_stream *stream; + + /* Stream (instance) ID; -1ULL means none */ + uint64_t stream_id; + + /* Weak, belongs to component */ struct ctf_fs_trace *ctf_fs_trace; }; +struct ctf_fs_port_data { + /* Weak, belongs to ctf_fs_trace */ + struct ctf_fs_ds_file_group *ds_file_group; + + /* Weak */ + struct ctf_fs_component *ctf_fs; +}; + +struct ctf_fs_notif_iter_data { + /* Weak */ + struct bt_graph *graph; + + /* 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; + + /* Which file the iterator is _currently_ operating on */ + size_t ds_file_info_index; + + /* Owned by this */ + struct bt_notif_iter *notif_iter; + + /* True to skip BT_NOTIFICATION_TYPE_STREAM_BEGIN notifications */ + bool skip_stream_begin_notifs; +}; + BT_HIDDEN enum bt_component_status ctf_fs_init(struct bt_private_component *source, struct bt_value *params, void *init_method_data); @@ -147,17 +153,35 @@ BT_HIDDEN void ctf_fs_finalize(struct bt_private_component *component); BT_HIDDEN -enum bt_notification_iterator_status ctf_fs_iterator_init( - struct bt_private_notification_iterator *it, - struct bt_private_port *port); +struct bt_component_class_query_method_return ctf_fs_query( + struct bt_component_class *comp_class, + struct bt_query_executor *query_exec, + const char *object, struct bt_value *params); + +BT_HIDDEN +struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name, + struct ctf_fs_metadata_config *config, struct bt_graph *graph); -void ctf_fs_iterator_finalize(struct bt_private_notification_iterator *it); +BT_HIDDEN +void ctf_fs_trace_destroy(struct ctf_fs_trace *trace); -struct bt_notification_iterator_next_return ctf_fs_iterator_next( - struct bt_private_notification_iterator *iterator); +BT_HIDDEN +int ctf_fs_find_traces(GList **trace_paths, const char *start_path); BT_HIDDEN -struct bt_value *ctf_fs_query(struct bt_component_class *comp_class, - const char *object, struct bt_value *params); +GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path); + +BT_HIDDEN +enum bt_notification_iterator_status ctf_fs_iterator_init( + struct bt_private_connection_private_notification_iterator *it, + struct bt_private_port *port); +BT_HIDDEN +void ctf_fs_iterator_finalize(struct bt_private_connection_private_notification_iterator *it); + +BT_HIDDEN +enum bt_notification_iterator_status ctf_fs_iterator_next( + struct bt_private_connection_private_notification_iterator *iterator, + bt_notification_array notifs, uint64_t capacity, + uint64_t *count); #endif /* BABELTRACE_PLUGIN_CTF_FS_H */