X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.h;h=f5eaabb8f739cfc5d6912f42e90eb1ea8e7298cc;hb=90157d89276ed1a569a2d4ffcfeed0b415817c12;hp=02a5edfb53612731e6bdcd5bd448acba59ae0ccb;hpb=94cf822ec0adbb6d6d33d6475c5b58e1dd7e2b79;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h
index 02a5edfb..f5eaabb8 100644
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -33,14 +33,12 @@
 #include <babeltrace/graph/component.h>
 #include <babeltrace/graph/clock-class-priority-map.h>
 #include "data-stream-file.h"
+#include "metadata.h"
 
 BT_HIDDEN
 extern bool ctf_fs_debug;
 
 struct ctf_fs_file {
-	/* Weak, belongs to component */
-	struct ctf_fs_component *ctf_fs;
-
 	/* Owned by this */
 	GString *path;
 
@@ -62,48 +60,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 {
-	uint64_t clock_offset;
-	uint64_t clock_offset_ns;
-};
-
 struct ctf_fs_component {
 	/* Weak, guaranteed to exist */
 	struct bt_private_component *priv_comp;
@@ -114,15 +70,10 @@ 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, belongs to component */
-	struct ctf_fs_component *ctf_fs;
-
 	/* Owned by this */
 	struct ctf_fs_metadata *metadata;
 
@@ -151,9 +102,15 @@ struct ctf_fs_ds_file_group {
 	 */
 	GPtrArray *ds_file_infos;
 
+	/* Owned by this */
+	struct bt_ctf_stream_class *stream_class;
+
 	/* Owned by this */
 	struct bt_ctf_stream *stream;
 
+	/* Stream (instance) ID; -1ULL means none */
+	uint64_t stream_id;
+
 	/* Weak, belongs to component */
 	struct ctf_fs_trace *ctf_fs_trace;
 };
@@ -172,6 +129,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_ctf_notif_iter *notif_iter;
 };
 
 BT_HIDDEN
@@ -182,17 +142,33 @@ 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);
+
+BT_HIDDEN
+void ctf_fs_trace_destroy(struct ctf_fs_trace *trace);
 
-void ctf_fs_iterator_finalize(struct bt_private_notification_iterator *it);
+BT_HIDDEN
+int ctf_fs_find_traces(GList **trace_paths, const char *start_path);
 
-struct bt_notification_iterator_next_return ctf_fs_iterator_next(
-		struct bt_private_notification_iterator *iterator);
+BT_HIDDEN
+GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path);
 
 BT_HIDDEN
-struct bt_value *ctf_fs_query(struct bt_component_class *comp_class,
-		const char *object, struct bt_value *params);
+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
+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 */