Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 301a0b02 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf session: Ditch register_perf_file_handler 



Pass the event_ops to perf_session__process_events instead.

Also move the event_ops definition to session.h, starting to
move things around to their right place, trimming the many
unneeded headers we have.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260741029-4430-2-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d8f66248

tools/perf/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -370,7 +370,6 @@ LIB_H += util/values.h 
LIB_H += util/sort.h

LIB_H += util/hist.h

LIB_H += util/thread.h

LIB_H += util/data_map.h

LIB_H += util/probe-finder.h

LIB_H += util/probe-event.h

tools/perf/builtin-annotate.c

+5 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "util/sort.h"

#include "util/hist.h"

#include "util/session.h"

#include "util/data_map.h"



static char		const *input_name = "perf.data";
@@ -454,7 +453,7 @@ static void find_annotations(void) 
	}

}



static struct perf_file_handler file_handler = {

static struct perf_event_ops event_ops = {

	.process_sample_event	= process_sample_event,

	.process_mmap_event	= event__process_mmap,

	.process_comm_event	= event__process_comm,
@@ -463,7 +462,8 @@ static struct perf_file_handler file_handler = { 


static int __cmd_annotate(void)

{

	struct perf_session *session = perf_session__new(input_name, O_RDONLY, force);

	struct perf_session *session = perf_session__new(input_name, O_RDONLY,

							 force);

	struct thread *idle;

	int ret;
@@ -471,9 +471,9 @@ static int __cmd_annotate(void) 
		return -ENOMEM;



	idle = register_idle_thread();

	register_perf_file_handler(&file_handler);



	ret = perf_session__process_events(session, 0, &event__cwdlen, &event__cwd);

	ret = perf_session__process_events(session, &event_ops, 0,

					   &event__cwdlen, &event__cwd);

	if (ret)

		goto out_delete;

tools/perf/builtin-buildid-list.c

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

#include "perf.h"

#include "util/cache.h"

#include "util/data_map.h"

#include "util/debug.h"

#include "util/parse-options.h"

#include "util/session.h"

tools/perf/builtin-kmem.c

+3 −5
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include "util/trace-event.h"



#include "util/debug.h"

#include "util/data_map.h"



#include <linux/rbtree.h>
@@ -359,7 +358,7 @@ static int sample_type_check(u64 type) 
	return 0;

}



static struct perf_file_handler file_handler = {

static struct perf_event_ops event_ops = {

	.process_sample_event	= process_sample_event,

	.process_comm_event	= event__process_comm,

	.sample_type_check	= sample_type_check,
@@ -374,9 +373,8 @@ static int read_events(void) 
		return -ENOMEM;



	register_idle_thread();

	register_perf_file_handler(&file_handler);



	err = perf_session__process_events(session, 0, &event__cwdlen, &event__cwd);

	err = perf_session__process_events(session, &event_ops, 0,

					   &event__cwdlen, &event__cwd);

	perf_session__delete(session);

	return err;

}

tools/perf/builtin-report.c

+2 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include "util/parse-options.h"

#include "util/parse-events.h"



#include "util/data_map.h"

#include "util/thread.h"

#include "util/sort.h"

#include "util/hist.h"
@@ -748,7 +747,7 @@ static int sample_type_check(u64 type) 
	return 0;

}



static struct perf_file_handler file_handler = {

static struct perf_event_ops event_ops = {

	.process_sample_event	= process_sample_event,

	.process_mmap_event	= event__process_mmap,

	.process_comm_event	= process_comm_event,
@@ -776,9 +775,7 @@ static int __cmd_report(void) 
	if (show_threads)

		perf_read_values_init(&show_threads_values);



	register_perf_file_handler(&file_handler);



	ret = perf_session__process_events(session, full_paths,

	ret = perf_session__process_events(session, &event_ops, full_paths,

					   &event__cwdlen, &event__cwd);

	if (ret)

		goto out_delete;