struct bt_notification_iterator {
struct bt_object base;
+ struct bt_component *component;
bt_notification_iterator_get_cb get;
bt_notification_iterator_next_cb next;
void *user_data;
struct bt_notification_iterator *iterator, int whence,
int64_t time);
+extern struct bt_component *bt_notification_iterator_get_component(
+ struct bt_notification_iterator *iterator);
+
#ifdef __cplusplus
}
#endif
if (iterator->user_destroy) {
iterator->user_destroy(iterator);
}
+ BT_PUT(iterator->component);
g_free(iterator);
}
goto end;
}
+ iterator->component = bt_get(component);
bt_object_init(iterator, bt_notification_iterator_destroy);
end:
return iterator;
end:
return ret;
}
+
+struct bt_component *bt_notification_iterator_get_component(
+ struct bt_notification_iterator *iterator)
+{
+ return bt_get(iterator->component);
+}
+
return ret;
}
-void ctf_fs_data_stream_deinit(struct ctf_fs_data_stream *data_stream)
+void ctf_fs_data_stream_fini(struct ctf_fs_data_stream *data_stream)
{
g_ptr_array_free(data_stream->streams, TRUE);
}
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/ctf-ir/trace.h>
-#include "ctf-notif-iter/ctf-notif-iter.h"
-
-struct ctf_fs_stream {
- struct ctf_fs_file *file;
- struct bt_ctf_stream *stream;
- struct bt_ctf_notif_iter *notif_iter;
- void *mmap_addr;
- size_t mmap_len;
- off_t mmap_offset;
- off_t request_offset;
-};
-
-struct ctf_fs_data_stream {
- GPtrArray *streams;
-};
+#include "../common/notif-iter/notif-iter.h"
BT_HIDDEN
-int ctf_fs_data_stream_init(struct ctf_fs *ctf_fs,
+int ctf_fs_data_stream_init(struct ctf_fs_component *ctf_fs,
struct ctf_fs_data_stream *data_stream);
BT_HIDDEN
-void ctf_fs_data_stream_deinit(struct ctf_fs_data_stream *data_stream);
+void ctf_fs_data_stream_fini(struct ctf_fs_data_stream *data_stream);
BT_HIDDEN
-int ctf_fs_data_stream_open_streams(struct ctf_fs *ctf_fs);
+int ctf_fs_data_stream_open_streams(struct ctf_fs_component *ctf_fs);
BT_HIDDEN
int ctf_fs_data_stream_get_next_notification(
- struct ctf_fs *ctf_fs,
+ struct ctf_fs_component *ctf_fs,
struct bt_ctf_notif_iter_notif **notification);
#endif /* CTF_FS_DATA_STREAM_H */
PDBG("Opening file \"%s\" with mode \"%s\"\n", file->path->str, mode);
file->fp = fopen(file->path->str, mode);
if (!file->fp) {
- PERR("Cannot open file \"%s\" with mode \"%s\": %s",
+ PERR("Cannot open file \"%s\" with mode \"%s\": %s\n",
file->path->str, mode, strerror(errno));
goto error;
}
#include <assert.h>
#include <unistd.h>
#include "fs.h"
+#include "metadata.h"
+#include "data-stream.h"
static bool ctf_fs_debug;
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);
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);
g_free(component);
}
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);
end:
return ctf_fs;
error:
if (ret != BT_COMPONENT_STATUS_OK) {
goto error;
}
+
end:
return ret;
error:
GString *trace_path;
FILE *error_fp;
size_t page_size;
+ struct bt_notification *last_notif;
struct ctf_fs_metadata metadata;
struct ctf_fs_data_stream data_stream;
struct ctf_fs_component_options options;
return 0;
}
-void ctf_fs_metadata_deinit(struct ctf_fs_metadata *metadata)
+void ctf_fs_metadata_fini(struct ctf_fs_metadata *metadata)
{
if (metadata->text) {
free(metadata->text);
int ctf_fs_metadata_init(struct ctf_fs_metadata *metadata);
BT_HIDDEN
-void ctf_fs_metadata_deinit(struct ctf_fs_metadata *metadata);
+void ctf_fs_metadata_fini(struct ctf_fs_metadata *metadata);
BT_HIDDEN
void ctf_fs_metadata_set_trace(struct ctf_fs_component *ctf_fs);