X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=95a581fa4300f55c65cb9677f90c8196852bdef3;hb=70bd0a12b09ce7f233189cf07e090fda593ebc48;hp=28be4fd0cad21357a105f9c4a6984fd7e86f5b7f;hpb=5e2eb0aebe6dd62c86d2b96030cb1ba3a0793bec;p=babeltrace.git diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index 28be4fd0..95a581fa 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -3,7 +3,9 @@ * * Format registration. * - * Copyright 2010, 2011 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -19,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -123,8 +125,11 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream) uint64_t id = 0; int ret; + ctf_pos_get_event(pos); + if (pos->offset == EOF) return EOF; + assert(pos->offset < pos->content_size); /* Read event header */ if (stream->stream_event_header) { @@ -154,6 +159,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; @@ -215,35 +221,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; + id = stream->event_id; + /* 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; - } - } - ret = generic_rw(pos, &stream->stream_event_header->p); if (ret) goto error; @@ -388,8 +372,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; @@ -413,9 +400,14 @@ 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; + goto read_next_packet; + } else { pos->offset = EOF; return; } @@ -456,24 +448,51 @@ int packet_metadata(struct ctf_trace *td, FILE *fp) if (magic == TSDL_MAGIC) { ret = 1; td->byte_order = BYTE_ORDER; + CTF_TRACE_SET_FIELD(td, byte_order); } else if (magic == GUINT32_SWAP_LE_BE(TSDL_MAGIC)) { ret = 1; td->byte_order = (BYTE_ORDER == BIG_ENDIAN) ? LITTLE_ENDIAN : BIG_ENDIAN; + CTF_TRACE_SET_FIELD(td, byte_order); } - CTF_TRACE_SET_FIELD(td, byte_order); end: rewind(fp); 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) { struct metadata_packet_header header; size_t readlen, writelen, toread; - char buf[4096]; + char buf[4096 + 1]; /* + 1 for debug-mode \0 */ int ret = 0; readlen = fread(&header, header_sizeof(header), 1, in); @@ -503,6 +522,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); @@ -514,12 +535,13 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, toread = (header.content_size / CHAR_BIT) - header_sizeof(header); for (;;) { - readlen = fread(buf, sizeof(char), min(sizeof(buf), toread), in); + readlen = fread(buf, sizeof(char), min(sizeof(buf) - 1, toread), in); if (ferror(in)) { ret = -EINVAL; break; } if (babeltrace_debug) { + buf[readlen] = '\0'; fprintf(stdout, "[debug] metadata packet read: %s\n", buf); } @@ -536,10 +558,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 @@ -608,6 +639,21 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td) ret = ctf_open_trace_metadata_stream_read(td, &fp, &buf); if (ret) goto end_packet_read; + } else { + unsigned int major, minor; + ssize_t nr_items; + + td->byte_order = BYTE_ORDER; + + /* 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); } scanner = ctf_scanner_alloc(fp); @@ -636,7 +682,7 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td) goto end; } ret = ctf_visitor_construct_metadata(stdout, 0, &scanner->ast->root, - td, BYTE_ORDER); + td, td->byte_order); if (ret) { fprintf(stdout, "[error] Error in CTF metadata constructor %d\n", ret); goto end; @@ -905,13 +951,12 @@ int create_stream_packet_index(struct ctf_trace *td, return -EINVAL; } file_stream->parent.stream_class = stream; + ret = create_stream_definitions(td, &file_stream->parent); + if (ret) + return ret; } first_packet = 0; - ret = create_stream_definitions(td, &file_stream->parent); - if (ret) - return ret; - if (file_stream->parent.stream_packet_context) { /* Read packet context */ ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p);