X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=41aa35d60fd6a67e23b128a60a258ed03215bab2;hp=bdebaeb306d8eba78b2c6187dd0c1dc93c93d78c;hb=4152822bf555f86a1dce28cb6755ff0849c3a75a;hpb=b7e35badc2eac52e27b802a9078bfb7c8f3b04a7 diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index bdebaeb3..41aa35d6 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -21,9 +21,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -44,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); @@ -57,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 @@ -69,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 @@ -87,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) @@ -95,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 */ @@ -370,15 +380,142 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence) } } -/* - * TODO: for now, we treat the metadata file as a simple text file - * (without any header nor packets nor padding). - */ +static +int packet_metadata(struct ctf_trace *td, FILE *fp) +{ + uint32_t magic; + size_t len; + int ret = 0; + + len = fread(&magic, sizeof(magic), 1, fp); + if (len != 1) { + goto end; + } + if (magic == TSDL_MAGIC) { + ret = 1; + td->byte_order = 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); +end: + rewind(fp); + return ret; +} + +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]; + int ret = 0; + + readlen = fread(&header, header_sizeof(header), 1, in); + if (readlen < 1) + return -EINVAL; + + if (td->byte_order != BYTE_ORDER) { + header.magic = GUINT32_SWAP_LE_BE(header.magic); + header.checksum = GUINT32_SWAP_LE_BE(header.checksum); + header.content_size = GUINT32_SWAP_LE_BE(header.content_size); + header.packet_size = GUINT32_SWAP_LE_BE(header.packet_size); + } + if (header.checksum) + fprintf(stdout, "[warning] checksum verification not supported yet.\n"); + if (header.compression_scheme) { + fprintf(stdout, "[error] compression (%u) not supported yet.\n", + header.compression_scheme); + return -EINVAL; + } + if (header.encryption_scheme) { + fprintf(stdout, "[error] encryption (%u) not supported yet.\n", + header.encryption_scheme); + return -EINVAL; + } + if (header.checksum_scheme) { + fprintf(stdout, "[error] checksum (%u) not supported yet.\n", + header.checksum_scheme); + return -EINVAL; + } + if (!CTF_TRACE_FIELD_IS_SET(td, uuid)) { + memcpy(td->uuid, header.uuid, sizeof(header.uuid)); + CTF_TRACE_SET_FIELD(td, uuid); + } else { + if (uuid_compare(header.uuid, td->uuid)) + return -EINVAL; + } + + 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; + break; + } + if (ferror(out)) { + ret = -EINVAL; + break; + } + toread -= readlen; + if (!toread) { + ret = 0; /* continue reading next packet */ + break; + } + } + return ret; +} + +static +int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, + char **buf) +{ + FILE *in, *out; + size_t size; + int ret; + + in = *fp; + out = open_memstream(buf, &size); + if (out == NULL) + return -errno; + + for (;;) { + ret = ctf_open_trace_metadata_packet_read(td, in, out); + if (ret) { + break; + } + if (feof(in)) { + ret = 0; + break; + } + } + fclose(out); /* flush the buffer */ + fclose(in); + /* open for reading */ + *fp = fmemopen(*buf, size, "rb"); + return 0; +} + static int ctf_open_trace_metadata_read(struct ctf_trace *td) { struct ctf_scanner *scanner; FILE *fp; + char *buf = NULL; int ret = 0; td->metadata.pos.fd = openat(td->dirfd, "metadata", O_RDONLY); @@ -397,6 +534,12 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td) goto end_stream; } + if (packet_metadata(td, fp)) { + ret = ctf_open_trace_metadata_stream_read(td, &fp, &buf); + if (ret) + goto end_packet_read; + } + scanner = ctf_scanner_alloc(fp); if (!scanner) { fprintf(stdout, "[error] Error allocating scanner\n"); @@ -431,7 +574,9 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td) end: ctf_scanner_free(scanner); end_scanner_alloc: +end_packet_read: fclose(fp); + free(buf); end_stream: close(td->metadata.pos.fd); return ret; @@ -505,7 +650,7 @@ int create_stream_packet_index(struct ctf_trace *td, } /* check uuid */ - len_index = struct_declaration_lookup_field_index(td->packet_header->declaration, g_quark_from_static_string("trace_uuid")); + len_index = struct_declaration_lookup_field_index(td->packet_header->declaration, g_quark_from_static_string("uuid")); if (len_index >= 0) { struct definition_array *defarray; struct definition *field; @@ -739,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);