X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fcompaction.h;h=992b5be500e3ce1f94cc2d5745d46530168d9500;hb=9bbf98da13bbaf289ac5787a80325d2e1dd81d0d;hp=7914e234c471631fe927ef9ec9c301aa22e2c2e3;hpb=f934e302d314d76563484f31caed56ad680eb17b;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h
index 7914e234..992b5be5 100644
--- a/instrumentation/events/lttng-module/compaction.h
+++ b/instrumentation/events/lttng-module/compaction.h
@@ -11,7 +11,7 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
 
-LTTNG_TRACEPOINT_EVENT_CLASS(mm_compaction_isolate_template,
+LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template,
 
 	TP_PROTO(unsigned long start_pfn,
 		unsigned long end_pfn,
@@ -41,7 +41,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(mm_compaction_isolate_template,
 		__entry->nr_taken)
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_isolate_migratepages,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(compaction_isolate_template, mm_compaction_isolate_migratepages,
 
 	TP_PROTO(unsigned long start_pfn,
 		unsigned long end_pfn,
@@ -51,7 +51,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_is
 	TP_ARGS(start_pfn, end_pfn, nr_scanned, nr_taken)
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_isolate_freepages,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(compaction_isolate_template, mm_compaction_isolate_freepages,
 
 	TP_PROTO(unsigned long start_pfn,
 		unsigned long end_pfn,
@@ -63,7 +63,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_is
 
 #else /* #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) */
 
-LTTNG_TRACEPOINT_EVENT_CLASS(mm_compaction_isolate_template,
+LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template,
 
 	TP_PROTO(unsigned long nr_scanned,
 		unsigned long nr_taken),
@@ -85,7 +85,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(mm_compaction_isolate_template,
 		__entry->nr_taken)
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_isolate_migratepages,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template,
+
+	mm_compaction_isolate_migratepages,
+
+	compaction_isolate_migratepages,
 
 	TP_PROTO(unsigned long nr_scanned,
 		unsigned long nr_taken),
@@ -93,7 +97,12 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_is
 	TP_ARGS(nr_scanned, nr_taken)
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_isolate_freepages,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template,
+
+	mm_compaction_isolate_freepages,
+
+	compaction_isolate_freepages,
+
 	TP_PROTO(unsigned long nr_scanned,
 		unsigned long nr_taken),
 
@@ -105,7 +114,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_is
 #if LTTNG_KERNEL_RANGE(3,12,30, 3,13,0) || \
 	LTTNG_KERNEL_RANGE(3,14,25, 3,15,0) || \
 	(LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
-LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages,
+LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
+
+	compaction_migratepages,
 
 	TP_PROTO(unsigned long nr_all,
 		int migrate_rc,
@@ -146,7 +157,9 @@ LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages,
 		__entry->nr_failed)
 )
 #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
-LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages,
+LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
+
+	compaction_migratepages,
 
 	TP_PROTO(unsigned long nr_migrated,
 		unsigned long nr_failed),