leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf tools: Introduce perf_target__validate() helper

Browse Source 
The perf_target__validate 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.

Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1335417327-11796-5-git-send-email-namhyung.kim@lge.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2012-04-26 14:15:18 +09:00 committed by Arnaldo Carvalho de Melo
parent fe9d18a71d
commit 4bd0f2d2c0
5 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/perf/builtin-record.c
View File

@ -884,16 +884,13 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
goto out_symbol_exit; goto out_symbol_exit;
} }
rec->opts.target.uid = parse_target_uid(rec->opts.target.uid_str, perf_target__validate(&rec->opts.target);
rec->opts.target.tid,
rec->opts.target.pid); rec->opts.target.uid = parse_target_uid(rec->opts.target.uid_str);
if (rec->opts.target.uid_str != NULL && if (rec->opts.target.uid_str != NULL &&
rec->opts.target.uid == UINT_MAX - 1) rec->opts.target.uid == UINT_MAX - 1)
goto out_free_fd; goto out_free_fd;
if (rec->opts.target.pid)
rec->opts.target.tid = rec->opts.target.pid;
if (perf_evlist__create_maps(evsel_list, rec->opts.target.pid, if (perf_evlist__create_maps(evsel_list, rec->opts.target.pid,
rec->opts.target.tid, rec->opts.target.uid, rec->opts.target.tid, rec->opts.target.uid,
rec->opts.target.cpu_list) < 0) rec->opts.target.cpu_list) < 0)

3
tools/perf/builtin-stat.c
View File

@ -1203,8 +1203,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used)
if (add_default_attributes()) if (add_default_attributes())
goto out; goto out;
if (target.pid) perf_target__validate(&target);
target.tid = target.pid;
evsel_list->threads = thread_map__new_str(target.pid, evsel_list->threads = thread_map__new_str(target.pid,
target.tid, UINT_MAX); target.tid, UINT_MAX);

15
tools/perf/builtin-top.c
View File

@ -1252,21 +1252,12 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
setup_browser(false); setup_browser(false);
top.target.uid = parse_target_uid(top.target.uid_str, top.target.tid, perf_target__validate(&top.target);
top.target.pid);
top.target.uid = parse_target_uid(top.target.uid_str);
if (top.target.uid_str != NULL && top.target.uid == UINT_MAX - 1) if (top.target.uid_str != NULL && top.target.uid == UINT_MAX - 1)
goto out_delete_evlist; goto out_delete_evlist;
/* CPU and PID are mutually exclusive */
if (top.target.tid && top.target.cpu_list) {
printf("WARNING: PID switch overriding CPU\n");
sleep(1);
top.target.cpu_list = NULL;
}
if (top.target.pid)
top.target.tid = top.target.pid;
if (perf_evlist__create_maps(top.evlist, top.target.pid, if (perf_evlist__create_maps(top.evlist, top.target.pid,
top.target.tid, top.target.uid, top.target.tid, top.target.uid,
top.target.cpu_list) < 0) top.target.cpu_list) < 0)

29
tools/perf/util/usage.c
View File

@ -83,7 +83,7 @@ void warning(const char *warn, ...)
va_end(params); va_end(params);
} }
uid_t parse_target_uid(const char *str, const char *tid, const char *pid) uid_t parse_target_uid(const char *str)
{ {
struct passwd pwd, *result; struct passwd pwd, *result;
char buf[1024]; char buf[1024];
@ -91,13 +91,6 @@ uid_t parse_target_uid(const char *str, const char *tid, const char *pid)
if (str == NULL) if (str == NULL)
return UINT_MAX; return UINT_MAX;
/* UID and PID are mutually exclusive */
if (tid || pid) {
ui__warning("PID/TID switch overriding UID\n");
sleep(1);
return UINT_MAX;
}
getpwnam_r(str, &pwd, buf, sizeof(buf), &result); getpwnam_r(str, &pwd, buf, sizeof(buf), &result);
if (result == NULL) { if (result == NULL) {
@ -120,3 +113,23 @@ uid_t parse_target_uid(const char *str, const char *tid, const char *pid)
return result->pw_uid; return result->pw_uid;
} }
void perf_target__validate(struct perf_target *target)
{
if (target->pid)
target->tid = target->pid;
/* CPU and PID are mutually exclusive */
if (target->tid && target->cpu_list) {
ui__warning("WARNING: PID switch overriding CPU\n");
sleep(1);
target->cpu_list = NULL;
}
/* UID and PID are mutually exclusive */
if (target->tid && target->uid_str) {
ui__warning("PID/TID switch overriding UID\n");
sleep(1);
target->uid_str = NULL;
}
}

4
tools/perf/util/util.h
View File

@ -246,10 +246,12 @@ unsigned long convert_unit(unsigned long value, char *unit);
int readn(int fd, void *buf, size_t size); int readn(int fd, void *buf, size_t size);
struct perf_event_attr; struct perf_event_attr;
struct perf_target;
void event_attr_init(struct perf_event_attr *attr); void event_attr_init(struct perf_event_attr *attr);
uid_t parse_target_uid(const char *str, const char *tid, const char *pid); uid_t parse_target_uid(const char *str);
void perf_target__validate(struct perf_target *target);
#define _STR(x) #x #define _STR(x) #x
#define STR(x) _STR(x) #define STR(x) _STR(x)