X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=b0e5b63e34400c3f0e2e2df57b58fcdf0f875f32;hp=fda43152d30905fc278515277f79a11eb0104282;hb=2530e68bb73b6ed32df6c5b4a5031bca3f5f3015;hpb=f2aea36dd732363bb58b2613b3680ad7a3bec856 diff --git a/src/common/utils.c b/src/common/utils.c index fda43152d..b0e5b63e3 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -765,74 +765,6 @@ int utils_stream_file_path(const char *path_name, const char *file_name, return ret; } -/* - * Create the stream file on disk. - * - * Return 0 on success or else a negative value. - */ -LTTNG_HIDDEN -int utils_create_stream_file(const char *path_name, char *file_name, uint64_t size, - uint64_t count, int uid, int gid, char *suffix) -{ - int ret, flags, mode; - char path[LTTNG_PATH_MAX]; - - ret = utils_stream_file_path(path_name, file_name, - size, count, suffix, path, sizeof(path)); - if (ret < 0) { - goto error; - } - - /* - * With the session rotation feature on the relay, we might need to seek - * and truncate a tracefile, so we need read and write access. - */ - flags = O_RDWR | O_CREAT | O_TRUNC; - /* Open with 660 mode */ - mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP; - - if (uid < 0 || gid < 0) { - ret = open(path, flags, mode); - } else { - ret = run_as_open(path, flags, mode, uid, gid); - } - if (ret < 0) { - PERROR("open stream path %s", path); - } -error: - return ret; -} - -/* - * Unlink the stream tracefile from disk. - * - * Return 0 on success or else a negative value. - */ -LTTNG_HIDDEN -int utils_unlink_stream_file(const char *path_name, char *file_name, uint64_t size, - uint64_t count, int uid, int gid, char *suffix) -{ - int ret; - char path[LTTNG_PATH_MAX]; - - ret = utils_stream_file_path(path_name, file_name, size, count, suffix, - path, sizeof(path)); - if (ret < 0) { - goto error; - } - if (uid < 0 || gid < 0) { - ret = unlink(path); - } else { - ret = run_as_unlink(path, uid, gid); - } - if (ret < 0) { - goto error; - } -error: - DBG("utils_unlink_stream_file %s returns %d", path, ret); - return ret; -} - /** * Parse a string that represents a size in human readable format. It * supports decimal integers suffixed by 'k', 'K', 'M' or 'G'.