projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused stream_heap
[babeltrace.git]
/
formats
/
ctf
/
ctf.c
diff --git
a/formats/ctf/ctf.c
b/formats/ctf/ctf.c
index 01035f3d0be119d1d24798481b3b71a883ca8a73..6bb31e55f4efb31346fcdc8ee14457565734a619 100644
(file)
--- a/
formats/ctf/ctf.c
+++ b/
formats/ctf/ctf.c
@@
-426,9
+426,9
@@
void ctf_print_discarded(FILE *fp, struct ctf_stream_definition *stream,
}
fprintf(fp, "] in trace UUID ");
print_uuid(fp, stream->stream_class->trace->uuid);
}
fprintf(fp, "] in trace UUID ");
print_uuid(fp, stream->stream_class->trace->uuid);
- if (stream->stream_class->trace->path[0])
+ if (stream->stream_class->trace->pa
rent.pa
th[0])
fprintf(fp, ", at path: \"%s\"",
fprintf(fp, ", at path: \"%s\"",
- stream->stream_class->trace->path);
+ stream->stream_class->trace->pa
rent.pa
th);
fprintf(fp, ", within stream id %" PRIu64, stream->stream_id);
if (stream->path[0])
fprintf(fp, ", within stream id %" PRIu64, stream->stream_id);
if (stream->path[0])
@@
-781,7
+781,7
@@
void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence)
* case, the collection is not there, so we
* cannot print the timestamps.
*/
* case, the collection is not there, so we
* cannot print the timestamps.
*/
- if ((&file_stream->parent)->stream_class->trace->collection) {
+ if ((&file_stream->parent)->stream_class->trace->
parent.
collection) {
/*
* When a stream reaches the end of the
* file, we need to show the number of
/*
* When a stream reaches the end of the
* file, we need to show the number of
@@
-1472,7
+1472,7
@@
begin:
field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
packet_index.timestamp_begin = bt_get_unsigned_int(field);
field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
packet_index.timestamp_begin = bt_get_unsigned_int(field);
- if (file_stream->parent.stream_class->trace->collection) {
+ if (file_stream->parent.stream_class->trace->
parent.
collection) {
packet_index.timestamp_begin =
ctf_get_real_timestamp(
&file_stream->parent,
packet_index.timestamp_begin =
ctf_get_real_timestamp(
&file_stream->parent,
@@
-1487,7
+1487,7
@@
begin:
field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
packet_index.timestamp_end = bt_get_unsigned_int(field);
field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
packet_index.timestamp_end = bt_get_unsigned_int(field);
- if (file_stream->parent.stream_class->trace->collection) {
+ if (file_stream->parent.stream_class->trace->
parent.
collection) {
packet_index.timestamp_end =
ctf_get_real_timestamp(
&file_stream->parent,
packet_index.timestamp_end =
ctf_get_real_timestamp(
&file_stream->parent,
@@
-1711,8
+1711,8
@@
int ctf_open_trace_read(struct ctf_trace *td,
ret = -errno;
goto error_dirfd;
}
ret = -errno;
goto error_dirfd;
}
- strncpy(td->pa
th, path, sizeof(td->
path));
- td->pa
th[sizeof(td->
path) - 1] = '\0';
+ strncpy(td->pa
rent.path, path, sizeof(td->parent.
path));
+ td->pa
rent.path[sizeof(td->parent.
path) - 1] = '\0';
/*
* Keep the metadata file separate.
/*
* Keep the metadata file separate.
@@
-2093,7
+2093,7
@@
void ctf_set_context(struct bt_trace_descriptor *descriptor,
struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
parent);
struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
parent);
- td->ctx = ctx;
+ td->
parent.
ctx = ctx;
}
static
}
static
@@
-2103,7
+2103,7
@@
void ctf_set_handle(struct bt_trace_descriptor *descriptor,
struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
parent);
struct ctf_trace *td = container_of(descriptor, struct ctf_trace,
parent);
- td->handle = handle;
+ td->
parent.
handle = handle;
}
static
}
static
This page took
0.024701 seconds
and
4
git commands to generate.