X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=41aa35d60fd6a67e23b128a60a258ed03215bab2;hp=b0d3ebcfece2cd897c0e209104e5f120e281214f;hb=4152822bf555f86a1dce28cb6755ff0849c3a75a;hpb=b4c19c1e0a905f94146e6f319218fb16b7ebbca1 diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index b0d3ebcf..41aa35d6 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -46,6 +46,10 @@ #define WRITE_PACKET_LEN (getpagesize() * 8 * CHAR_BIT) #define UUID_LEN 16 /* uuid by value len */ +#ifndef min +#define min(a, b) (((a) < (b)) ? (a) : (b)) +#endif + extern int yydebug; struct trace_descriptor *ctf_open_trace(const char *path, int flags); @@ -59,8 +63,8 @@ rw_dispatch read_dispatch_table[] = { [ CTF_TYPE_STRING ] = ctf_string_read, [ CTF_TYPE_STRUCT ] = ctf_struct_rw, [ CTF_TYPE_VARIANT ] = ctf_variant_rw, - [ CTF_TYPE_ARRAY ] = ctf_array_rw, - [ CTF_TYPE_SEQUENCE ] = ctf_sequence_rw, + [ CTF_TYPE_ARRAY ] = ctf_array_read, + [ CTF_TYPE_SEQUENCE ] = ctf_sequence_read, }; static @@ -71,8 +75,8 @@ rw_dispatch write_dispatch_table[] = { [ CTF_TYPE_STRING ] = ctf_string_write, [ CTF_TYPE_STRUCT ] = ctf_struct_rw, [ CTF_TYPE_VARIANT ] = ctf_variant_rw, - [ CTF_TYPE_ARRAY ] = ctf_array_rw, - [ CTF_TYPE_SEQUENCE ] = ctf_sequence_rw, + [ CTF_TYPE_ARRAY ] = ctf_array_write, + [ CTF_TYPE_SEQUENCE ] = ctf_sequence_write, }; static @@ -89,7 +93,6 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream) struct ctf_stream_class *stream_class = stream->stream_class; struct ctf_event *event_class; uint64_t id = 0; - int len_index; int ret; if (pos->offset == EOF) @@ -97,38 +100,43 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream) /* Read event header */ if (stream_class->event_header) { + struct definition_integer *integer_definition; + ret = generic_rw(ppos, &stream_class->event_header->p); if (ret) goto error; /* lookup event id */ - len_index = struct_declaration_lookup_field_index(stream_class->event_header_decl, - g_quark_from_static_string("id")); - if (len_index >= 0) { - struct definition_integer *defint; - struct definition *field; + integer_definition = lookup_integer(&stream_class->event_header->p, "id", FALSE); + if (integer_definition) { + id = integer_definition->value._unsigned; + } else { + struct definition_enum *enum_definition; - field = struct_definition_get_field_from_index(stream_class->event_header, len_index); - assert(field->declaration->id == CTF_TYPE_INTEGER); - defint = container_of(field, struct definition_integer, p); - assert(defint->declaration->signedness == FALSE); - id = defint->value._unsigned; /* set id */ + enum_definition = lookup_enum(&stream_class->event_header->p, "id", FALSE); + if (enum_definition) { + id = enum_definition->integer->value._unsigned; + } } /* lookup timestamp */ - len_index = struct_declaration_lookup_field_index(stream_class->event_header_decl, - g_quark_from_static_string("timestamp")); - if (len_index >= 0) { - struct definition_integer *defint; - struct definition *field; + integer_definition = lookup_integer(&stream_class->event_header->p, "timestamp", FALSE); + if (integer_definition) { + stream->timestamp = integer_definition->value._unsigned; + } else { + struct definition *definition; - field = struct_definition_get_field_from_index(stream_class->event_header, len_index); - assert(field->declaration->id == CTF_TYPE_INTEGER); - defint = container_of(field, struct definition_integer, p); - assert(defint->declaration->signedness == FALSE); - /* update timestamp */ - stream->timestamp = defint->value._unsigned; + definition = lookup_variant(&stream_class->event_header->p, "v"); + if (definition) { + integer_definition = lookup_integer(definition, "id", FALSE); + if (integer_definition) { + id = integer_definition->value._unsigned; + } + integer_definition = lookup_integer(definition, "timestamp", FALSE); + if (integer_definition) { + stream->timestamp = integer_definition->value._unsigned; + } + } } - } /* Read stream-declared event context */ @@ -380,7 +388,7 @@ int packet_metadata(struct ctf_trace *td, FILE *fp) int ret = 0; len = fread(&magic, sizeof(magic), 1, fp); - if (len != sizeof(magic)) { + if (len != 1) { goto end; } if (magic == TSDL_MAGIC) { @@ -391,6 +399,7 @@ int packet_metadata(struct ctf_trace *td, FILE *fp) td->byte_order = (BYTE_ORDER == BIG_ENDIAN) ? LITTLE_ENDIAN : BIG_ENDIAN; } + CTF_TRACE_SET_FIELD(td, byte_order); end: rewind(fp); return ret; @@ -401,12 +410,12 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, FILE *out) { struct metadata_packet_header header; - size_t readlen, writelen; + size_t readlen, writelen, toread; char buf[4096]; int ret = 0; - readlen = fread(&header, sizeof(header), 1, in); - if (readlen < sizeof(header)) + readlen = fread(&header, header_sizeof(header), 1, in); + if (readlen < 1) return -EINVAL; if (td->byte_order != BYTE_ORDER) { @@ -440,12 +449,19 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, return -EINVAL; } - while (!feof(in)) { - readlen = fread(buf, sizeof(char), sizeof(buf), in); + toread = header.content_size / CHAR_BIT; + + for (;;) { + readlen = fread(buf, sizeof(char), min(sizeof(buf), toread), in); if (ferror(in)) { ret = -EINVAL; break; } + if (babeltrace_debug) { + fprintf(stdout, "[debug] metadata packet read: %s\n", + buf); + } + writelen = fwrite(buf, sizeof(char), readlen, out); if (writelen < readlen) { ret = -EIO; @@ -455,6 +471,11 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, ret = -EINVAL; break; } + toread -= readlen; + if (!toread) { + ret = 0; /* continue reading next packet */ + break; + } } return ret; } @@ -474,10 +495,11 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, for (;;) { ret = ctf_open_trace_metadata_packet_read(td, in, out); - if (ret == -EOF) { - ret = 0; + if (ret) { break; - } else if (ret) { + } + if (feof(in)) { + ret = 0; break; } } @@ -862,7 +884,6 @@ int ctf_open_trace_read(struct ctf_trace *td, const char *path, int flags) readdir_error: free(dirent); error_metadata: - g_ptr_array_free(td->streams, TRUE); close(td->dirfd); error_dirfd: closedir(td->dir);