From: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
To: Namhyung Kim <namhyung.kim@lge.com>
Cc: Namhyung Kim <namhyung@gmail.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@elte.hu>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 04/11] perf tools: Introduce check_target_maps() helper
Date: Mon, 13 Feb 2012 16:36:00 -0200 [thread overview]
Message-ID: <20120213183600.GF15955@infradead.org> (raw)
In-Reply-To: <1329118064-9412-5-git-send-email-namhyung.kim@lge.com>
Em Mon, Feb 13, 2012 at 04:27:36PM +0900, Namhyung Kim escreveu:
> The check_target_maps function is used to check given PID/TID/UID/CPU
> target options and warn if some combination is impossible. Also this
> can make some arguments of parse_target_uid() function useless as it
> is checked before the call via our new helper.
Here I think the naming should be:
perf_target__validate(&rec->opts.target);
instead of check_target_maps(...)
I.e. prefix with the struct name followed by two _, that is the practice
in tools/perf/, at least in code I wrote :-)
- Arnaldo
> Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
> ---
> tools/perf/builtin-record.c | 9 +++------
> tools/perf/builtin-stat.c | 3 +--
> tools/perf/builtin-top.c | 15 +++------------
> tools/perf/util/usage.c | 30 ++++++++++++++++++++++--------
> tools/perf/util/util.h | 4 +++-
> 5 files changed, 32 insertions(+), 29 deletions(-)
>
> diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
> index 7b50316136bf..9e209e3279e4 100644
> --- a/tools/perf/builtin-record.c
> +++ b/tools/perf/builtin-record.c
> @@ -783,15 +783,12 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
> goto out_symbol_exit;
> }
>
> - rec->opts.maps.uid = parse_target_uid(rec->opts.maps.uid_str,
> - rec->opts.maps.target_tid,
> - rec->opts.maps.target_pid);
> + check_target_maps(&rec->opts.maps);
> +
> + rec->opts.maps.uid = parse_target_uid(rec->opts.maps.uid_str);
> if (rec->opts.maps.uid_str && rec->opts.maps.uid == UINT_MAX - 1)
> goto out_free_fd;
>
> - if (rec->opts.maps.target_pid != -1)
> - rec->opts.maps.target_tid = rec->opts.maps.target_pid;
> -
> if (perf_evlist__create_maps(evsel_list, rec->opts.maps.target_pid,
> rec->opts.maps.target_tid, rec->opts.maps.uid,
> rec->opts.maps.cpu_list) < 0)
> diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
> index 14a30c2b9fe0..f1f4e8f60a3e 100644
> --- a/tools/perf/builtin-stat.c
> +++ b/tools/perf/builtin-stat.c
> @@ -1207,8 +1207,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used)
> if (add_default_attributes())
> goto out;
>
> - if (maps.target_pid != -1)
> - maps.target_tid = maps.target_pid;
> + check_target_maps(&maps);
>
> evsel_list->threads = thread_map__new(maps.target_pid, maps.target_tid,
> UINT_MAX);
> diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
> index 36917458ea53..9e9a8de78899 100644
> --- a/tools/perf/builtin-top.c
> +++ b/tools/perf/builtin-top.c
> @@ -1207,21 +1207,12 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
>
> setup_browser(false);
>
> - top.maps.uid = parse_target_uid(top.maps.uid_str, top.maps.target_tid,
> - top.maps.target_pid);
> + check_target_maps(&top.maps);
> +
> + top.maps.uid = parse_target_uid(top.maps.uid_str);
> if (top.maps.uid_str != NULL && top.maps.uid == UINT_MAX - 1)
> goto out_delete_evlist;
>
> - /* CPU and PID are mutually exclusive */
> - if (top.maps.target_tid > 0 && top.maps.cpu_list) {
> - printf("WARNING: PID switch overriding CPU\n");
> - sleep(1);
> - top.maps.cpu_list = NULL;
> - }
> -
> - if (top.maps.target_pid != -1)
> - top.maps.target_tid = top.maps.target_pid;
> -
> if (perf_evlist__create_maps(top.evlist, top.maps.target_pid,
> top.maps.target_tid, top.maps.uid,
> top.maps.cpu_list) < 0)
> diff --git a/tools/perf/util/usage.c b/tools/perf/util/usage.c
> index d0c013934f30..d235013600e5 100644
> --- a/tools/perf/util/usage.c
> +++ b/tools/perf/util/usage.c
> @@ -83,7 +83,7 @@ void warning(const char *warn, ...)
> va_end(params);
> }
>
> -uid_t parse_target_uid(const char *str, pid_t tid, pid_t pid)
> +uid_t parse_target_uid(const char *str)
> {
> struct passwd pwd, *result;
> char buf[1024];
> @@ -91,13 +91,6 @@ uid_t parse_target_uid(const char *str, pid_t tid, pid_t pid)
> if (str == NULL)
> return UINT_MAX;
>
> - /* CPU and PID are mutually exclusive */
> - if (tid > 0 || pid > 0) {
> - ui__warning("PID/TID switch overriding UID\n");
> - sleep(1);
> - return UINT_MAX;
> - }
> -
> getpwnam_r(str, &pwd, buf, sizeof(buf), &result);
>
> if (result == NULL) {
> @@ -120,3 +113,24 @@ uid_t parse_target_uid(const char *str, pid_t tid, pid_t pid)
>
> return result->pw_uid;
> }
> +
> +void check_target_maps(struct perf_maps_opts *maps)
> +{
> + if (maps->target_pid != -1)
> + maps->target_tid = maps->target_pid;
> +
> + /* CPU and PID are mutually exclusive */
> + if (maps->target_tid > 0 && maps->cpu_list) {
> + ui__warning("PID/TID switch overriding CPU\n");
> + sleep(1);
> + maps->cpu_list = NULL;
> + }
> +
> + /* UID and PID are mutually exclusive */
> + if (maps->target_tid > 0 && maps->uid_str) {
> + ui__warning("PID/TID switch overriding UID\n");
> + sleep(1);
> + maps->uid_str = NULL;
> + }
> +
> +}
> diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
> index 232d17ef3e60..2573985f8408 100644
> --- a/tools/perf/util/util.h
> +++ b/tools/perf/util/util.h
> @@ -242,10 +242,12 @@ unsigned long convert_unit(unsigned long value, char *unit);
> int readn(int fd, void *buf, size_t size);
>
> struct perf_event_attr;
> +struct perf_maps_opts;
>
> void event_attr_init(struct perf_event_attr *attr);
>
> -uid_t parse_target_uid(const char *str, pid_t tid, pid_t pid);
> +uid_t parse_target_uid(const char *str);
> +void check_target_maps(struct perf_maps_opts *maps);
>
> #define _STR(x) #x
> #define STR(x) _STR(x)
> --
> 1.7.9
next prev parent reply other threads:[~2012-02-13 18:36 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1329118064-9412-1-git-send-email-namhyung.kim@lge.com>
2012-02-13 7:27 ` [PATCH 01/11] perf tools: Introduce struct perf_maps_opts Namhyung Kim
2012-02-13 7:44 ` [RFC PATCHSET] perf: Fix cpu/thread map and group event handling Namhyung Kim
2012-02-13 18:32 ` [PATCH 01/11] perf tools: Introduce struct perf_maps_opts Arnaldo Carvalho de Melo
2012-02-13 18:50 ` David Ahern
2012-02-13 19:05 ` Arnaldo Carvalho de Melo
2012-02-13 19:19 ` David Ahern
2012-02-13 20:12 ` Arnaldo Carvalho de Melo
2012-02-13 7:27 ` [PATCH 02/11] perf stat: Convert to perf_maps_opts Namhyung Kim
2012-02-13 18:33 ` Arnaldo Carvalho de Melo
2012-02-13 7:27 ` [PATCH 03/11] perf top: " Namhyung Kim
2012-02-13 7:27 ` [PATCH 04/11] perf tools: Introduce check_target_maps() helper Namhyung Kim
2012-02-13 18:36 ` Arnaldo Carvalho de Melo [this message]
2012-02-13 7:27 ` [PATCH 05/11] perf tools: Make perf_evlist__create_maps() take struct perf_maps_opts Namhyung Kim
2012-02-13 18:36 ` Arnaldo Carvalho de Melo
2012-02-13 7:27 ` [PATCH 06/11] perf tools: Check more combinations of PID/TID, UID and CPU switches Namhyung Kim
2012-02-13 7:27 ` [PATCH 07/11] perf tools: Fix creation of cpu map Namhyung Kim
2012-02-13 7:27 ` [PATCH 08/11] perf tools: Consolidate target task/cpu checking Namhyung Kim
2012-02-13 18:39 ` Arnaldo Carvalho de Melo
2012-02-13 7:27 ` [PATCH 09/11] perf stat: Use perf_evlist__create_maps Namhyung Kim
2012-02-13 18:40 ` Arnaldo Carvalho de Melo
2012-02-13 7:27 ` [PATCH 10/11] perf stat: Fix event grouping on forked task Namhyung Kim
2012-02-13 18:41 ` Arnaldo Carvalho de Melo
2012-02-14 1:20 ` [PATCH] " Namhyung Kim
2012-02-13 7:27 ` [PATCH 11/11] perf record: " Namhyung Kim
2012-02-13 18:42 ` Arnaldo Carvalho de Melo
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=20120213183600.GF15955@infradead.org \
--to=acme@ghostprotocols.net \
--cc=a.p.zijlstra@chello.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=namhyung.kim@lge.com \
--cc=namhyung@gmail.com \
--cc=paulus@samba.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
Powered by JetHome