X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Findex%2Findex.c;h=5a6fe3d8608bf56def8212199dcaaac540def172;hp=ee73a0324c75467a7cd6706a6f9efa8b13b2659f;hb=c35f9726a22f1d93e14589688d830efccda196f3;hpb=4a3a61c179ecf1338c71f0489c7a5a7d1bd41fe9 diff --git a/src/common/index/index.c b/src/common/index/index.c index ee73a0324..5a6fe3d86 100644 --- a/src/common/index/index.c +++ b/src/common/index/index.c @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -30,78 +31,83 @@ #include "index.h" -/* - * Create the index file associated with a trace file. - * - * Return allocated struct lttng_index_file, NULL on error. - */ -struct lttng_index_file *lttng_index_file_create(char *path_name, - char *stream_name, int uid, int gid, - uint64_t size, uint64_t count, uint32_t major, uint32_t minor) +struct lttng_index_file *lttng_index_file_create_from_trace_chunk( + struct lttng_trace_chunk *chunk, + const char *channel_path, 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 *index_file; + enum lttng_trace_chunk_status chunk_status; int ret, fd = -1; ssize_t size_ret; struct ctf_packet_index_file_hdr hdr; - char fullpath[PATH_MAX]; - uint32_t element_len = ctf_packet_index_len(major, minor); + 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); + + assert(acquired_reference); index_file = zmalloc(sizeof(*index_file)); if (!index_file) { - PERROR("allocating lttng_index_file"); + PERROR("Failed to allocate lttng_index_file"); goto error; } - ret = snprintf(fullpath, sizeof(fullpath), "%s/" DEFAULT_INDEX_DIR, - path_name); - if (ret < 0) { - PERROR("snprintf index path"); + index_file->trace_chunk = chunk; + ret = snprintf(index_directory_path, sizeof(index_directory_path), + "%s/" DEFAULT_INDEX_DIR, channel_path); + if (ret < 0 || ret >= sizeof(index_directory_path)) { + ERR("Failed to format index directory path"); goto error; } - /* Create index directory if necessary. */ - ret = utils_mkdir(fullpath, S_IRWXU | S_IRWXG, uid, gid); - if (ret < 0) { - if (errno != EEXIST) { - PERROR("Index trace directory creation error"); + ret = utils_stream_file_path(index_directory_path, stream_name, + stream_file_size, stream_file_index, + DEFAULT_INDEX_FILE_SUFFIX, + index_file_path, sizeof(index_file_path)); + if (ret) { + goto error; + } + + if (unlink_existing_file) { + /* + * For tracefile rotation. We need to unlink the old + * file if present to synchronize with the tail of the + * live viewer which could be working on this same file. + * By doing so, any reference to the old index file + * stays valid even if we re-create a new file with the + * same name afterwards. + */ + chunk_status = lttng_trace_chunk_unlink_file( + chunk, index_file_path); + if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK && + !(chunk_status == LTTNG_TRACE_CHUNK_STATUS_ERROR && + errno == ENOENT)) { goto error; } } - /* - * For tracefile rotation. We need to unlink the old - * file if present to synchronize with the tail of the - * live viewer which could be working on this same file. - * By doing so, any reference to the old index file - * stays valid even if we re-create a new file with the - * same name afterwards. - */ - ret = utils_unlink_stream_file(fullpath, stream_name, size, count, uid, - gid, DEFAULT_INDEX_FILE_SUFFIX); - if (ret < 0 && errno != ENOENT) { + chunk_status = lttng_trace_chunk_open_file(chunk, index_file_path, + flags, mode, &fd); + if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) { goto error; } - ret = utils_create_stream_file(fullpath, stream_name, size, count, uid, - gid, DEFAULT_INDEX_FILE_SUFFIX); - if (ret < 0) { - goto error; - } - fd = ret; - - hdr.magic = htobe32(CTF_INDEX_MAGIC); - hdr.index_major = htobe32(major); - hdr.index_minor = htobe32(minor); - hdr.packet_index_len = htobe32(element_len); + 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("write index header"); - ret = -1; + PERROR("Failed to write index header"); goto error; } index_file->fd = fd; - index_file->major = major; - index_file->minor = minor; + index_file->major = index_major; + index_file->minor = index_minor; index_file->element_len = element_len; urcu_ref_init(&index_file->ref); @@ -109,11 +115,9 @@ struct lttng_index_file *lttng_index_file_create(char *path_name, error: if (fd >= 0) { - int close_ret; - - close_ret = close(fd); - if (close_ret < 0) { - PERROR("close index fd"); + ret = close(fd); + if (ret < 0) { + PERROR("Failed to close file descriptor of index file"); } } free(index_file); @@ -172,10 +176,14 @@ int lttng_index_file_read(const struct lttng_index_file *index_file, } ret = lttng_read(fd, element, len); - if (ret < len) { + if (ret < 0) { PERROR("read index file"); goto error; } + if (ret < len) { + ERR("lttng_read expected %zu, returned %zd", len, ret); + goto error; + } return 0; error: @@ -286,6 +294,7 @@ static void lttng_index_file_release(struct urcu_ref *ref) if (close(index_file->fd)) { PERROR("close index fd"); } + lttng_trace_chunk_put(index_file->trace_chunk); free(index_file); }