Re: [PATCH 05/17] perf data: Add perf_data__(create_dir|close_dir) functions

[Namhyung Kim]

On Thu, Feb 21, 2019 at 6:42 PM Jiri Olsa <jolsa@xxxxxxxxxx> 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 close that data:
>   void perf_data__close_dir(struct perf_data *data);
>
> Link: http://lkml.kernel.org/n/tip-kl4s1f13cg6wycrg367p85qm@xxxxxxxxxxxxxx
> Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> ---
>  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 18e5d94b0e97..7f13fbd9c043 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 close_dir(struct perf_data_file *files, int nr)
> +{
> +       while (--nr >= 1) {
> +               close(files[nr].fd);
> +               free(files[nr].path);
> +       }
> +       free(files);
> +}
> +
> +void perf_data__close_dir(struct perf_data *data)
> +{
> +       close_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;

It seems you need to free the file->path here.

Thanks,
Namhyung


> +
> +               file->fd = ret;
> +       }
> +
> +       return 0;
> +
> +out_err:
> +       close_dir(files, i);
> +       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..2d0d015a7d4d 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__close_dir(struct perf_data *data);
>  #endif /* __PERF_DATA_H */
> --
> 2.17.2
>