struct ctf_stream_declaration *stream_class;
stream_class = g_ptr_array_index(tin->streams, i);
+ if (!stream_class)
+ continue;
/* for each file_stream */
for (j = 0; j < stream_class->streams->len; j++) {
struct ctf_stream_definition *stream;
struct ctf_stream_declaration *stream_class;
stream_class = g_ptr_array_index(tin->streams, i);
+ if (!stream_class)
+ continue;
/* for each file_stream */
for (j = 0; j < stream_class->streams->len; j++) {
struct ctf_stream_definition *stream;
/* save the current position as a restore point */
pos->last_offset = pos->offset;
- /* we just read the event, it is consumed when used by the caller */
- stream->consumed = 0;
/*
* This is the EOF check after we've advanced the position in
int ret = 0;
metadata_stream = g_new0(struct ctf_file_stream, 1);
+ metadata_stream->pos.last_offset = LAST_OFFSET_POISON;
if (packet_seek) {
metadata_stream->pos.packet_seek = packet_seek;
void (*packet_seek)(struct stream_pos *pos, size_t index,
int whence))
{
- int ret;
+ int ret, fd;
struct ctf_file_stream *file_stream;
+ struct stat statbuf;
- ret = openat(td->dirfd, path, flags);
- if (ret < 0) {
+ fd = openat(td->dirfd, path, flags);
+ if (fd < 0) {
perror("File stream openat()");
+ ret = fd;
goto error;
}
+
+ /* Don't try to mmap subdirectories. Skip them, return success. */
+ ret = fstat(fd, &statbuf);
+ if (ret) {
+ perror("File stream fstat()");
+ goto fstat_error;
+ }
+ if (S_ISDIR(statbuf.st_mode)) {
+ fprintf(stderr, "[warning] Skipping directory '%s' found in trace\n", path);
+ ret = 0;
+ goto fd_is_dir_ok;
+ }
+
file_stream = g_new0(struct ctf_file_stream, 1);
+ file_stream->pos.last_offset = LAST_OFFSET_POISON;
if (packet_seek) {
file_stream->pos.packet_seek = packet_seek;
goto error_def;
}
- ctf_init_pos(&file_stream->pos, ret, flags);
+ ctf_init_pos(&file_stream->pos, fd, flags);
ret = create_trace_definitions(td, &file_stream->parent);
if (ret)
goto error_def;
definition_unref(&file_stream->parent.trace_packet_header->p);
error_def:
ctf_fini_pos(&file_stream->pos);
- close(file_stream->pos.fd);
g_free(file_stream);
+fd_is_dir_ok:
+fstat_error:
+ close(fd);
error:
return ret;
}
struct ctf_file_stream *file_stream;
file_stream = g_new0(struct ctf_file_stream, 1);
+ file_stream->pos.last_offset = LAST_OFFSET_POISON;
ctf_init_mmap_pos(&file_stream->pos, mmap_info);
file_stream->pos.packet_seek = packet_seek;