X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.h;h=26e796a73bedeaf1dc263879233e3954da9c92c3;hb=108b91d0ffd01cce874850b767c0f358eb642523;hp=a4b04f372002800fe02fcf7c644816cd67a2dee4;hpb=55314f2a6c08045f6f7ca7700a4932628eff1b87;p=babeltrace.git diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h index a4b04f37..26e796a7 100644 --- a/plugins/ctf/fs-src/fs.h +++ b/plugins/ctf/fs-src/fs.h @@ -30,9 +30,10 @@ #include #include -#include -#include +#include #include "data-stream-file.h" +#include "metadata.h" +#include "../common/metadata/decoder.h" BT_HIDDEN extern bool ctf_fs_debug; @@ -49,56 +50,22 @@ struct ctf_fs_file { struct ctf_fs_metadata { /* Owned by this */ - struct bt_ctf_trace *trace; + struct ctf_metadata_decoder *decoder; /* Owned by this */ - char *text; + struct bt_trace *trace; - uint8_t uuid[16]; - bool is_uuid_set; - int bo; -}; + /* Weak (owned by `decoder` above) */ + struct ctf_trace_class *tc; -struct ctf_fs_ds_file_info { - GString *path; - uint64_t begin_ns; -}; - -struct ctf_fs_ds_file { /* 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; -}; + char *text; -struct ctf_fs_component_options { - int64_t clock_offset; - int64_t clock_offset_ns; + uint8_t uuid[16]; + bool is_uuid_set; + int bo; }; struct ctf_fs_component { @@ -111,16 +78,13 @@ struct ctf_fs_component { /* Array of struct ctf_fs_trace *, owned by this */ GPtrArray *traces; - struct ctf_fs_component_options options; + struct ctf_fs_metadata_config metadata_config; }; struct ctf_fs_trace { /* 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; @@ -129,6 +93,9 @@ struct ctf_fs_trace { /* Owned by this */ GString *name; + + /* Next automatic stream ID when not provided by packet header */ + uint64_t next_stream_id; }; struct ctf_fs_ds_file_group { @@ -139,12 +106,18 @@ struct ctf_fs_ds_file_group { * 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. + * and the trace IR stream below. */ GPtrArray *ds_file_infos; /* Owned by this */ - struct bt_ctf_stream *stream; + struct bt_stream_class *stream_class; + + /* 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; @@ -153,9 +126,15 @@ struct ctf_fs_ds_file_group { 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_private_connection_private_notification_iterator *pc_notif_iter; + /* Weak, belongs to ctf_fs_trace */ struct ctf_fs_ds_file_group *ds_file_group; @@ -164,6 +143,12 @@ struct ctf_fs_notif_iter_data { /* 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 @@ -174,13 +159,17 @@ 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 bt_value *ctf_fs_query(struct bt_component_class *comp_class, - const char *object, struct bt_value *params); +struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name, + struct ctf_fs_metadata_config *config, struct bt_graph *graph); + +BT_HIDDEN +void ctf_fs_trace_destroy(struct ctf_fs_trace *trace); BT_HIDDEN int ctf_fs_find_traces(GList **trace_paths, const char *start_path); @@ -188,9 +177,17 @@ int ctf_fs_find_traces(GList **trace_paths, const char *start_path); BT_HIDDEN GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path); -void ctf_fs_iterator_finalize(struct bt_private_notification_iterator *it); +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); -struct bt_notification_iterator_next_return ctf_fs_iterator_next( - struct bt_private_notification_iterator *iterator); +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 */