Skip to contentSkip to conversation

power_trace: move power_trace to kernel/power/

RFC PATCH In review Lai Jiangshan 2 participants 2 messages Jan 26, 2011

Subsystems (3)
Tracing Suspend to RAM Hibernation
lore
Share & tools
lore

Lai Jiangshan

author
#0 lore raw

RFC PATCH 1/1 power_trace: move power_trace to kernel/power/

I think kernel/trace/ is the place for the tracing implementation files, it is not a good place for tracepoint creation. Any subsystem should creates tracepoints at its owner location, see also all other CREATE_TRACE_POINTS. For example: net-traces.c is in the net/core/ directory.

Signed-off-by Lai Jiangshan <[email protected]>

---

kernel/Makefile +1 -1
index 353d3fe..25c3767 100644
@@ -55,6 +55,7 @@ obj-$(CONFIG_MODULES) += module.o
 obj-$(CONFIG_KALLSYMS) += kallsyms.o
 obj-$(CONFIG_PM) += power/
 obj-$(CONFIG_FREEZER) += power/
+obj-$(CONFIG_TRACEPOINTS) += power/
 obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
 obj-$(CONFIG_KEXEC) += kexec.o
 obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o

@@ -100,7 +101,6 @@ obj-$(CONFIG_FUNCTION_TRACER) += trace/
 obj-$(CONFIG_TRACING) += trace/
 obj-$(CONFIG_X86_DS) += trace/
 obj-$(CONFIG_RING_BUFFER) += trace/
-obj-$(CONFIG_TRACEPOINTS) += trace/
 obj-$(CONFIG_SMP) += sched_cpupri.o
 obj-$(CONFIG_IRQ_WORK) += irq_work.o
 obj-$(CONFIG_PERF_EVENTS) += perf_event.o
kernel/power/Makefile +1 -0
index c350e18..b5a74f5 100644
@@ -9,3 +9,4 @@ obj-$(CONFIG_HIBERNATION)	+= hibernate.o snapshot.o swap.o user.o \
 				   block_io.o
 
 obj-$(CONFIG_MAGIC_SYSRQ)	+= poweroff.o
+obj-$(CONFIG_TRACEPOINTS)	+= power-traces.o
kernel/power/power-traces.c new file +20 -0
new file mode 100644
index 0000000..f55fcf6
@@ -0,0 +1,20 @@
+/*
+ * Power trace points
+ *
+ * Copyright (C) 2009 Arjan van de Ven <[email protected]>
+ */
+
+#include <linux/string.h>
+#include <linux/types.h>
+#include <linux/workqueue.h>
+#include <linux/sched.h>
+#include <linux/module.h>
+
+#define CREATE_TRACE_POINTS
+#include <trace/events/power.h>
+
+#ifdef EVENT_POWER_TRACING_DEPRECATED
+EXPORT_TRACEPOINT_SYMBOL_GPL(power_start);
+#endif
+EXPORT_TRACEPOINT_SYMBOL_GPL(cpu_idle);
+
kernel/trace/Makefile +0 -1
index 761c510..8ad9849 100644
@@ -52,7 +52,6 @@ obj-$(CONFIG_EVENT_TRACING) += trace_event_perf.o
 endif
 obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
 obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
-obj-$(CONFIG_TRACEPOINTS) += power-traces.o
 ifeq ($(CONFIG_TRACING),y)
 obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
 endif
kernel/trace/power-traces.c deleted +0 -20
deleted file mode 100644
index f55fcf6..0000000
@@ -1,20 +0,0 @@
-/*
- * Power trace points
- *
- * Copyright (C) 2009 Arjan van de Ven <[email protected]>
- */
-
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/workqueue.h>
-#include <linux/sched.h>
-#include <linux/module.h>
-
-#define CREATE_TRACE_POINTS
-#include <trace/events/power.h>
-
-#ifdef EVENT_POWER_TRACING_DEPRECATED
-EXPORT_TRACEPOINT_SYMBOL_GPL(power_start);
-#endif
-EXPORT_TRACEPOINT_SYMBOL_GPL(cpu_idle);
-
#1 lore raw
Quoted 33 lines · Lai Jiangshan

I think kernel/trace/ is the place for the tracing implementation files, it is not a good place for tracepoint creation. Any subsystem should creates tracepoints at its owner location, see also all other CREATE_TRACE_POINTS. For example: net-traces.c is in the net/core/ directory.

Signed-off-by Lai Jiangshan <[email protected]>

---

kernel/Makefile +1 -1
index 353d3fe..25c3767 100644
@@ -55,6 +55,7 @@ obj-$(CONFIG_MODULES) += module.o
 obj-$(CONFIG_KALLSYMS) += kallsyms.o
 obj-$(CONFIG_PM) += power/
 obj-$(CONFIG_FREEZER) += power/
+obj-$(CONFIG_TRACEPOINTS) += power/
 obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
 obj-$(CONFIG_KEXEC) += kexec.o
 obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o

@@ -100,7 +101,6 @@ obj-$(CONFIG_FUNCTION_TRACER) += trace/
 obj-$(CONFIG_TRACING) += trace/
 obj-$(CONFIG_X86_DS) += trace/
 obj-$(CONFIG_RING_BUFFER) += trace/
-obj-$(CONFIG_TRACEPOINTS) += trace/
 obj-$(CONFIG_SMP) += sched_cpupri.o
 obj-$(CONFIG_IRQ_WORK) += irq_work.o
 obj-$(CONFIG_PERF_EVENTS) += perf_event.o
kernel/power/Makefile +0 -0
index c350e18..b5a74f5 100644

kernel/power/Makefile obj-$(CONFIG_HIBERNATION) += hibernate.o snapshot.o swap.o user.o \ · line 12

Quoted 4 lines
kernel/power/Makefile +1 -0
@@ -9,3 +9,4 @@ obj-$(CONFIG_HIBERNATION)	+= hibernate.o snapshot.o swap.o user.o \
 				   block_io.o
 
 obj-$(CONFIG_MAGIC_SYSRQ)	+= poweroff.o
+obj-$(CONFIG_TRACEPOINTS)	+= power-traces.o

What is 'power-traces'? Please name it power-events.c/power-events.o.

Thanks,

Ingo