X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=7c354bf0a40710a9eed836226d6bb273f94b2148;hp=f4432a89d167c0fe01e181232f246ad4cf5b73e0;hb=a0fe7d97d4a551665af7bd91f7571dc785a75951;hpb=764af3f43c289a0a5cd8bf6fd85d9361ae17a253 diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index f4432a89..7c354bf0 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); @@ -370,15 +376,141 @@ 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, 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; + } + printf("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 = -EOF; + break; + } + if (feof(in)) { + ret = -EINVAL; + 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 == -EOF) { + ret = 0; + break; + } else if (ret) { + 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 +529,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 +569,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 +645,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; @@ -693,8 +833,6 @@ int ctf_open_trace_read(struct ctf_trace *td, const char *path, int flags) goto error_dirfd; } - td->streams = g_ptr_array_new(); - /* * Keep the metadata file separate. */ @@ -741,7 +879,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);