From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Adrian Hunter <adrian.hunter@intel.com>,
Andi Kleen <ak@linux.intel.com>,
Stephane Eranian <eranian@google.com>,
Alexey Budankov <alexey.budankov@linux.intel.com>
Subject: [PATCH 04/17] perf data: Fail check_backup in case of error
Date: Thu, 21 Feb 2019 10:41:32 +0100 [thread overview]
Message-ID: <20190221094145.9151-5-jolsa@kernel.org> (raw)
In-Reply-To: <20190221094145.9151-1-jolsa@kernel.org>
And display the error message from removing
the old data file:
$ perf record ls
Can't remove old data: Permission denied (perf.data.old)
Perf session creation failed.
Not sure how to make fail the rename (after we successfully
remove the destination file/dir) to show the message,
anyway let's have it there.
Link: http://lkml.kernel.org/n/tip-6k0tikvlyugms7xxqs794jxz@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/data.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
index 0a3051cc0ea0..18e5d94b0e97 100644
--- a/tools/perf/util/data.c
+++ b/tools/perf/util/data.c
@@ -41,12 +41,24 @@ static int check_backup(struct perf_data *data)
return 0;
if (!stat(data->path, &st) && st.st_size) {
- /* TODO check errors properly */
char oldname[PATH_MAX];
+
snprintf(oldname, sizeof(oldname), "%s.old",
data->path);
- rm_rf(oldname);
- rename(data->path, oldname);
+
+ if (rm_rf(oldname)) {
+ pr_err("Can't remove old data: %s (%s)\n",
+ strerror(errno), oldname);
+
+ return -1;
+ }
+
+ if (rename(data->path, oldname)) {
+ pr_err("Can't move data: %s (%s to %s)\n",
+ strerror(errno),
+ data->path, oldname);
+ return -1;
+ }
}
return 0;
--
2.17.2
next prev parent reply other threads:[~2019-02-21 9:42 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-21 9:41 [PATCHv2 00/17] perf record: Add support to store data in directory Jiri Olsa
2019-02-21 9:41 ` [PATCH 01/17] perf data: Move size to struct perf_data_file Jiri Olsa
2019-02-28 7:58 ` [tip:perf/core] " tip-bot for Jiri Olsa
2019-02-21 9:41 ` [PATCH 02/17] perf data: Add global path holder Jiri Olsa
2019-02-22 16:05 ` Arnaldo Carvalho de Melo
2019-02-22 16:07 ` Arnaldo Carvalho de Melo
2019-02-28 7:59 ` [tip:perf/core] " tip-bot for Jiri Olsa
2019-02-21 9:41 ` [PATCH 03/17] perf data: Make check_backup work over directories Jiri Olsa
2019-02-21 9:41 ` Jiri Olsa [this message]
2019-02-21 22:23 ` [PATCH 04/17] perf data: Fail check_backup in case of error Andi Kleen
2019-02-22 12:23 ` Jiri Olsa
2019-02-21 9:41 ` [PATCH 05/17] perf data: Add perf_data__(create_dir|close_dir) functions Jiri Olsa
2019-02-23 5:07 ` Namhyung Kim
2019-02-24 13:32 ` Jiri Olsa
2019-02-21 9:41 ` [PATCH 06/17] perf data: Add perf_data__open_dir_data function Jiri Olsa
2019-02-21 9:41 ` [PATCH 07/17] perf data: Add directory support Jiri Olsa
2019-02-21 9:41 ` [PATCH 08/17] perf data: Don't store auxtrace index for directory data file Jiri Olsa
2019-02-21 9:41 ` [PATCH 09/17] perf data: Add perf_data__update_dir function Jiri Olsa
2019-02-21 9:41 ` [PATCH 10/17] perf data: Make perf_data__size to work over directory Jiri Olsa
2019-02-21 9:41 ` [PATCH 11/17] perf header: Add DIR_FORMAT feature to describe directory data Jiri Olsa
2019-02-21 9:41 ` [PATCH 12/17] perf session: Add process callback to reader object Jiri Olsa
2019-02-21 9:41 ` [PATCH 13/17] perf session: Add __perf_session__process_dir_events function Jiri Olsa
2019-02-21 9:41 ` [PATCH 14/17] perf session: Add path to reader object Jiri Olsa
2019-02-21 9:41 ` [PATCH 15/17] perf record: Add --dir option to store data in directory Jiri Olsa
2019-02-21 9:41 ` [PATCH 16/17] perf record: Add --output-dir " Jiri Olsa
2019-02-21 9:41 ` [PATCH 17/17] 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=20190221094145.9151-5-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--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=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox