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;
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;
* except to get exactly at the beginning of the next packet.
*/
if (pos->prot == PROT_WRITE) {
- /* The writer will add padding */
- assert(pos->offset + offset == pos->packet_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 writer will add padding */
+ assert(pos->offset + offset == pos->packet_size);
pos->mmap_offset += WRITE_PACKET_LEN / CHAR_BIT;
+ break;
+ case SEEK_SET:
+ assert(offset == 0); /* only seek supported for now */
+ pos->cur_index = 0;
+ break;
+ default:
+ assert(0);
+ }
pos->content_size = -1U; /* Unknown at this point */
pos->packet_size = WRITE_PACKET_LEN;
- off = posix_fallocate(pos->fd, pos->mmap_offset, pos->packet_size / CHAR_BIT);
+ off = posix_fallocate(pos->fd, pos->mmap_offset,
+ pos->packet_size / CHAR_BIT);
assert(off >= 0);
pos->offset = 0;
} else {
assert(0);
}
if (pos->cur_index >= pos->packet_index->len) {
- pos->offset = -EOF;
+ pos->offset = EOF;
return;
}
index = &g_array_index(pos->packet_index, struct packet_index,
/* read and check header, set stream id (and check) */
if (td->packet_header) {
/* Read packet header */
- generic_rw(&pos->parent, &td->packet_header->p);
-
+ ret = generic_rw(&pos->parent, &td->packet_header->p);
+ if (ret)
+ return ret;
len_index = struct_declaration_lookup_field_index(td->packet_header->declaration, g_quark_from_static_string("magic"));
if (len_index >= 0) {
struct definition_integer *defint;
- struct field *field;
+ struct definition *field;
field = struct_definition_get_field_from_index(td->packet_header, len_index);
- assert(field->definition->declaration->id == CTF_TYPE_INTEGER);
- defint = container_of(field->definition, struct definition_integer, p);
+ assert(field->declaration->id == CTF_TYPE_INTEGER);
+ defint = container_of(field, struct definition_integer, p);
assert(defint->declaration->signedness == FALSE);
if (defint->value._unsigned != CTF_MAGIC) {
- fprintf(stdout, "[error] Invalid magic number %" PRIX64 " at packet %u (file offset %zd).\n",
+ fprintf(stdout, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n",
defint->value._unsigned,
file_stream->pos.packet_index->len,
(ssize_t) pos->mmap_offset);
len_index = struct_declaration_lookup_field_index(td->packet_header->declaration, g_quark_from_static_string("trace_uuid"));
if (len_index >= 0) {
struct definition_array *defarray;
- struct field *field;
+ struct definition *field;
uint64_t i;
uint8_t uuidval[UUID_LEN];
field = struct_definition_get_field_from_index(td->packet_header, len_index);
- assert(field->definition->declaration->id == CTF_TYPE_ARRAY);
- defarray = container_of(field->definition, struct definition_array, p);
+ assert(field->declaration->id == CTF_TYPE_ARRAY);
+ defarray = container_of(field, struct definition_array, p);
assert(array_len(defarray) == UUID_LEN);
assert(defarray->declaration->elem->id == CTF_TYPE_INTEGER);
len_index = struct_declaration_lookup_field_index(td->packet_header->declaration, g_quark_from_static_string("stream_id"));
if (len_index >= 0) {
struct definition_integer *defint;
- struct field *field;
+ struct definition *field;
field = struct_definition_get_field_from_index(td->packet_header, len_index);
- assert(field->definition->declaration->id == CTF_TYPE_INTEGER);
- defint = container_of(field->definition, struct definition_integer, p);
+ assert(field->declaration->id == CTF_TYPE_INTEGER);
+ defint = container_of(field, struct definition_integer, p);
assert(defint->declaration->signedness == FALSE);
stream_id = defint->value._unsigned;
}
if (stream->packet_context) {
/* Read packet context */
- generic_rw(&pos->parent, &stream->packet_context->p);
-
+ ret = generic_rw(&pos->parent, &stream->packet_context->p);
+ if (ret)
+ return ret;
/* read content size from header */
len_index = struct_declaration_lookup_field_index(stream->packet_context->declaration, g_quark_from_static_string("content_size"));
if (len_index >= 0) {
struct definition_integer *defint;
- struct field *field;
+ struct definition *field;
field = struct_definition_get_field_from_index(stream->packet_context, len_index);
- assert(field->definition->declaration->id == CTF_TYPE_INTEGER);
- defint = container_of(field->definition, struct definition_integer, p);
+ assert(field->declaration->id == CTF_TYPE_INTEGER);
+ defint = container_of(field, struct definition_integer, p);
assert(defint->declaration->signedness == FALSE);
packet_index.content_size = defint->value._unsigned;
} else {
len_index = struct_declaration_lookup_field_index(stream->packet_context->declaration, g_quark_from_static_string("packet_size"));
if (len_index >= 0) {
struct definition_integer *defint;
- struct field *field;
+ struct definition *field;
field = struct_definition_get_field_from_index(stream->packet_context, len_index);
- assert(field->definition->declaration->id == CTF_TYPE_INTEGER);
- defint = container_of(field->definition, struct definition_integer, p);
+ assert(field->declaration->id == CTF_TYPE_INTEGER);
+ defint = container_of(field, struct definition_integer, p);
assert(defint->declaration->signedness == FALSE);
packet_index.packet_size = defint->value._unsigned;
} else {
/* Use content size if non-zero, else file size */
packet_index.packet_size = packet_index.content_size ? : filestats.st_size * CHAR_BIT;
}
+
+ /* Validate content size and packet size values */
+ if (packet_index.content_size > packet_index.packet_size) {
+ fprintf(stdout, "[error] Content size (%zu bits) is larger than packet size (%zu bits).\n",
+ packet_index.content_size, packet_index.packet_size);
+ return -EINVAL;
+ }
+
+ if (packet_index.packet_size > (filestats.st_size - packet_index.offset) * CHAR_BIT) {
+ fprintf(stdout, "[error] Packet size (%zu bits) is larger than remaining file size (%zu bits).\n",
+ packet_index.content_size, (filestats.st_size - packet_index.offset) * CHAR_BIT);
+ return -EINVAL;
+ }
+
/* Save position after header and context */
packet_index.data_offset = pos->offset;
}
if (!diriter)
break;
- if (!strcmp(diriter->d_name, ".")
+ /* Ignore hidden files, ., .. and metadata. */
+ if (!strncmp(diriter->d_name, ".", 1)
|| !strcmp(diriter->d_name, "..")
|| !strcmp(diriter->d_name, "metadata"))
continue;
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;
break;
- case O_WRONLY:
+ case O_RDWR:
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;
projects / babeltrace.git / blobdiff