From: tip-bot for Jiri Olsa <tipbot@zytor.com> To: linux-tip-commits@vger.kernel.org Cc: adrian.hunter@intel.com, ak@linux.intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, alexander.shishkin@linux.intel.com, eranian@google.com, alexey.budankov@linux.intel.com, mingo@kernel.org, peterz@infradead.org, jolsa@kernel.org, namhyung@kernel.org, hpa@zytor.com, acme@redhat.com Subject: [tip:perf/core] perf tools: Add depth checking to rm_rf Date: Thu, 28 Feb 2019 00:00:11 -0800 [thread overview] Message-ID: <tip-05a486593977bfcf71de6bf5cad6d045c18829c6@git.kernel.org> (raw) In-Reply-To: <20190224190656.30163-2-jolsa@kernel.org> Commit-ID: 05a486593977bfcf71de6bf5cad6d045c18829c6 Gitweb: https://git.kernel.org/tip/05a486593977bfcf71de6bf5cad6d045c18829c6 Author: Jiri Olsa <jolsa@kernel.org> AuthorDate: Sun, 24 Feb 2019 20:06:37 +0100 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Mon, 25 Feb 2019 10:32:11 -0300 perf tools: Add depth checking to rm_rf Adding depth argument to rm_rf (and renaming it to rm_rf_depth) to specify the depth we will go searching for files to remove. It will be used to specify single depth for perf.data directory removal in following patch. 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-2-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/util.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index 3ee410fc047a..bcf436892155 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -117,7 +117,12 @@ int mkdir_p(char *path, mode_t mode) return (stat(path, &st) && mkdir(path, mode)) ? -1 : 0; } -int rm_rf(const char *path) +/* + * The depth specify how deep the removal will go. + * 0 - will remove only files under the 'path' directory + * 1 .. x - will dive in x-level deep under the 'path' directory + */ +static int rm_rf_depth(const char *path, int depth) { DIR *dir; int ret; @@ -155,7 +160,7 @@ int rm_rf(const char *path) } if (S_ISDIR(statbuf.st_mode)) - ret = rm_rf(namebuf); + ret = depth ? rm_rf_depth(namebuf, depth - 1) : 0; else ret = unlink(namebuf); } @@ -167,6 +172,11 @@ int rm_rf(const char *path) return rmdir(path); } +int rm_rf(const char *path) +{ + return rm_rf_depth(path, INT_MAX); +} + /* A filter which removes dot files */ bool lsdir_no_dot_filter(const char *name __maybe_unused, struct dirent *d) {
next prev parent reply other threads:[~2019-02-28 8:00 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-bot for Jiri Olsa [this message] 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:perf/core] " tip-bot for Jiri Olsa 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-05a486593977bfcf71de6bf5cad6d045c18829c6@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 tools: Add depth checking to rm_rf' \ /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.