X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Findex%2Findex.c;h=eeaf2fd15f82155a4a89f0cefb124447d8bc1862;hb=cb8d0d245b5739e7493dcf27314f6e42615f14b1;hp=5a6fe3d8608bf56def8212199dcaaac540def172;hpb=c35f9726a22f1d93e14589688d830efccda196f3;p=lttng-tools.git diff --git a/src/common/index/index.c b/src/common/index/index.c index 5a6fe3d86..eeaf2fd15 100644 --- a/src/common/index/index.c +++ b/src/common/index/index.c @@ -1,20 +1,10 @@ /* - * Copyright (C) 2013 - Julien Desfossez - * David Goulet - * 2016 - Mathieu Desnoyers + * Copyright (C) 2013 Julien Desfossez + * Copyright (C) 2013 David Goulet + * Copyright (C) 2016 Mathieu Desnoyers * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2 only, as - * published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _LGPL_SOURCE @@ -31,39 +21,49 @@ #include "index.h" -struct lttng_index_file *lttng_index_file_create_from_trace_chunk( +#define WRITE_FILE_FLAGS (O_WRONLY | O_CREAT | O_TRUNC) +#define READ_ONLY_FILE_FLAGS O_RDONLY + +static enum lttng_trace_chunk_status _lttng_index_file_create_from_trace_chunk( struct lttng_trace_chunk *chunk, - const char *channel_path, char *stream_name, + 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, + 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]; char index_file_path[LTTNG_PATH_MAX]; - const uint32_t element_len = ctf_packet_index_len(index_major, - index_minor); - const int flags = O_WRONLY | O_CREAT | O_TRUNC; const mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP; - bool acquired_reference = lttng_trace_chunk_get(chunk); + const bool acquired_reference = lttng_trace_chunk_get(chunk); + const char *separator; assert(acquired_reference); 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; } index_file->trace_chunk = chunk; + if (channel_path[0] == '\0') { + separator = ""; + } else { + separator = "/"; + } ret = snprintf(index_directory_path, sizeof(index_directory_path), - "%s/" DEFAULT_INDEX_DIR, channel_path); + "%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; } @@ -72,6 +72,7 @@ struct lttng_index_file *lttng_index_file_create_from_trace_chunk( DEFAULT_INDEX_FILE_SUFFIX, index_file_path, sizeof(index_file_path)); if (ret) { + chunk_status = LTTNG_TRACE_CHUNK_STATUS_ERROR; goto error; } @@ -93,35 +94,99 @@ struct lttng_index_file *lttng_index_file_create_from_trace_chunk( } } - 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; } - ctf_packet_index_file_hdr_init(&hdr, index_major, index_minor); - size_ret = lttng_write(fd, &hdr, sizeof(hdr)); - if (size_ret < sizeof(hdr)) { - PERROR("Failed to write index header"); - goto error; + if (flags == WRITE_FILE_FLAGS) { + ctf_packet_index_file_hdr_init(&hdr, index_major, index_minor); + 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 = 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; - index_file->element_len = element_len; 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; +} + +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, 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, false, file); +} + +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, + 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, expect_no_file, file); } /* @@ -132,21 +197,17 @@ error: 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; @@ -166,16 +227,15 @@ int lttng_index_file_read(const struct lttng_index_file *index_file, 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; @@ -190,97 +250,6 @@ error: return -1; } -/* - * Open index file using a given path, channel name and tracefile count. - * - * Return allocated struct lttng_index_file, NULL on error. - */ -struct lttng_index_file *lttng_index_file_open(const char *path_name, - const char *channel_name, uint64_t tracefile_count, - uint64_t tracefile_count_current) -{ - struct lttng_index_file *index_file; - int ret, read_fd; - ssize_t read_len; - char fullpath[PATH_MAX]; - struct ctf_packet_index_file_hdr hdr; - uint32_t major, minor, element_len; - - assert(path_name); - assert(channel_name); - - index_file = zmalloc(sizeof(*index_file)); - if (!index_file) { - PERROR("allocating lttng_index_file"); - goto error; - } - - if (tracefile_count > 0) { - ret = snprintf(fullpath, sizeof(fullpath), "%s/" DEFAULT_INDEX_DIR "/%s_%" - PRIu64 DEFAULT_INDEX_FILE_SUFFIX, path_name, - channel_name, tracefile_count_current); - } else { - ret = snprintf(fullpath, sizeof(fullpath), "%s/" DEFAULT_INDEX_DIR "/%s" - DEFAULT_INDEX_FILE_SUFFIX, path_name, channel_name); - } - if (ret < 0) { - PERROR("snprintf index path"); - goto error; - } - - DBG("Index opening file %s in read only", fullpath); - read_fd = open(fullpath, O_RDONLY); - if (read_fd < 0) { - PERROR("opening index in read-only"); - goto error; - } - - read_len = lttng_read(read_fd, &hdr, sizeof(hdr)); - if (read_len < 0) { - PERROR("Reading index header"); - goto error_close; - } - - if (be32toh(hdr.magic) != CTF_INDEX_MAGIC) { - ERR("Invalid header magic"); - goto error_close; - } - major = be32toh(hdr.index_major); - minor = be32toh(hdr.index_minor); - element_len = be32toh(hdr.packet_index_len); - - if (major != CTF_INDEX_MAJOR) { - ERR("Invalid header version"); - goto error_close; - } - if (element_len > sizeof(struct ctf_packet_index)) { - ERR("Index element length too long"); - goto error_close; - } - - index_file->fd = read_fd; - index_file->major = major; - index_file->minor = minor; - index_file->element_len = element_len; - urcu_ref_init(&index_file->ref); - - return index_file; - -error_close: - if (read_fd >= 0) { - int close_ret; - - close_ret = close(read_fd); - if (close_ret < 0) { - PERROR("close read fd %d", read_fd); - } - } - -error: - free(index_file); - return NULL; -} - void lttng_index_file_get(struct lttng_index_file *index_file) { urcu_ref_get(&index_file->ref); @@ -291,7 +260,7 @@ static void lttng_index_file_release(struct urcu_ref *ref) 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);