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

Commit f376bf5f authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

tracing: Remove sysprof ftrace plugin 



The sysprof ftrace plugin doesn't seem to be seriously used
somewhere. There is a branch in the sysprof tree that makes
an interface to it, but the real sysprof tool uses either its
own module or perf events.

Drop the sysprof ftrace plugin then, as it's mostly useless.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Acked-by: default avatarSoeren Sandmann <sandmann@daimi.au.dk>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
parent cc5edb0e

kernel/trace/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -194,15 +194,6 @@ config PREEMPT_TRACER 
	  enabled. This option and the irqs-off timing option can be

	  used together or separately.)



config SYSPROF_TRACER

	bool "Sysprof Tracer"

	depends on X86

	select GENERIC_TRACER

	select CONTEXT_SWITCH_TRACER

	help

	  This tracer provides the trace needed by the 'Sysprof' userspace

	  tool.



config SCHED_TRACER

	bool "Scheduling Latency Tracer"

	select GENERIC_TRACER

kernel/trace/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ obj-$(CONFIG_TRACING) += trace_output.o 
obj-$(CONFIG_TRACING) += trace_stat.o

obj-$(CONFIG_TRACING) += trace_printk.o

obj-$(CONFIG_CONTEXT_SWITCH_TRACER) += trace_sched_switch.o

obj-$(CONFIG_SYSPROF_TRACER) += trace_sysprof.o

obj-$(CONFIG_FUNCTION_TRACER) += trace_functions.o

obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o

obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o

kernel/trace/trace.c

+0 −3
Original line number Diff line number Diff line
@@ -4354,9 +4354,6 @@ static __init int tracer_init_debugfs(void) 
	trace_create_file("dyn_ftrace_total_info", 0444, d_tracer,

			&ftrace_update_tot_cnt, &tracing_dyn_info_fops);

#endif

#ifdef CONFIG_SYSPROF_TRACER

	init_tracer_sysprof_debugfs(d_tracer);

#endif



	create_trace_options_dir();

kernel/trace/trace.h

+0 −3
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ struct dentry *trace_create_file(const char *name, 
				 const struct file_operations *fops);



struct dentry *tracing_init_dentry(void);

void init_tracer_sysprof_debugfs(struct dentry *d_tracer);



struct ring_buffer_event;
@@ -428,8 +427,6 @@ extern int trace_selftest_startup_nop(struct tracer *trace, 
					 struct trace_array *tr);

extern int trace_selftest_startup_sched_switch(struct tracer *trace,

					       struct trace_array *tr);

extern int trace_selftest_startup_sysprof(struct tracer *trace,

					       struct trace_array *tr);

extern int trace_selftest_startup_branch(struct tracer *trace,

					 struct trace_array *tr);

#endif /* CONFIG_FTRACE_STARTUP_TEST */

kernel/trace/trace_selftest.c

+0 −32
Original line number Diff line number Diff line
@@ -690,38 +690,6 @@ trace_selftest_startup_sched_switch(struct tracer *trace, struct trace_array *tr 
}

#endif /* CONFIG_CONTEXT_SWITCH_TRACER */



#ifdef CONFIG_SYSPROF_TRACER

int

trace_selftest_startup_sysprof(struct tracer *trace, struct trace_array *tr)

{

	unsigned long count;

	int ret;



	/* start the tracing */

	ret = tracer_init(trace, tr);

	if (ret) {

		warn_failed_init_tracer(trace, ret);

		return ret;

	}



	/* Sleep for a 1/10 of a second */

	msleep(100);

	/* stop the tracing. */

	tracing_stop();

	/* check the trace buffer */

	ret = trace_test_buffer(tr, &count);

	trace->reset(tr);

	tracing_start();



	if (!ret && !count) {

		printk(KERN_CONT ".. no entries found ..");

		ret = -1;

	}



	return ret;

}

#endif /* CONFIG_SYSPROF_TRACER */



#ifdef CONFIG_BRANCH_TRACER

int

trace_selftest_startup_branch(struct tracer *trace, struct trace_array *tr)