Commit 12864b31 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarNamhyung Kim <namhyung.kim@lge.com>
Reviewed-by: default avatarDavid 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 770a34a3

tools/perf/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ LIB_H += util/cpumap.h 
LIB_H += util/top.h

LIB_H += $(ARCH_INCLUDE)

LIB_H += util/cgroup.h

LIB_H += util/target.h



LIB_OBJS += $(OUTPUT)util/abspath.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/cpumap.o

LIB_OBJS += $(OUTPUT)util/cgroup.o

LIB_OBJS += $(OUTPUT)util/target.o



BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o

tools/perf/perf.h

+1 −8
Original line number Diff line number Diff line
@@ -207,14 +207,7 @@ extern const char perf_version_string[]; 


void pthread__unblock_sigwinch(void);



struct perf_target {

	const char   *pid;

	const char   *tid;

	const char   *cpu_list;

	const char   *uid_str;

	uid_t	     uid;

	bool	     system_wide;

};

#include "util/target.h"



struct perf_record_opts {

	struct perf_target target;

tools/perf/util/evlist.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <poll.h>

#include "cpumap.h"

#include "thread_map.h"

#include "target.h"

#include "evlist.h"

#include "evsel.h"

#include <unistd.h>

tools/perf/util/evsel.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "util.h"

#include "cpumap.h"

#include "thread_map.h"

#include "target.h"



#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))

tools/perf/util/target.c

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

 * 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;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE