projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ctf: notif-iter: pass current stream ID to get_stream() medop
[babeltrace.git]
/
plugins
/
ctf
/
fs-src
/
data-stream-file.c
diff --git
a/plugins/ctf/fs-src/data-stream-file.c
b/plugins/ctf/fs-src/data-stream-file.c
index 5d255ab78441ecf08bc882fc9ac4dbb3547c3672..76b58da90d5aa527827b90b366d47cc4f3934bcd 100644
(file)
--- a/
plugins/ctf/fs-src/data-stream-file.c
+++ b/
plugins/ctf/fs-src/data-stream-file.c
@@
-176,7
+176,8
@@
end:
static
struct bt_ctf_stream *medop_get_stream(
static
struct bt_ctf_stream *medop_get_stream(
- struct bt_ctf_stream_class *stream_class, void *data)
+ struct bt_ctf_stream_class *stream_class, uint64_t stream_id,
+ void *data)
{
struct ctf_fs_ds_file *ds_file = data;
struct bt_ctf_stream_class *ds_file_stream_class;
{
struct ctf_fs_ds_file *ds_file = data;
struct bt_ctf_stream_class *ds_file_stream_class;
@@
-199,10
+200,12
@@
end:
return stream;
}
return stream;
}
-static struct bt_ctf_notif_iter_medium_ops medops = {
+BT_HIDDEN
+struct bt_ctf_notif_iter_medium_ops ctf_fs_ds_file_medops = {
.request_bytes = medop_request_bytes,
.get_stream = medop_get_stream,
};
.request_bytes = medop_request_bytes,
.get_stream = medop_get_stream,
};
+
static
struct ctf_fs_ds_index *ctf_fs_ds_index_create(size_t length)
{
static
struct ctf_fs_ds_index *ctf_fs_ds_index_create(size_t length)
{
@@
-521,6
+524,7
@@
error:
BT_HIDDEN
struct ctf_fs_ds_file *ctf_fs_ds_file_create(
struct ctf_fs_trace *ctf_fs_trace,
BT_HIDDEN
struct ctf_fs_ds_file *ctf_fs_ds_file_create(
struct ctf_fs_trace *ctf_fs_trace,
+ struct bt_ctf_notif_iter *notif_iter,
struct bt_ctf_stream *stream, const char *path)
{
int ret;
struct bt_ctf_stream *stream, const char *path)
{
int ret;
@@
-544,8
+548,8
@@
struct ctf_fs_ds_file *ctf_fs_ds_file_create(
goto error;
}
goto error;
}
- ds_file->notif_iter =
bt_ctf_notif_iter_create(
-
ctf_fs_trace->metadata->trace, page_size, medops
, ds_file);
+ ds_file->notif_iter =
notif_iter;
+
bt_ctf_notif_iter_set_medops_data(ds_file->notif_iter
, ds_file);
if (!ds_file->notif_iter) {
goto error;
}
if (!ds_file->notif_iter) {
goto error;
}
@@
-585,10
+589,6
@@
void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file)
ctf_fs_file_destroy(ds_file->file);
}
ctf_fs_file_destroy(ds_file->file);
}
- if (ds_file->notif_iter) {
- bt_ctf_notif_iter_destroy(ds_file->notif_iter);
- }
-
g_free(ds_file);
}
g_free(ds_file);
}
This page took
0.024836 seconds
and
4
git commands to generate.