On 03.02.2019 18:30, Jiri Olsa wrote:
> Adding perf_data__create_dir to create nr files inside
> struct perf_data path directory:
> int perf_data__create_dir(struct perf_data *data, int nr);
>
> and function to free that data:
> void perf_data__free_dir(struct perf_data *data);
>
> Link: http://lkml.kernel.org/n/tip-kl4s1f13cg6wycrg367p8...@git.kernel.org
> Signed-off-by: Jiri Olsa <jo...@kernel.org>
> ---
> tools/perf/util/data.c | 47 ++++++++++++++++++++++++++++++++++++++++++
> tools/perf/util/data.h | 8 +++++++
> 2 files changed, 55 insertions(+)
>
> diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
> index 0a3051cc0ea0..ff1d9e5bd68d 100644
> --- a/tools/perf/util/data.c
> +++ b/tools/perf/util/data.c
> @@ -7,11 +7,58 @@
> #include <fcntl.h>
> #include <unistd.h>
> #include <string.h>
> +#include <asm/bug.h>
>
> #include "data.h"
> #include "util.h"
> #include "debug.h"
>
> +static void free_dir(struct perf_data_file *files, int nr)
> +{
> + while (--nr >= 1) {
> + close(files[nr].fd);
> + free(files[nr].path);
> + }
> + free(files);
It implements closing of created files and frees corresponding memory.
However it doesn't delete the files what looks like the proper rollback
from perf_data__create_dir() in case of some open() failure.
> +}
> +
> +void perf_data__free_dir(struct perf_data *data)
> +{
> + free_dir(data->dir.files, data->dir.nr);
> +}
> +
> +int perf_data__create_dir(struct perf_data *data, int nr)
> +{
> + struct perf_data_file *files = NULL;
> + int i, ret = -1;
> +
> + files = malloc(nr * sizeof(*files));
> + if (!files)
> + return -ENOMEM;
> +
> + data->dir.files = files;
> + data->dir.nr = nr;
> +
> + for (i = 0; i < nr; i++) {
> + struct perf_data_file *file = &files[i];
> +
> + if (asprintf(&file->path, "%s/data.%d", data->path, i) < 0)
> + goto out_err;
> +
> + ret = open(file->path, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR);
> + if (ret < 0)
> + goto out_err;
> +
> + file->fd = ret;
> + }
> +
> + return 0;
> +
> +out_err:
> + free_dir(files, i);
It looks like this is more unlink(dir) than close_files_in_dir().
Alexey
> + return ret;
> +}
> +
> static bool check_pipe(struct perf_data *data)
> {
> struct stat st;
> diff --git a/tools/perf/util/data.h b/tools/perf/util/data.h
> index 2bce28117ccf..3b4115dc777f 100644
> --- a/tools/perf/util/data.h
> +++ b/tools/perf/util/data.h
> @@ -21,6 +21,11 @@ struct perf_data {
> bool is_pipe;
> bool force;
> enum perf_data_mode mode;
> +
> + struct {
> + struct perf_data_file *files;
> + int nr;
> + } dir;
> };
>
> static inline bool perf_data__is_read(struct perf_data *data)
> @@ -64,4 +69,7 @@ ssize_t perf_data_file__write(struct perf_data_file *file,
> int perf_data__switch(struct perf_data *data,
> const char *postfix,
> size_t pos, bool at_exit);
> +
> +int perf_data__create_dir(struct perf_data *data, int nr);
> +void perf_data__free_dir(struct perf_data *data);
> #endif /* __PERF_DATA_H */
>
