struct trace_descriptor *ctf_open_trace(const char *path, int flags);
void ctf_close_trace(struct trace_descriptor *descriptor);
-static struct format ctf_format = {
- .uint_read = ctf_uint_read,
- .int_read = ctf_int_read,
- .uint_write = ctf_uint_write,
- .int_write = ctf_int_write,
- .double_read = ctf_double_read,
- .double_write = ctf_double_write,
- .ldouble_read = ctf_ldouble_read,
- .ldouble_write = ctf_ldouble_write,
- .float_copy = ctf_float_copy,
- .string_copy = ctf_string_copy,
- .string_read = ctf_string_read,
- .string_write = ctf_string_write,
- .string_free_temp = ctf_string_free_temp,
- .enum_read = ctf_enum_read,
- .enum_write = ctf_enum_write,
- .struct_begin = ctf_struct_begin,
- .struct_end = ctf_struct_end,
- .variant_begin = ctf_variant_begin,
- .variant_end = ctf_variant_end,
- .array_begin = ctf_array_begin,
- .array_end = ctf_array_end,
- .sequence_begin = ctf_sequence_begin,
- .sequence_end = ctf_sequence_end,
+static
+rw_dispatch read_dispatch_table[] = {
+ [ CTF_TYPE_INTEGER ] = ctf_integer_read,
+ [ CTF_TYPE_FLOAT ] = ctf_float_read,
+ [ CTF_TYPE_ENUM ] = ctf_enum_read,
+ [ 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,
+};
+
+static
+rw_dispatch write_dispatch_table[] = {
+ [ CTF_TYPE_INTEGER ] = ctf_integer_write,
+ [ CTF_TYPE_FLOAT ] = ctf_float_write,
+ [ CTF_TYPE_ENUM ] = ctf_enum_write,
+ [ 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,
+};
+
+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;
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;
- break;
- case O_WRONLY:
- case O_RDWR:
- pos->prot = PROT_WRITE; /* Write has priority */
- pos->flags = MAP_SHARED;
- 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);
}
}
(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;
strerror(errno));
assert(0);
}
+ pos->base = NULL;
}
/*
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;
/* 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);
+ }
}
/*
/* read and check header, set stream id (and check) */
if (td->packet_header) {
/* Read packet header */
- td->packet_header->p.declaration->copy(NULL, NULL,
- &pos->parent, &ctf_format, &td->packet_header->p);
+ generic_rw(&pos->parent, &td->packet_header->p);
len_index = struct_declaration_lookup_field_index(td->packet_header->declaration, g_quark_from_static_string("magic"));
if (len_index >= 0) {
if (stream->packet_context) {
/* Read packet context */
- stream->packet_context->p.declaration->copy(NULL, NULL,
- &pos->parent, &ctf_format, &stream->packet_context->p);
+ generic_rw(&pos->parent, &stream->packet_context->p);
/* read content size from header */
len_index = struct_declaration_lookup_field_index(stream->packet_context->declaration, g_quark_from_static_string("content_size"));
/* 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);
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;
}
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;
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;
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;
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;
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);
}
projects / babeltrace.git / blobdiff