mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
perf target: Split out perf_target handling code
For further work on perf_target, it'd be better off splitting the code into a separate file. 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-9-git-send-email-namhyung.kim@lge.com [ committer note: Fixed perl build by using stdbool and types.h in target.h ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
770a34a38b
commit
12864b3158
8 changed files with 68 additions and 44 deletions
|
@ -300,6 +300,7 @@ LIB_H += util/cpumap.h
|
||||||
LIB_H += util/top.h
|
LIB_H += util/top.h
|
||||||
LIB_H += $(ARCH_INCLUDE)
|
LIB_H += $(ARCH_INCLUDE)
|
||||||
LIB_H += util/cgroup.h
|
LIB_H += util/cgroup.h
|
||||||
|
LIB_H += util/target.h
|
||||||
|
|
||||||
LIB_OBJS += $(OUTPUT)util/abspath.o
|
LIB_OBJS += $(OUTPUT)util/abspath.o
|
||||||
LIB_OBJS += $(OUTPUT)util/alias.o
|
LIB_OBJS += $(OUTPUT)util/alias.o
|
||||||
|
@ -361,6 +362,7 @@ LIB_OBJS += $(OUTPUT)util/util.o
|
||||||
LIB_OBJS += $(OUTPUT)util/xyarray.o
|
LIB_OBJS += $(OUTPUT)util/xyarray.o
|
||||||
LIB_OBJS += $(OUTPUT)util/cpumap.o
|
LIB_OBJS += $(OUTPUT)util/cpumap.o
|
||||||
LIB_OBJS += $(OUTPUT)util/cgroup.o
|
LIB_OBJS += $(OUTPUT)util/cgroup.o
|
||||||
|
LIB_OBJS += $(OUTPUT)util/target.o
|
||||||
|
|
||||||
BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o
|
BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o
|
||||||
|
|
||||||
|
|
|
@ -207,14 +207,7 @@ extern const char perf_version_string[];
|
||||||
|
|
||||||
void pthread__unblock_sigwinch(void);
|
void pthread__unblock_sigwinch(void);
|
||||||
|
|
||||||
struct perf_target {
|
#include "util/target.h"
|
||||||
const char *pid;
|
|
||||||
const char *tid;
|
|
||||||
const char *cpu_list;
|
|
||||||
const char *uid_str;
|
|
||||||
uid_t uid;
|
|
||||||
bool system_wide;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct perf_record_opts {
|
struct perf_record_opts {
|
||||||
struct perf_target target;
|
struct perf_target target;
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
#include <poll.h>
|
#include <poll.h>
|
||||||
#include "cpumap.h"
|
#include "cpumap.h"
|
||||||
#include "thread_map.h"
|
#include "thread_map.h"
|
||||||
|
#include "target.h"
|
||||||
#include "evlist.h"
|
#include "evlist.h"
|
||||||
#include "evsel.h"
|
#include "evsel.h"
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "cpumap.h"
|
#include "cpumap.h"
|
||||||
#include "thread_map.h"
|
#include "thread_map.h"
|
||||||
|
#include "target.h"
|
||||||
|
|
||||||
#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
|
#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
|
||||||
#define GROUP_FD(group_fd, cpu) (*(int *)xyarray__entry(group_fd, cpu, 0))
|
#define GROUP_FD(group_fd, cpu) (*(int *)xyarray__entry(group_fd, cpu, 0))
|
||||||
|
|
45
tools/perf/util/target.c
Normal file
45
tools/perf/util/target.c
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
/*
|
||||||
|
* Helper functions for handling target threads/cpus
|
||||||
|
*
|
||||||
|
* Copyright (C) 2012, LG Electronics, Namhyung Kim <namhyung.kim@lge.com>
|
||||||
|
*
|
||||||
|
* Released under the GPL v2.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "target.h"
|
||||||
|
#include "debug.h"
|
||||||
|
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* UID and CPU are mutually exclusive */
|
||||||
|
if (target->uid_str && target->cpu_list) {
|
||||||
|
ui__warning("UID switch overriding CPU\n");
|
||||||
|
sleep(1);
|
||||||
|
target->cpu_list = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* PID/UID and SYSTEM are mutually exclusive */
|
||||||
|
if ((target->tid || target->uid_str) && target->system_wide) {
|
||||||
|
ui__warning("PID/TID/UID switch overriding CPU\n");
|
||||||
|
sleep(1);
|
||||||
|
target->system_wide = false;
|
||||||
|
}
|
||||||
|
}
|
18
tools/perf/util/target.h
Normal file
18
tools/perf/util/target.h
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
#ifndef _PERF_TARGET_H
|
||||||
|
#define _PERF_TARGET_H
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
struct perf_target {
|
||||||
|
const char *pid;
|
||||||
|
const char *tid;
|
||||||
|
const char *cpu_list;
|
||||||
|
const char *uid_str;
|
||||||
|
uid_t uid;
|
||||||
|
bool system_wide;
|
||||||
|
};
|
||||||
|
|
||||||
|
void perf_target__validate(struct perf_target *target);
|
||||||
|
|
||||||
|
#endif /* _PERF_TARGET_H */
|
|
@ -113,37 +113,3 @@ uid_t parse_target_uid(const char *str)
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* UID and CPU are mutually exclusive */
|
|
||||||
if (target->uid_str && target->cpu_list) {
|
|
||||||
ui__warning("UID switch overriding CPU\n");
|
|
||||||
sleep(1);
|
|
||||||
target->cpu_list = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* PID/UID and SYSTEM are mutually exclusive */
|
|
||||||
if ((target->tid || target->uid_str) && target->system_wide) {
|
|
||||||
ui__warning("PID/TID/UID switch overriding CPU\n");
|
|
||||||
sleep(1);
|
|
||||||
target->system_wide = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -246,12 +246,10 @@ 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);
|
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)
|
||||||
|
|
Loading…
Reference in a new issue