X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=08834e9744318e944ae97ad006c43f8ca79b8bb0;hp=8556055e8ab2f5f1b921068e237a67ccee79a69b;hb=b61922b5e7b4d7ec5ed960c3d842886b5a97f549;hpb=d11e9c4975d88591e2324b6b11f426a22995833f diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index 8556055e..08834e97 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -49,7 +49,8 @@ extern int yydebug; struct trace_descriptor *ctf_open_trace(const char *path, int flags); void ctf_close_trace(struct trace_descriptor *descriptor); -static rw_dispatch read_dispatch_table[] = { +static +rw_dispatch read_dispatch_table[] = { [ CTF_TYPE_INTEGER ] = ctf_integer_read, [ CTF_TYPE_FLOAT ] = ctf_float_read, [ CTF_TYPE_ENUM ] = ctf_enum_read, @@ -60,7 +61,8 @@ static rw_dispatch read_dispatch_table[] = { [ CTF_TYPE_SEQUENCE ] = ctf_sequence_rw, }; -static rw_dispatch write_dispatch_table[] = { +static +rw_dispatch write_dispatch_table[] = { [ CTF_TYPE_INTEGER ] = ctf_integer_write, [ CTF_TYPE_FLOAT ] = ctf_float_write, [ CTF_TYPE_ENUM ] = ctf_enum_write, @@ -71,12 +73,13 @@ static rw_dispatch write_dispatch_table[] = { [ CTF_TYPE_SEQUENCE ] = ctf_sequence_rw, }; +static struct format ctf_format = { .open_trace = ctf_open_trace, .close_trace = ctf_close_trace, }; -void ctf_init_pos(struct ctf_stream_pos *pos, int fd) +void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags) { pos->fd = fd; pos->mmap_offset = 0; @@ -86,29 +89,28 @@ void ctf_init_pos(struct ctf_stream_pos *pos, int fd) pos->base = NULL; pos->offset = 0; pos->dummy = false; - pos->packet_index = g_array_new(FALSE, TRUE, - sizeof(struct packet_index)); pos->cur_index = 0; - if (fd >= 0) { - int flags = fcntl(fd, F_GETFL, 0); - - switch (flags & O_ACCMODE) { - case O_RDONLY: - pos->prot = PROT_READ; - pos->flags = MAP_PRIVATE; - pos->parent.rw_table = read_dispatch_table; - break; - case O_WRONLY: - case O_RDWR: - pos->prot = PROT_WRITE; /* Write has priority */ - pos->flags = MAP_SHARED; - pos->parent.rw_table = write_dispatch_table; - ctf_move_pos_slow(pos, 0); /* position for write */ - break; - default: - assert(0); - } - + if (fd >= 0) + pos->packet_index = g_array_new(FALSE, TRUE, + sizeof(struct packet_index)); + else + pos->packet_index = NULL; + switch (open_flags & O_ACCMODE) { + case O_RDONLY: + pos->prot = PROT_READ; + pos->flags = MAP_PRIVATE; + pos->parent.rw_table = read_dispatch_table; + break; + case O_WRONLY: + case O_RDWR: + pos->prot = PROT_WRITE; /* Write has priority */ + pos->flags = MAP_SHARED; + pos->parent.rw_table = write_dispatch_table; + if (fd >= 0) + ctf_move_pos_slow(pos, 0, SEEK_SET); /* position for write */ + break; + default: + assert(0); } } @@ -130,12 +132,14 @@ void ctf_fini_pos(struct ctf_stream_pos *pos) (void) g_array_free(pos->packet_index, TRUE); } -void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset) +void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence) { int ret; off_t off; struct packet_index *index; + /* Only allow random seek in read mode */ + assert(pos->prot != PROT_WRITE || whence == SEEK_CUR); if (pos->prot == PROT_WRITE && pos->content_size_loc) *pos->content_size_loc = pos->offset; @@ -148,6 +152,7 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset) strerror(errno)); assert(0); } + pos->base = NULL; } /* @@ -168,16 +173,25 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset) pos->packet_size = WRITE_PACKET_LEN; off = posix_fallocate(pos->fd, pos->mmap_offset, pos->packet_size / CHAR_BIT); assert(off >= 0); + pos->offset = 0; } else { - /* The reader will expect us to skip padding */ - assert(pos->offset + offset == pos->content_size); - - /* - * Don't increment for initial stream move (only condition where - * pos->offset can be 0). - */ - if (pos->offset) + switch (whence) { + case SEEK_CUR: + /* The reader will expect us to skip padding */ + assert(pos->offset + offset == pos->content_size); ++pos->cur_index; + break; + case SEEK_SET: + assert(offset == 0); /* only seek supported for now */ + pos->cur_index = 0; + break; + default: + assert(0); + } + if (pos->cur_index >= pos->packet_index->len) { + pos->offset = -EOF; + return; + } index = &g_array_index(pos->packet_index, struct packet_index, pos->cur_index); pos->mmap_offset = index->offset; @@ -185,11 +199,16 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset) /* Lookup context/packet size in index */ pos->content_size = index->content_size; pos->packet_size = index->packet_size; + pos->offset = index->data_offset; } /* map new base. Need mapping length from header. */ pos->base = mmap(NULL, pos->packet_size / CHAR_BIT, pos->prot, pos->flags, pos->fd, pos->mmap_offset); - pos->offset = 0; + if (pos->base == MAP_FAILED) { + fprintf(stdout, "[error] mmap error %s.\n", + strerror(errno)); + assert(0); + } } /* @@ -429,6 +448,8 @@ int create_stream_packet_index(struct ctf_trace *td, /* Use content size if non-zero, else file size */ packet_index.packet_size = packet_index.content_size ? : filestats.st_size * CHAR_BIT; } + /* Save position after header and context */ + packet_index.data_offset = pos->offset; /* add index to packet array */ g_array_append_val(file_stream->pos.packet_index, packet_index); @@ -436,6 +457,9 @@ int create_stream_packet_index(struct ctf_trace *td, pos->mmap_offset += packet_index.packet_size / CHAR_BIT; } + /* Move pos back to beginning of file */ + ctf_move_pos_slow(pos, 0, SEEK_SET); /* position for write */ + return 0; } @@ -453,7 +477,7 @@ 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); - ctf_init_pos(&file_stream->pos, ret); + ctf_init_pos(&file_stream->pos, ret, flags); ret = create_stream_packet_index(td, file_stream); if (ret) goto error_index; @@ -549,30 +573,6 @@ error: return ret; } -static -int ctf_open_trace_write(struct ctf_trace *td, const char *path, int flags) -{ - int ret; - - ret = mkdir(path, S_IRWXU|S_IRWXG); - if (ret) - return ret; - - /* Open trace directory */ - td->dir = opendir(path); - if (!td->dir) { - fprintf(stdout, "[error] Unable to open trace directory.\n"); - ret = -ENOENT; - goto error; - } - - - return 0; - -error: - return ret; -} - struct trace_descriptor *ctf_open_trace(const char *path, int flags) { struct ctf_trace *td; @@ -582,6 +582,10 @@ struct trace_descriptor *ctf_open_trace(const char *path, int flags) switch (flags & O_ACCMODE) { case O_RDONLY: + if (!path) { + fprintf(stdout, "[error] Path missing for input CTF trace.\n"); + goto error; + } ret = ctf_open_trace_read(td, path, flags); if (ret) goto error; @@ -589,12 +593,6 @@ struct trace_descriptor *ctf_open_trace(const char *path, int flags) case O_WRONLY: fprintf(stdout, "[error] Opening CTF traces for output is not supported yet.\n"); goto error; -#if 0 - ret = ctf_open_trace_write(td, path, flags); - if (ret) - goto error; -#endif //0 - break; default: fprintf(stdout, "[error] Incorrect open flags.\n"); goto error; @@ -622,11 +620,10 @@ void ctf_close_trace(struct trace_descriptor *tdp) for (i = 0; i < td->streams->len; i++) { struct ctf_stream *stream; int j; - stream = g_ptr_array_index(td->streams, i); for (j = 0; j < stream->files->len; j++) { struct ctf_file_stream *file_stream; - file_stream = g_ptr_array_index(td->streams, j); + file_stream = g_ptr_array_index(stream->files, j); ctf_close_file_stream(file_stream); }