Rename correlator to muxer

[babeltrace.git] / plugins / ctf / fs / fs.c

diff --git a/plugins/ctf/fs/fs.c b/plugins/ctf/fs/fs.c
index 9019543eea6595268e81f0183eccd93b114bced4..b80e4e152095c4e3ed19a0abf80b72dc2fe3974b 100644 (file)
--- a/plugins/ctf/fs/fs.c
+++ b/plugins/ctf/fs/fs.c
@@ -32,6 +32,8 @@
 #include <assert.h>
 #include <unistd.h>
 #include "fs.h"
+#include "metadata.h"
+#include "data-stream.h"
 
 static bool ctf_fs_debug;
 
@@ -39,14 +41,54 @@ static
 struct bt_notification *ctf_fs_iterator_get(
                struct bt_notification_iterator *iterator)
 {
-       return NULL;
+       struct bt_notification *notification = NULL;
+       struct ctf_fs_component *ctf_fs;
+       struct bt_component *component = bt_notification_iterator_get_component(
+                       iterator);
+
+       if (!component) {
+               goto end;
+       }
+
+       ctf_fs = bt_component_get_private_data(component);
+       if (!ctf_fs) {
+               goto end;
+       }
+
+       notification = bt_get(ctf_fs->current_notification);
+end:
+       BT_PUT(component);
+       return notification;
 }
 
 static
 enum bt_notification_iterator_status ctf_fs_iterator_next(
                struct bt_notification_iterator *iterator)
 {
-       return BT_NOTIFICATION_ITERATOR_STATUS_UNSUPPORTED;
+       enum bt_notification_iterator_status ret;
+       struct bt_notification *notification = NULL;
+       struct ctf_fs_component *ctf_fs;
+       struct bt_component *component = bt_notification_iterator_get_component(
+                       iterator);
+
+       if (!component) {
+               ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
+               goto end;
+       }
+
+       ctf_fs = bt_component_get_private_data(component);
+       assert(ctf_fs);
+
+       ret = ctf_fs_data_stream_get_next_notification(ctf_fs, &notification);
+       if (ret || !notification) {
+               goto end;
+       }
+
+       bt_put(ctf_fs->current_notification);
+       ctf_fs->current_notification = notification;
+end:
+       BT_PUT(component);
+       return ret;
 }
 
 static
@@ -67,8 +109,8 @@ static
 enum bt_component_status ctf_fs_iterator_init(struct bt_component *source,
                struct bt_notification_iterator *it)
 {
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
        struct ctf_fs_iterator *ctf_it;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 
        assert(source && it);
        ctf_it = g_new0(struct ctf_fs_iterator, 1);
@@ -112,8 +154,9 @@ void ctf_fs_destroy_data(struct ctf_fs_component *component)
                g_string_free(component->trace_path, TRUE);
        }
 
-//     ctf_fs_metadata_fini(&component->metadata);
-//     ctf_fs_data_stream_fini(&component->data_stream);
+       ctf_fs_metadata_fini(&component->metadata);
+       ctf_fs_data_stream_fini(&component->data_stream);
+       BT_PUT(component->current_notification);
        g_free(component);
 }
 
@@ -129,7 +172,7 @@ static
 struct ctf_fs_component *ctf_fs_create(struct bt_value *params)
 {
        struct ctf_fs_component *ctf_fs;
-       struct bt_value *value;
+       struct bt_value *value = NULL;
        const char *path;
        enum bt_value_status ret;
 
@@ -156,11 +199,15 @@ struct ctf_fs_component *ctf_fs_create(struct bt_value *params)
 
        ctf_fs->error_fp = stderr;
        ctf_fs->page_size = (size_t) getpagesize();
+       ctf_fs_data_stream_init(ctf_fs, &ctf_fs->data_stream);
+       ctf_fs_metadata_set_trace(ctf_fs);
+       ctf_fs_data_stream_open_streams(ctf_fs);
+       goto end;
 
-end:
-       return ctf_fs;
 error:
        ctf_fs_destroy_data(ctf_fs);
+end:
+       BT_PUT(value);
        return ctf_fs;
 }