extern int yydebug;
static
-struct trace_descriptor *ctf_open_trace(const char *path, int flags);
+struct trace_descriptor *ctf_open_trace(const char *path, int flags,
+ void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ int whence), FILE *metadata_fp);
static
void ctf_close_trace(struct trace_descriptor *descriptor);
integer_definition->declaration;
uint64_t oldval, newval, updateval;
- if (integer_declaration->len == 64) {
+ if (unlikely(integer_declaration->len == 64)) {
stream->timestamp = integer_definition->value._unsigned;
return;
}
uint64_t id = 0;
int ret;
+ /* We need to check for EOF here for empty files. */
+ if (unlikely(pos->offset == EOF))
+ return EOF;
+
ctf_pos_get_event(pos);
- if (pos->offset == EOF)
+ /*
+ * This is the EOF check after we've advanced the position in
+ * ctf_pos_get_event.
+ */
+ if (unlikely(pos->offset == EOF))
return EOF;
assert(pos->offset < pos->content_size);
/* Read event header */
- if (stream->stream_event_header) {
+ if (likely(stream->stream_event_header)) {
struct definition_integer *integer_definition;
struct definition *variant;
ret = generic_rw(ppos, &stream->stream_event_header->p);
- if (ret)
+ if (unlikely(ret))
goto error;
/* lookup event id */
integer_definition = lookup_integer(&stream->stream_event_header->p, "id", FALSE);
goto error;
}
- if (id >= stream_class->events_by_id->len) {
+ if (unlikely(id >= stream_class->events_by_id->len)) {
fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
return -EINVAL;
}
event = g_ptr_array_index(stream->events_by_id, id);
- if (!event) {
+ if (unlikely(!event)) {
fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
return -EINVAL;
}
}
/* Read event payload */
- if (event->event_fields) {
+ if (likely(event->event_fields)) {
ret = generic_rw(ppos, &event->event_fields->p);
if (ret)
goto error;
id = stream->event_id;
/* print event header */
- if (stream->stream_event_header) {
+ if (likely(stream->stream_event_header)) {
ret = generic_rw(pos, &stream->stream_event_header->p);
if (ret)
goto error;
goto error;
}
- if (id >= stream_class->events_by_id->len) {
+ if (unlikely(id >= stream_class->events_by_id->len)) {
fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
return -EINVAL;
}
event = g_ptr_array_index(stream->events_by_id, id);
- if (!event) {
+ if (unlikely(!event)) {
fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
return -EINVAL;
}
}
/* Read and print event payload */
- if (event->event_fields) {
+ if (likely(event->event_fields)) {
ret = generic_rw(pos, &event->event_fields->p);
if (ret)
goto error;
/* empty packet */
pos->offset = index->data_offset;
offset = 0;
+ whence = SEEK_CUR;
goto read_next_packet;
} else {
pos->offset = EOF;
}
static
-int ctf_open_trace_metadata_read(struct ctf_trace *td)
+int ctf_open_trace_metadata_read(struct ctf_trace *td,
+ void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ int whence), FILE *metadata_fp)
{
struct ctf_scanner *scanner;
struct ctf_file_stream *metadata_stream;
int ret = 0;
metadata_stream = g_new0(struct ctf_file_stream, 1);
- td->metadata = &metadata_stream->parent;
- metadata_stream->pos.fd = openat(td->dirfd, "metadata", O_RDONLY);
- if (metadata_stream->pos.fd < 0) {
- fprintf(stdout, "Unable to open metadata.\n");
- return metadata_stream->pos.fd;
+
+ if (move_pos_slow) {
+ metadata_stream->pos.move_pos_slow = move_pos_slow;
+ } else {
+ fprintf(stderr, "[error] move_pos_slow function undefined.\n");
+ ret = -1;
+ goto end_stream;
}
- if (babeltrace_debug)
- yydebug = 1;
+ if (metadata_fp) {
+ fp = metadata_fp;
+ } else {
+ td->metadata = &metadata_stream->parent;
+ metadata_stream->pos.fd = openat(td->dirfd, "metadata", O_RDONLY);
+ if (metadata_stream->pos.fd < 0) {
+ fprintf(stdout, "Unable to open metadata.\n");
+ return metadata_stream->pos.fd;
+ }
- fp = fdopen(metadata_stream->pos.fd, "r");
- if (!fp) {
- fprintf(stdout, "[error] Unable to open metadata stream.\n");
- ret = -errno;
- goto end_stream;
+ fp = fdopen(metadata_stream->pos.fd, "r");
+ if (!fp) {
+ fprintf(stdout, "[error] Unable to open metadata stream.\n");
+ ret = -errno;
+ goto end_stream;
+ }
}
+ if (babeltrace_debug)
+ yydebug = 1;
if (packet_metadata(td, fp)) {
ret = ctf_open_trace_metadata_stream_read(td, &fp, &buf);
return ret;
len_index = struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("magic"));
if (len_index >= 0) {
- struct definition_integer *defint;
struct definition *field;
+ uint64_t magic;
field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
- assert(field->declaration->id == CTF_TYPE_INTEGER);
- defint = container_of(field, struct definition_integer, p);
- assert(defint->declaration->signedness == FALSE);
- if (defint->value._unsigned != CTF_MAGIC) {
+ magic = get_unsigned_int(field);
+ if (magic != CTF_MAGIC) {
fprintf(stdout, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n",
- defint->value._unsigned,
+ magic,
file_stream->pos.packet_index->len,
(ssize_t) pos->mmap_offset);
return -EINVAL;
assert(field->declaration->id == CTF_TYPE_ARRAY);
defarray = container_of(field, struct definition_array, p);
assert(array_len(defarray) == UUID_LEN);
- assert(defarray->declaration->elem->id == CTF_TYPE_INTEGER);
for (i = 0; i < UUID_LEN; i++) {
struct definition *elem;
- struct definition_integer *defint;
elem = array_index(defarray, i);
- assert(elem);
- defint = container_of(elem, struct definition_integer, p);
- uuidval[i] = defint->value._unsigned;
+ uuidval[i] = get_unsigned_int(elem);
}
ret = uuid_compare(td->uuid, uuidval);
if (ret) {
len_index = struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("stream_id"));
if (len_index >= 0) {
- struct definition_integer *defint;
struct definition *field;
field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
- assert(field->declaration->id == CTF_TYPE_INTEGER);
- defint = container_of(field, struct definition_integer, p);
- assert(defint->declaration->signedness == FALSE);
- stream_id = defint->value._unsigned;
+ stream_id = get_unsigned_int(field);
}
}
/* read content size from header */
len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size"));
if (len_index >= 0) {
- struct definition_integer *defint;
struct definition *field;
field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
- assert(field->declaration->id == CTF_TYPE_INTEGER);
- defint = container_of(field, struct definition_integer, p);
- assert(defint->declaration->signedness == FALSE);
- packet_index.content_size = defint->value._unsigned;
+ packet_index.content_size = get_unsigned_int(field);
} else {
/* Use file size for packet size */
packet_index.content_size = filestats.st_size * CHAR_BIT;
/* read packet size from header */
len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size"));
if (len_index >= 0) {
- struct definition_integer *defint;
struct definition *field;
field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
- assert(field->declaration->id == CTF_TYPE_INTEGER);
- defint = container_of(field, struct definition_integer, p);
- assert(defint->declaration->signedness == FALSE);
- packet_index.packet_size = defint->value._unsigned;
+ packet_index.packet_size = get_unsigned_int(field);
} else {
/* Use content size if non-zero, else file size */
packet_index.packet_size = packet_index.content_size ? : filestats.st_size * CHAR_BIT;
/* read timestamp begin from header */
len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_begin"));
if (len_index >= 0) {
- struct definition_integer *defint;
struct definition *field;
field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
- assert(field->declaration->id == CTF_TYPE_INTEGER);
- defint = container_of(field, struct definition_integer, p);
- assert(defint->declaration->signedness == FALSE);
- packet_index.timestamp_begin = defint->value._unsigned;
+ packet_index.timestamp_begin = get_unsigned_int(field);
}
/* read timestamp end from header */
len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_end"));
if (len_index >= 0) {
- struct definition_integer *defint;
struct definition *field;
field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
- assert(field->declaration->id == CTF_TYPE_INTEGER);
- defint = container_of(field, struct definition_integer, p);
- assert(defint->declaration->signedness == FALSE);
- packet_index.timestamp_end = defint->value._unsigned;
+ packet_index.timestamp_end = get_unsigned_int(field);
}
} else {
/* Use file size for packet size */
* description (metadata).
*/
static
-int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags)
+int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
+ void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ int whence))
{
int ret;
struct ctf_file_stream *file_stream;
if (ret < 0)
goto error;
file_stream = g_new0(struct ctf_file_stream, 1);
+
+ if (move_pos_slow) {
+ file_stream->pos.move_pos_slow = move_pos_slow;
+ } else {
+ fprintf(stderr, "[error] move_pos_slow function undefined.\n");
+ ret = -1;
+ goto error_def;
+ }
+
ctf_init_pos(&file_stream->pos, ret, flags);
ret = create_trace_definitions(td, &file_stream->parent);
if (ret)
}
static
-int ctf_open_trace_read(struct ctf_trace *td, const char *path, int flags)
+int ctf_open_trace_read(struct ctf_trace *td, const char *path, int flags,
+ void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ int whence), FILE *metadata_fp)
{
int ret;
struct dirent *dirent;
* Keep the metadata file separate.
*/
- ret = ctf_open_trace_metadata_read(td);
+ ret = ctf_open_trace_metadata_read(td, move_pos_slow, metadata_fp);
if (ret) {
goto error_metadata;
}
|| !strcmp(diriter->d_name, "..")
|| !strcmp(diriter->d_name, "metadata"))
continue;
- ret = ctf_open_file_stream_read(td, diriter->d_name, flags);
+ ret = ctf_open_file_stream_read(td, diriter->d_name, flags, move_pos_slow);
if (ret) {
fprintf(stdout, "[error] Open file stream error.\n");
goto readdir_error;
}
static
-struct trace_descriptor *ctf_open_trace(const char *path, int flags)
+struct trace_descriptor *ctf_open_trace(const char *path, int flags,
+ void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+ int whence), FILE *metadata_fp)
{
struct ctf_trace *td;
int ret;
fprintf(stdout, "[error] Path missing for input CTF trace.\n");
goto error;
}
- ret = ctf_open_trace_read(td, path, flags);
+ ret = ctf_open_trace_read(td, path, flags, move_pos_slow, metadata_fp);
if (ret)
goto error;
break;
projects / babeltrace.git / blobdiff