#include <assert.h>
#include <unistd.h>
#include "fs.h"
+#include "metadata.h"
+#include "data-stream.h"
static bool ctf_fs_debug;
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:
+ 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, ¬ification);
+ if (ret || !notification) {
+ goto end;
+ }
+
+ bt_put(ctf_fs->current_notification);
+ ctf_fs->current_notification = notification;
+end:
+ return BT_NOTIFICATION_ITERATOR_STATUS_OK;
}
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);
if (ret) {
goto error;
}
+
end:
return ret;
error:
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);
}
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;
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;
}
if (ret != BT_COMPONENT_STATUS_OK) {
goto error;
}
+
end:
return ret;
error: