#include <common/compat/dirent.h>
#include <common/compat/directory-handle.h>
#include <common/dynamic-buffer.h>
+#include <common/string-utils/format.h>
#include <lttng/constant.h>
#include "utils.h"
{
int ret;
struct lttng_directory_handle handle;
- struct lttng_credentials creds = {
+ const struct lttng_credentials creds = {
.uid = (uid_t) uid,
.gid = (gid_t) gid,
};
- (void) lttng_directory_handle_init(&handle, NULL);
+ ret = lttng_directory_handle_init(&handle, NULL);
+ if (ret) {
+ goto end;
+ }
ret = lttng_directory_handle_create_subdirectory_as_user(
&handle, path, mode,
(uid >= 0 || gid >= 0) ? &creds : NULL);
lttng_directory_handle_fini(&handle);
+end:
return ret;
}
{
int ret;
struct lttng_directory_handle handle;
- struct lttng_credentials creds = {
+ const struct lttng_credentials creds = {
.uid = (uid_t) uid,
.gid = (gid_t) gid,
};
- (void) lttng_directory_handle_init(&handle, NULL);
+ ret = lttng_directory_handle_init(&handle, NULL);
+ if (ret) {
+ goto end;
+ }
ret = lttng_directory_handle_create_subdirectory_recursive_as_user(
&handle, path, mode,
(uid >= 0 || gid >= 0) ? &creds : NULL);
lttng_directory_handle_fini(&handle);
+end:
return ret;
}
/*
- * path is the output parameter. It needs to be PATH_MAX len.
+ * out_stream_path is the output parameter.
*
* Return 0 on success or else a negative value.
*/
-static int utils_stream_file_name(char *path,
- const char *path_name, const char *file_name,
- uint64_t size, uint64_t count,
- const char *suffix)
+LTTNG_HIDDEN
+int utils_stream_file_path(const char *path_name, const char *file_name,
+ uint64_t size, uint64_t count, const char *suffix,
+ char *out_stream_path, size_t stream_path_len)
{
int ret;
- char full_path[PATH_MAX];
- char *path_name_suffix = NULL;
- char *extra = NULL;
+ char count_str[MAX_INT_DEC_LEN(count) + 1] = {};
+ const char *path_separator;
- ret = snprintf(full_path, sizeof(full_path), "%s/%s",
- path_name, file_name);
- if (ret < 0) {
- PERROR("snprintf create output file");
- goto error;
+ if (path_name && path_name[strlen(path_name) - 1] == '/') {
+ path_separator = "";
+ } else {
+ path_separator = "/";
}
- /* Setup extra string if suffix or/and a count is needed. */
- if (size > 0 && suffix) {
- ret = asprintf(&extra, "_%" PRIu64 "%s", count, suffix);
- } else if (size > 0) {
- ret = asprintf(&extra, "_%" PRIu64, count);
- } else if (suffix) {
- ret = asprintf(&extra, "%s", suffix);
- }
- if (ret < 0) {
- PERROR("Allocating extra string to name");
- goto error;
+ path_name = path_name ? : "";
+ suffix = suffix ? : "";
+ if (size > 0) {
+ ret = snprintf(count_str, sizeof(count_str), "_%" PRIu64,
+ count);
+ assert(ret > 0 && ret < sizeof(count_str));
}
- /*
- * If we split the trace in multiple files, we have to add the count at
- * the end of the tracefile name.
- */
- if (extra) {
- ret = asprintf(&path_name_suffix, "%s%s", full_path, extra);
- if (ret < 0) {
- PERROR("Allocating path name with extra string");
- goto error_free_suffix;
- }
- strncpy(path, path_name_suffix, PATH_MAX - 1);
- path[PATH_MAX - 1] = '\0';
+ ret = snprintf(out_stream_path, stream_path_len, "%s%s%s%s%s",
+ path_name, path_separator, file_name, count_str,
+ suffix);
+ if (ret < 0 || ret >= stream_path_len) {
+ ERR("Truncation occurred while formatting stream path");
+ ret = -1;
} else {
- ret = lttng_strncpy(path, full_path, PATH_MAX);
- if (ret) {
- ERR("Failed to copy stream file name");
- goto error_free_suffix;
- }
+ ret = 0;
}
- path[PATH_MAX - 1] = '\0';
- ret = 0;
-
- free(path_name_suffix);
-error_free_suffix:
- free(extra);
-error:
return ret;
}
uint64_t count, int uid, int gid, char *suffix)
{
int ret, flags, mode;
- char path[PATH_MAX];
+ char path[LTTNG_PATH_MAX];
- ret = utils_stream_file_name(path, path_name, file_name,
- size, count, suffix);
+ ret = utils_stream_file_path(path_name, file_name,
+ size, count, suffix, path, sizeof(path));
if (ret < 0) {
goto error;
}
uint64_t count, int uid, int gid, char *suffix)
{
int ret;
- char path[PATH_MAX];
+ char path[LTTNG_PATH_MAX];
- ret = utils_stream_file_name(path, path_name, file_name,
- size, count, suffix);
+ ret = utils_stream_file_path(path_name, file_name, size, count, suffix,
+ path, sizeof(path));
if (ret < 0) {
goto error;
}
return ret;
}
-/*
- * Change the output tracefile according to the given size and count The
- * new_count pointer is set during this operation.
- *
- * From the consumer, the stream lock MUST be held before calling this function
- * because we are modifying the stream status.
- *
- * Return 0 on success or else a negative value.
- */
-LTTNG_HIDDEN
-int utils_rotate_stream_file(char *path_name, char *file_name, uint64_t size,
- uint64_t count, int uid, int gid, int out_fd, uint64_t *new_count,
- int *stream_fd)
-{
- int ret;
-
- assert(stream_fd);
-
- ret = close(out_fd);
- if (ret < 0) {
- PERROR("Closing tracefile");
- goto error;
- }
- *stream_fd = -1;
-
- if (count > 0) {
- /*
- * In tracefile rotation, for the relay daemon we need
- * to unlink the old file if present, because it may
- * still be open in reading by the live thread, and we
- * need to ensure that we do not overwrite the content
- * between get_index and get_packet. Since we have no
- * way to verify integrity of the data content compared
- * to the associated index, we need to ensure the reader
- * has exclusive access to the file content, and that
- * the open of the data file is performed in get_index.
- * Unlinking the old file rather than overwriting it
- * achieves this.
- */
- if (new_count) {
- *new_count = (*new_count + 1) % count;
- }
- ret = utils_unlink_stream_file(path_name, file_name, size,
- new_count ? *new_count : 0, uid, gid, 0);
- if (ret < 0 && errno != ENOENT) {
- goto error;
- }
- } else {
- if (new_count) {
- (*new_count)++;
- }
- }
-
- ret = utils_create_stream_file(path_name, file_name, size,
- new_count ? *new_count : 0, uid, gid, 0);
- if (ret < 0) {
- goto error;
- }
- *stream_fd = ret;
-
- /* Success. */
- ret = 0;
-
-error:
- return ret;
-}
-
-
/**
* Parse a string that represents a size in human readable format. It
* supports decimal integers suffixed by 'k', 'K', 'M' or 'G'.
LTTNG_HIDDEN
int utils_recursive_rmdir(const char *path)
{
- DIR *dir;
- size_t path_len;
- int dir_fd, ret = 0, closeret, is_empty = 1;
- struct dirent *entry;
-
- /* Open directory */
- dir = opendir(path);
- if (!dir) {
- PERROR("Cannot open '%s' path", path);
- return -1;
- }
- dir_fd = lttng_dirfd(dir);
- if (dir_fd < 0) {
- PERROR("lttng_dirfd");
- return -1;
- }
-
- path_len = strlen(path);
- while ((entry = readdir(dir))) {
- struct stat st;
- size_t name_len;
- char filename[PATH_MAX];
-
- if (!strcmp(entry->d_name, ".")
- || !strcmp(entry->d_name, "..")) {
- continue;
- }
-
- name_len = strlen(entry->d_name);
- if (path_len + name_len + 2 > sizeof(filename)) {
- ERR("Failed to remove file: path name too long (%s/%s)",
- path, entry->d_name);
- continue;
- }
- if (snprintf(filename, sizeof(filename), "%s/%s",
- path, entry->d_name) < 0) {
- ERR("Failed to format path.");
- continue;
- }
-
- if (stat(filename, &st)) {
- PERROR("stat");
- continue;
- }
+ int ret;
+ struct lttng_directory_handle handle;
- if (S_ISDIR(st.st_mode)) {
- char subpath[PATH_MAX];
-
- strncpy(subpath, path, PATH_MAX);
- subpath[PATH_MAX - 1] = '\0';
- strncat(subpath, "/",
- PATH_MAX - strlen(subpath) - 1);
- strncat(subpath, entry->d_name,
- PATH_MAX - strlen(subpath) - 1);
- if (utils_recursive_rmdir(subpath)) {
- is_empty = 0;
- }
- } else if (S_ISREG(st.st_mode)) {
- is_empty = 0;
- } else {
- ret = -EINVAL;
- goto end;
- }
+ ret = lttng_directory_handle_init(&handle, NULL);
+ if (ret) {
+ goto end;
}
+ ret = lttng_directory_handle_remove_subdirectory(&handle, path);
+ lttng_directory_handle_fini(&handle);
end:
- closeret = closedir(dir);
- if (closeret) {
- PERROR("closedir");
- }
- if (is_empty) {
- DBG3("Attempting rmdir %s", path);
- ret = rmdir(path);
- }
return ret;
}