Prev: [PATCH 1/3] perf kvm: Get rid of unused guest_kallsyms
Next: [PATCH 3/3] perf: Fix the bug which fails to put memory mapping to record file
From: Gui Jianfeng on 24 Jun 2010 22:20 group_fd related code is dead here, remove them. Signed-off-by: Gui Jianfeng <guijianfeng(a)cn.fujitsu.com> --- tools/perf/builtin-record.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index abaf0f8..84d58b7 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -45,7 +45,6 @@ static int freq = 1000; static int output; static int pipe_output = 0; static const char *output_name = "perf.data"; -static int group = 0; static int realtime_prio = 0; static bool raw_samples = false; static bool system_wide = false; @@ -203,8 +202,6 @@ static void sig_atexit(void) kill(getpid(), signr); } -static int group_fd; - static struct perf_header_attr *get_header_attr(struct perf_event_attr *a, int nr) { struct perf_header_attr *h_attr; @@ -291,7 +288,7 @@ static void create_counter(int counter, int cpu) for (thread_index = 0; thread_index < thread_num; thread_index++) { try_again: fd[nr_cpu][counter][thread_index] = sys_perf_event_open(attr, - all_tids[thread_index], cpu, group_fd, 0); + all_tids[thread_index], cpu, -1, 0); if (fd[nr_cpu][counter][thread_index] < 0) { int err = errno; @@ -359,12 +356,6 @@ try_again: assert(fd[nr_cpu][counter][thread_index] >= 0); fcntl(fd[nr_cpu][counter][thread_index], F_SETFL, O_NONBLOCK); - /* - * First counter acts as the group leader: - */ - if (group && group_fd == -1) - group_fd = fd[nr_cpu][counter][thread_index]; - if (counter || thread_index) { ret = ioctl(fd[nr_cpu][counter][thread_index], PERF_EVENT_IOC_SET_OUTPUT, @@ -406,7 +397,6 @@ static void open_counters(int cpu) { int counter; - group_fd = -1; for (counter = 0; counter < nr_counters; counter++) create_counter(counter, cpu); -- 1.6.5.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |