From: tip-bot for Jiri Olsa <tipbot@zytor.com> To: linux-tip-commits@vger.kernel.org Cc: eranian@google.com, jolsa@kernel.org, alexey.budankov@linux.intel.com, tglx@linutronix.de, adrian.hunter@intel.com, acme@redhat.com, ak@linux.intel.com, peterz@infradead.org, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, alexander.shishkin@linux.intel.com Subject: [tip:perf/core] perf data: Add perf_data__open_dir_data function Date: Thu, 28 Feb 2019 00:04:05 -0800 [thread overview] Message-ID: <tip-eb6176709b235b96511c7b4745c30412568395c7@git.kernel.org> (raw) In-Reply-To: <20190224190656.30163-10-jolsa@kernel.org> Commit-ID: eb6176709b235b96511c7b4745c30412568395c7 Gitweb: https://git.kernel.org/tip/eb6176709b235b96511c7b4745c30412568395c7 Author: Jiri Olsa <jolsa@kernel.org> AuthorDate: Sun, 24 Feb 2019 20:06:45 +0100 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Mon, 25 Feb 2019 10:43:07 -0300 perf data: Add perf_data__open_dir_data function Add perf_data__open_dir_data to open files inside 'struct perf_data' path directory: static int perf_data__open_dir(struct perf_data *data); Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Alexey Budankov <alexey.budankov@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/20190224190656.30163-10-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/data.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/data.h | 1 + 2 files changed, 60 insertions(+) diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c index 005b3909d1dc..7bd5ddeb7a41 100644 --- a/tools/perf/util/data.c +++ b/tools/perf/util/data.c @@ -8,6 +8,8 @@ #include <unistd.h> #include <string.h> #include <asm/bug.h> +#include <sys/types.h> +#include <dirent.h> #include "data.h" #include "util.h" @@ -59,6 +61,63 @@ out_err: return ret; } +int perf_data__open_dir(struct perf_data *data) +{ + struct perf_data_file *files = NULL; + struct dirent *dent; + int ret = -1; + DIR *dir; + int nr = 0; + + dir = opendir(data->path); + if (!dir) + return -EINVAL; + + while ((dent = readdir(dir)) != NULL) { + struct perf_data_file *file; + char path[PATH_MAX]; + struct stat st; + + snprintf(path, sizeof(path), "%s/%s", data->path, dent->d_name); + if (stat(path, &st)) + continue; + + if (!S_ISREG(st.st_mode) || strncmp(dent->d_name, "data", 4)) + continue; + + ret = -ENOMEM; + + file = realloc(files, (nr + 1) * sizeof(*files)); + if (!file) + goto out_err; + + files = file; + file = &files[nr++]; + + file->path = strdup(path); + if (!file->path) + goto out_err; + + ret = open(file->path, O_RDONLY); + if (ret < 0) + goto out_err; + + file->fd = ret; + file->size = st.st_size; + } + + if (!files) + return -EINVAL; + + data->dir.files = files; + data->dir.nr = nr; + return 0; + +out_err: + close_dir(files, nr); + 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 2d0d015a7d4d..14b47be2bd69 100644 --- a/tools/perf/util/data.h +++ b/tools/perf/util/data.h @@ -71,5 +71,6 @@ int perf_data__switch(struct perf_data *data, size_t pos, bool at_exit); int perf_data__create_dir(struct perf_data *data, int nr); +int perf_data__open_dir(struct perf_data *data); void perf_data__close_dir(struct perf_data *data); #endif /* __PERF_DATA_H */
next prev parent reply other threads:[~2019-02-28 8:05 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-24 19:06 [PATCHv3 00/20] perf record: Add support to store data in directory Jiri Olsa 2019-02-24 19:06 ` [PATCH 01/20] perf tools: Add depth checking to rm_rf Jiri Olsa 2019-02-28 8:00 ` [tip:perf/core] " tip-bot for Jiri Olsa 2019-02-24 19:06 ` [PATCH 02/20] perf tools: Add pattern name " Jiri Olsa 2019-02-28 8:00 ` [tip:perf/core] " tip-bot for Jiri Olsa 2019-02-24 19:06 ` [PATCH 03/20] perf tools: Add rm_rf_perf_data function Jiri Olsa 2019-02-28 8:01 ` [tip:perf/core] " tip-bot for Jiri Olsa 2019-02-24 19:06 ` [PATCH 04/20] perf data: Move size to struct perf_data_file Jiri Olsa 2019-02-24 19:06 ` [PATCH 05/20] perf data: Add global path holder Jiri Olsa 2019-02-24 19:06 ` [PATCH 06/20] perf data: Make check_backup work over directories Jiri Olsa 2019-02-28 8:02 ` [tip:perf/core] " tip-bot for Jiri Olsa 2019-02-24 19:06 ` [PATCH 07/20] perf data: Fail check_backup in case of error Jiri Olsa 2019-02-28 8:02 ` [tip:perf/core] " tip-bot for Jiri Olsa 2019-02-24 19:06 ` [PATCH 08/20] perf data: Add perf_data__(create_dir|close_dir) functions Jiri Olsa 2019-02-28 8:03 ` [tip:perf/core] " tip-bot for Jiri Olsa 2019-02-24 19:06 ` [PATCH 09/20] perf data: Add perf_data__open_dir_data function Jiri Olsa 2019-02-28 8:04 ` tip-bot for Jiri Olsa [this message] 2019-02-24 19:06 ` [PATCH 10/20] perf data: Add directory support Jiri Olsa 2019-02-25 13:45 ` Arnaldo Carvalho de Melo 2019-02-25 13:56 ` Jiri Olsa 2019-02-25 15:07 ` Arnaldo Carvalho de Melo 2019-02-25 15:36 ` Jiri Olsa 2019-02-24 19:06 ` [PATCH 11/20] perf data: Don't store auxtrace index for directory data file Jiri Olsa 2019-02-24 19:06 ` [PATCH 12/20] perf data: Add perf_data__update_dir function Jiri Olsa 2019-02-24 19:06 ` [PATCH 13/20] perf data: Make perf_data__size to work over directory Jiri Olsa 2019-02-24 19:06 ` [PATCH 14/20] perf header: Add DIR_FORMAT feature to describe directory data Jiri Olsa 2019-02-24 19:06 ` [PATCH 15/20] perf session: Add process callback to reader object Jiri Olsa 2019-02-24 19:06 ` [PATCH 16/20] perf session: Add __perf_session__process_dir_events function Jiri Olsa 2019-02-24 19:06 ` [PATCH 17/20] perf session: Add path to reader object Jiri Olsa 2019-02-24 19:06 ` [PATCH 18/20] perf record: Add --dir option to store data in directory Jiri Olsa 2019-02-24 19:06 ` [PATCH 19/20] perf record: Add --output-dir " Jiri Olsa 2019-02-24 19:06 ` [PATCH 20/20] perf record: Describe perf.data directory format Jiri Olsa
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=tip-eb6176709b235b96511c7b4745c30412568395c7@git.kernel.org \ --to=tipbot@zytor.com \ --cc=acme@redhat.com \ --cc=adrian.hunter@intel.com \ --cc=ak@linux.intel.com \ --cc=alexander.shishkin@linux.intel.com \ --cc=alexey.budankov@linux.intel.com \ --cc=eranian@google.com \ --cc=hpa@zytor.com \ --cc=jolsa@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tip-commits@vger.kernel.org \ --cc=mingo@kernel.org \ --cc=namhyung@kernel.org \ --cc=peterz@infradead.org \ --cc=tglx@linutronix.de \ --subject='Re: [tip:perf/core] perf data: Add perf_data__open_dir_data function' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.