X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=27c03cfa8c2e23d211f2a5ed16fe5582f2f6bc66;hp=021abf88891c6c0ff7dc62beedde1444a162f061;hb=3abe83c77fdaadea8528e7787bafe1ed6c16a1ac;hpb=8c2df3f54753071109700562c681511b1f59f0d3 diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index 021abf88..27c03cfa 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -55,7 +55,9 @@ 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); @@ -97,7 +99,7 @@ void ctf_update_timestamp(struct ctf_stream *stream, 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; } @@ -125,16 +127,27 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream) uint64_t id = 0; int ret; - if (pos->offset == EOF) + /* We need to check for EOF here for empty files. */ + if (unlikely(pos->offset == EOF)) return EOF; + ctf_pos_get_event(pos); + + /* + * 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); @@ -156,6 +169,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream) id = integer_definition->value._unsigned; } } + stream->event_id = id; /* lookup timestamp */ stream->has_timestamp = 0; @@ -181,12 +195,12 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream) 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; } @@ -199,7 +213,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream) } /* Read event payload */ - if (event->event_fields) { + if (likely(event->event_fields)) { ret = generic_rw(ppos, &event->event_fields->p); if (ret) goto error; @@ -217,35 +231,13 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream) { struct ctf_stream_class *stream_class = stream->stream_class; struct ctf_stream_event *event; - uint64_t id = 0; + uint64_t id; int ret; - /* print event header */ - if (stream->stream_event_header) { - struct definition_integer *integer_definition; - struct definition *variant; - - /* lookup event id */ - integer_definition = lookup_integer(&stream->stream_event_header->p, "id", FALSE); - if (integer_definition) { - id = integer_definition->value._unsigned; - } else { - struct definition_enum *enum_definition; - - enum_definition = lookup_enum(&stream->stream_event_header->p, "id", FALSE); - if (enum_definition) { - id = enum_definition->integer->value._unsigned; - } - } - - variant = lookup_variant(&stream->stream_event_header->p, "v"); - if (variant) { - integer_definition = lookup_integer(variant, "id", FALSE); - if (integer_definition) { - id = integer_definition->value._unsigned; - } - } + id = stream->event_id; + /* print event header */ + if (likely(stream->stream_event_header)) { ret = generic_rw(pos, &stream->stream_event_header->p); if (ret) goto error; @@ -258,12 +250,12 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream) 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; } @@ -276,7 +268,7 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream) } /* 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; @@ -390,8 +382,11 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence) assert(off >= 0); pos->offset = 0; } else { + read_next_packet: switch (whence) { case SEEK_CUR: + if (pos->offset == EOF) + return; /* The reader will expect us to skip padding */ assert(pos->offset + offset == pos->content_size); ++pos->cur_index; @@ -415,9 +410,15 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence) file_stream->parent.timestamp = index->timestamp_begin; pos->content_size = index->content_size; pos->packet_size = index->packet_size; - if (index->data_offset < index->content_size) + if (index->data_offset < index->content_size) { pos->offset = 0; /* will read headers */ - else { + } else if (index->data_offset == index->content_size) { + /* empty packet */ + pos->offset = index->data_offset; + offset = 0; + whence = SEEK_CUR; + goto read_next_packet; + } else { pos->offset = EOF; return; } @@ -470,6 +471,32 @@ end: return ret; } +/* + * Returns 0 on success, -1 on error. + */ +static +int check_version(unsigned int major, unsigned int minor) +{ + switch (major) { + case 1: + switch (minor) { + case 8: + return 0; + default: + goto warning; + } + default: + goto warning; + + } + + /* eventually return an error instead of warning */ +warning: + fprintf(stdout, "[warning] Unsupported CTF specification version %u.%u. Trying anyway.\n", + major, minor); + return 0; +} + static int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, FILE *out) @@ -506,6 +533,8 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, header.checksum_scheme); return -EINVAL; } + if (check_version(header.major, header.minor) < 0) + return -EINVAL; if (!CTF_TRACE_FIELD_IS_SET(td, uuid)) { memcpy(td->uuid, header.uuid, sizeof(header.uuid)); CTF_TRACE_SET_FIELD(td, uuid); @@ -540,10 +569,19 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, toread -= readlen; if (!toread) { ret = 0; /* continue reading next packet */ - break; + goto read_padding; } } return ret; + +read_padding: + toread = (header.packet_size - header.content_size) / CHAR_BIT; + ret = fseek(in, toread, SEEK_CUR); + if (ret < 0) { + fprintf(stdout, "[warning] Missing padding at end of file\n"); + ret = 0; + } + return ret; } static @@ -582,7 +620,9 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, } 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; @@ -591,38 +631,53 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td) 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); if (ret) goto end_packet_read; } else { - char buf[sizeof("/* TSDL")]; /* Includes \0 */ - ssize_t readlen; + unsigned int major, minor; + ssize_t nr_items; td->byte_order = BYTE_ORDER; - /* Check text-only metadata header */ - buf[sizeof("/* TSDL") - 1] = '\0'; - readlen = fread(buf, sizeof("/* TSDL") - 1, 1, fp); - if (readlen < 1 || strcmp(buf, "/* TSDL") != 0) - fprintf(stdout, "[warning] Missing \"/* TSDL\" header for text-only metadata.\n"); + /* Check text-only metadata header and version */ + nr_items = fscanf(fp, "/* CTF %u.%u", &major, &minor); + if (nr_items < 2) + fprintf(stdout, "[warning] Ill-shapen or missing \"/* CTF x.y\" header for text-only metadata.\n"); + if (check_version(major, minor) < 0) { + ret = -EINVAL; + goto end_packet_read; + } rewind(fp); } @@ -1053,7 +1108,9 @@ error: * 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; @@ -1062,6 +1119,15 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags) 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) @@ -1086,7 +1152,9 @@ error: } 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; @@ -1114,7 +1182,7 @@ int ctf_open_trace_read(struct ctf_trace *td, const char *path, int flags) * 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; } @@ -1143,7 +1211,7 @@ int ctf_open_trace_read(struct ctf_trace *td, const char *path, int flags) || !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; @@ -1164,7 +1232,9 @@ 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; @@ -1177,7 +1247,7 @@ struct trace_descriptor *ctf_open_trace(const char *path, int flags) 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;