[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180913125450.21342-13-jolsa@kernel.org>
Date: Thu, 13 Sep 2018 14:54:14 +0200
From: Jiri Olsa <jolsa@...nel.org>
To: Arnaldo Carvalho de Melo <acme@...nel.org>
Cc: lkml <linux-kernel@...r.kernel.org>,
Ingo Molnar <mingo@...nel.org>,
Namhyung Kim <namhyung@...nel.org>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Andi Kleen <andi@...stfloor.org>,
Alexey Budankov <alexey.budankov@...ux.intel.com>
Subject: [PATCH 12/48] perf tools: Add perf_data__create_index function
Adding perf_data__create_index function to create
and open index files within perf_data struct.
Link: http://lkml.kernel.org/n/tip-kl4s1f13cg6wycrg367p85qm@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@...nel.org>
---
tools/perf/util/data.c | 64 ++++++++++++++++++++++++++++++++++++++++++
tools/perf/util/data.h | 5 ++++
2 files changed, 69 insertions(+)
diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
index d8cfc19ddb10..b856accfdace 100644
--- a/tools/perf/util/data.c
+++ b/tools/perf/util/data.c
@@ -187,3 +187,67 @@ int perf_data__switch(struct perf_data *data,
free(new_filepath);
return ret;
}
+
+static void free_index(struct perf_data_file *index, int nr)
+{
+ while (--nr >= 1) {
+ close(index[nr].fd);
+ free((char *) index[nr].path);
+ }
+ free(index);
+}
+
+static void clean_index(struct perf_data *data,
+ struct perf_data_file *index,
+ int index_nr)
+{
+ char path[PATH_MAX];
+
+ scnprintf(path, sizeof(path), "%s.dir", data->file.path);
+ rm_rf(path);
+
+ free_index(index, index_nr);
+}
+
+void perf_data__clean_index(struct perf_data *data)
+{
+ clean_index(data, data->index, data->index_nr);
+}
+
+int perf_data__create_index(struct perf_data *data, int nr)
+{
+ struct perf_data_file *index;
+ char path[PATH_MAX];
+ int ret = -1, i = 0;
+
+ index = malloc(nr * sizeof(*index));
+ if (!index)
+ return -ENOMEM;
+
+ data->index = index;
+ data->index_nr = nr;
+
+ scnprintf(path, sizeof(path), "%s.dir", data->file.path);
+ if (rm_rf(path) < 0 || mkdir(path, S_IRWXU) < 0)
+ goto out_err;
+
+ for (; i < nr; i++) {
+ struct perf_data_file *file = &index[i];
+
+ if (asprintf((char **) &file->path, "%s.dir/perf.data.%d",
+ data->file.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:
+ clean_index(data, index, i);
+ return ret;
+}
diff --git a/tools/perf/util/data.h b/tools/perf/util/data.h
index 4828f7feea89..33b62c30b053 100644
--- a/tools/perf/util/data.h
+++ b/tools/perf/util/data.h
@@ -20,6 +20,8 @@ struct perf_data {
bool force;
unsigned long size;
enum perf_data_mode mode;
+ struct perf_data_file *index;
+ int index_nr;
};
static inline bool perf_data__is_read(struct perf_data *data)
@@ -63,4 +65,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_index(struct perf_data *data,
+ int nr);
+void perf_data__clean_index(struct perf_data *data);
#endif /* __PERF_DATA_H */
--
2.17.1
Powered by blists - more mailing lists