#include "metadata/ctf-ast.h"
#include "events-private.h"
#include <babeltrace/compat/memstream.h>
+#include <babeltrace/compat/fcntl.h>
#define LOG2_CHAR_BIT 3
pos->parent.rw_table = write_dispatch_table;
pos->parent.event_cb = ctf_write_event;
pos->parent.trace = trace;
- if (fd >= 0)
- ctf_packet_seek(&pos->parent, 0, SEEK_SET); /* position for write */
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,
+ off = bt_posix_fallocate(pos->fd, pos->mmap_offset,
pos->packet_size / CHAR_BIT);
- assert(off >= 0);
+ assert(off == 0);
pos->offset = 0;
} else {
read_next_packet:
memcpy(td->uuid, header.uuid, sizeof(header.uuid));
CTF_TRACE_SET_FIELD(td, uuid);
} else {
- if (babeltrace_uuid_compare(header.uuid, td->uuid))
+ if (bt_uuid_compare(header.uuid, td->uuid))
return -EINVAL;
}
elem = bt_array_index(defarray, i);
uuidval[i] = bt_get_unsigned_int(elem);
}
- ret = babeltrace_uuid_compare(td->uuid, uuidval);
+ ret = bt_uuid_compare(td->uuid, uuidval);
if (ret) {
fprintf(stderr, "[error] Unique Universal Identifiers do not match.\n");
return -EINVAL;
goto error;
}
if (be32toh(index_hdr.index_major) != CTF_INDEX_MAJOR) {
- fprintf(stderr, "[error] Incompatible index file %" PRIu64
- ".%" PRIu64 ", supported %d.%d\n",
- be64toh(index_hdr.index_major),
- be64toh(index_hdr.index_minor), CTF_INDEX_MAJOR,
+ fprintf(stderr, "[error] Incompatible index file %" PRIu32
+ ".%" PRIu32 ", supported %d.%d\n",
+ be32toh(index_hdr.index_major),
+ be32toh(index_hdr.index_minor), CTF_INDEX_MAJOR,
CTF_INDEX_MINOR);
ret = -1;
goto error;
ret = 0;
goto fd_is_dir_ok;
}
+ if (!statbuf.st_size) {
+ /** Skip empty files. */
+ ret = 0;
+ goto fd_is_empty_file;
+ }
file_stream = g_new0(struct ctf_file_stream, 1);
file_stream->pos.last_offset = LAST_OFFSET_POISON;
index_name = malloc((strlen(path) + sizeof(INDEX_PATH)) * sizeof(char));
if (!index_name) {
fprintf(stderr, "[error] Cannot allocate index filename\n");
+ ret = -ENOMEM;
goto error_def;
}
snprintf(index_name, strlen(path) + sizeof(INDEX_PATH),
INDEX_PATH, path);
- if (faccessat(td->dirfd, index_name, O_RDONLY, flags) < 0) {
+ if (bt_faccessat(td->dirfd, td->parent.path, index_name, O_RDONLY, 0) < 0) {
ret = create_stream_packet_index(td, file_stream);
if (ret) {
fprintf(stderr, "[error] Stream index creation error.\n");
fprintf(stderr, "Error on ctf_fini_pos\n");
}
g_free(file_stream);
+fd_is_empty_file:
fd_is_dir_ok:
fstat_error:
closeret = close(fd);