#define WRITE_FILE_FLAGS (O_WRONLY | O_CREAT | O_TRUNC)
#define READ_ONLY_FILE_FLAGS O_RDONLY
-static struct lttng_index_file *_lttng_index_file_create_from_trace_chunk(
+static enum lttng_trace_chunk_status _lttng_index_file_create_from_trace_chunk(
struct lttng_trace_chunk *chunk,
const char *channel_path, const char *stream_name,
uint64_t stream_file_size, uint64_t stream_file_index,
uint32_t index_major, uint32_t index_minor,
bool unlink_existing_file,
- int flags)
+ int flags, bool expect_no_file, struct lttng_index_file **file)
{
struct lttng_index_file *index_file;
enum lttng_trace_chunk_status chunk_status;
- int ret, fd = -1;
+ int ret;
+ struct fs_handle *fs_handle = NULL;
ssize_t size_ret;
struct ctf_packet_index_file_hdr hdr;
char index_directory_path[LTTNG_PATH_MAX];
index_file = zmalloc(sizeof(*index_file));
if (!index_file) {
PERROR("Failed to allocate lttng_index_file");
+ chunk_status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
goto error;
}
"%s%s" DEFAULT_INDEX_DIR, channel_path, separator);
if (ret < 0 || ret >= sizeof(index_directory_path)) {
ERR("Failed to format index directory path");
+ chunk_status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
goto error;
}
DEFAULT_INDEX_FILE_SUFFIX,
index_file_path, sizeof(index_file_path));
if (ret) {
+ chunk_status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
goto error;
}
}
}
- chunk_status = lttng_trace_chunk_open_file(chunk, index_file_path,
- flags, mode, &fd);
+ chunk_status = lttng_trace_chunk_open_fs_handle(chunk, index_file_path,
+ flags, mode, &fs_handle, expect_no_file);
if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
goto error;
}
if (flags == WRITE_FILE_FLAGS) {
ctf_packet_index_file_hdr_init(&hdr, index_major, index_minor);
- size_ret = lttng_write(fd, &hdr, sizeof(hdr));
+ size_ret = fs_handle_write(fs_handle, &hdr, sizeof(hdr));
if (size_ret < sizeof(hdr)) {
PERROR("Failed to write index header");
+ chunk_status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
goto error;
}
index_file->element_len = ctf_packet_index_len(index_major, index_minor);
} else {
uint32_t element_len;
- size_ret = lttng_read(fd, &hdr, sizeof(hdr));
+ size_ret = fs_handle_read(fs_handle, &hdr, sizeof(hdr));
if (size_ret < 0) {
PERROR("Failed to read index header");
+ chunk_status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
goto error;
}
if (be32toh(hdr.magic) != CTF_INDEX_MAGIC) {
ERR("Invalid header magic");
+ chunk_status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
goto error;
}
if (index_major != be32toh(hdr.index_major)) {
ERR("Index major number mismatch: %u, expect %u",
be32toh(hdr.index_major), index_major);
+ chunk_status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
goto error;
}
if (index_minor != be32toh(hdr.index_minor)) {
ERR("Index minor number mismatch: %u, expect %u",
be32toh(hdr.index_minor), index_minor);
+ chunk_status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
goto error;
}
element_len = be32toh(hdr.packet_index_len);
if (element_len > sizeof(struct ctf_packet_index)) {
ERR("Index element length too long");
+ chunk_status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
goto error;
}
index_file->element_len = element_len;
}
- index_file->fd = fd;
+ index_file->file = fs_handle;
index_file->major = index_major;
index_file->minor = index_minor;
urcu_ref_init(&index_file->ref);
- return index_file;
+ *file = index_file;
+ return LTTNG_TRACE_CHUNK_STATUS_OK;
error:
- if (fd >= 0) {
- ret = close(fd);
+ if (fs_handle) {
+ ret = fs_handle_close(fs_handle);
if (ret < 0) {
PERROR("Failed to close file descriptor of index file");
}
}
lttng_trace_chunk_put(chunk);
free(index_file);
- return NULL;
+ return chunk_status;
}
-struct lttng_index_file *lttng_index_file_create_from_trace_chunk(
+enum lttng_trace_chunk_status lttng_index_file_create_from_trace_chunk(
struct lttng_trace_chunk *chunk,
const char *channel_path, const char *stream_name,
uint64_t stream_file_size, uint64_t stream_file_index,
uint32_t index_major, uint32_t index_minor,
- bool unlink_existing_file)
+ bool unlink_existing_file, struct lttng_index_file **file)
{
return _lttng_index_file_create_from_trace_chunk(chunk, channel_path,
stream_name, stream_file_size, stream_file_index,
index_major, index_minor, unlink_existing_file,
- WRITE_FILE_FLAGS);
+ WRITE_FILE_FLAGS, false, file);
}
-struct lttng_index_file *lttng_index_file_create_from_trace_chunk_read_only(
+enum lttng_trace_chunk_status lttng_index_file_create_from_trace_chunk_read_only(
struct lttng_trace_chunk *chunk,
const char *channel_path, const char *stream_name,
uint64_t stream_file_size, uint64_t stream_file_index,
- uint32_t index_major, uint32_t index_minor)
+ uint32_t index_major, uint32_t index_minor,
+ bool expect_no_file, struct lttng_index_file **file)
{
return _lttng_index_file_create_from_trace_chunk(chunk, channel_path,
stream_name, stream_file_size, stream_file_index,
index_major, index_minor, false,
- READ_ONLY_FILE_FLAGS);
+ READ_ONLY_FILE_FLAGS, expect_no_file, file);
}
/*
int lttng_index_file_write(const struct lttng_index_file *index_file,
const struct ctf_packet_index *element)
{
- int fd;
- size_t len;
ssize_t ret;
+ const size_t len = index_file->element_len;;
assert(index_file);
assert(element);
- fd = index_file->fd;
- len = index_file->element_len;
-
- if (fd < 0) {
+ if (!index_file->file) {
goto error;
}
- ret = lttng_write(fd, element, len);
+ ret = fs_handle_write(index_file->file, element, len);
if (ret < len) {
PERROR("writing index file");
goto error;
struct ctf_packet_index *element)
{
ssize_t ret;
- int fd = index_file->fd;
- size_t len = index_file->element_len;
+ const size_t len = index_file->element_len;
assert(element);
- if (fd < 0) {
+ if (!index_file->file) {
goto error;
}
- ret = lttng_read(fd, element, len);
+ ret = fs_handle_read(index_file->file, element, len);
if (ret < 0) {
PERROR("read index file");
goto error;
struct lttng_index_file *index_file = caa_container_of(ref,
struct lttng_index_file, ref);
- if (close(index_file->fd)) {
+ if (fs_handle_close(index_file->file)) {
PERROR("close index fd");
}
lttng_trace_chunk_put(index_file->trace_chunk);
projects / lttng-tools.git / blobdiff