[tip:perf/core] perf data: Make check_backup work over directories

[tip-bot for Jiri Olsa]

Commit-ID:  5021fc4e8c7c3be6f8735eff76fb2520485fcec4
Gitweb:     https://git.kernel.org/tip/5021fc4e8c7c3be6f8735eff76fb2520485fcec4
Author:     Jiri Olsa <jo...@kernel.org>
AuthorDate: Sun, 24 Feb 2019 20:06:42 +0100
Committer:  Arnaldo Carvalho de Melo <a...@redhat.com>
CommitDate: Mon, 25 Feb 2019 10:35:19 -0300

perf data: Make check_backup work over directories

Change check_backup() to call rm_rf_perf_data() instead of unlink() to
work over directory paths.

Also move the call earlier in the code, before we fork for file/dir, so
it can backup also directory data.

Signed-off-by: Jiri Olsa <jo...@kernel.org>
Cc: Adrian Hunter <adrian.hun...@intel.com>
Cc: Alexander Shishkin <alexander.shish...@linux.intel.com>
Cc: Alexey Budankov <alexey.budan...@linux.intel.com>
Cc: Andi Kleen <a...@linux.intel.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Stephane Eranian <eran...@google.com>
Link: http://lkml.kernel.org/r/20190224190656.30163-7-jo...@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/perf/util/data.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
index e16d06ed1100..bbf9a299615e 100644
--- a/tools/perf/util/data.c
+++ b/tools/perf/util/data.c
@@ -37,12 +37,15 @@ static int check_backup(struct perf_data *data)
 {
        struct stat st;
 
+       if (perf_data__is_read(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);
-               unlink(oldname);
+               rm_rf_perf_data(oldname);
                rename(data->path, oldname);
        }
 
@@ -95,9 +98,6 @@ static int open_file_write(struct perf_data *data)
        int fd;
        char sbuf[STRERR_BUFSIZE];
 
-       if (check_backup(data))
-               return -1;
-
        fd = open(data->file.path, O_CREAT|O_RDWR|O_TRUNC|O_CLOEXEC,
                  S_IRUSR|S_IWUSR);
 
@@ -141,6 +141,9 @@ int perf_data__open(struct perf_data *data)
        if (!data->path)
                data->path = "perf.data";
 
+       if (check_backup(data))
+               return -1;
+
        return open_file_dup(data);
 }