Rename bt_ctf_X -> bt_X, maintain backward compat. for pre-2.0 CTF writer

[babeltrace.git] / plugins / ctf / fs-src / fs.h

diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h
index a4b04f372002800fe02fcf7c644816cd67a2dee4..bbac1bb4d96daf7ee4fcbf286b702ed118c26141 100644 (file)
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -30,9 +30,9 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
+#include <babeltrace/babeltrace.h>
 #include "data-stream-file.h"
+#include "metadata.h"
 
 BT_HIDDEN
 extern bool ctf_fs_debug;
@@ -49,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;
@@ -59,48 +59,6 @@ struct ctf_fs_metadata {
        int bo;
 };
 
-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;
-};
-
-struct ctf_fs_component_options {
-       int64_t clock_offset;
-       int64_t clock_offset_ns;
-};
-
 struct ctf_fs_component {
        /* Weak, guaranteed to exist */
        struct bt_private_component *priv_comp;
@@ -111,7 +69,7 @@ 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 {
@@ -144,7 +102,13 @@ struct ctf_fs_ds_file_group {
        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;
@@ -164,6 +128,9 @@ 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;
 };
 
 BT_HIDDEN
@@ -174,13 +141,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);
+
+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 +159,15 @@ 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
+struct bt_notification_iterator_next_method_return ctf_fs_iterator_next(
+               struct bt_private_connection_private_notification_iterator *iterator);
 
 #endif /* BABELTRACE_PLUGIN_CTF_FS_H */