instrumentation: compaction: remove compatibility code

[lttng-modules.git] / instrumentation / events / lttng-module / compaction.h

diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h
index 22024e9ee582856262ffcd52301182cc13744437..2fed729096cf2c3b9a3333c291bf2c25b943bfe1 100644 (file)
--- a/instrumentation/events/lttng-module/compaction.h
+++ b/instrumentation/events/lttng-module/compaction.h
@@ -1,53 +1,61 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM compaction
 
-#if !defined(_TRACE_COMPACTION_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_COMPACTION_H
+#if !defined(LTTNG_TRACE_COMPACTION_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_COMPACTION_H
 
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/types.h>
-#include <linux/tracepoint.h>
-#include <linux/version.h>
-#include <trace/events/gfpflags.h>
 
-DECLARE_EVENT_CLASS(mm_compaction_isolate_template,
+LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template,
 
-       TP_PROTO(unsigned long nr_scanned,
+       TP_PROTO(unsigned long start_pfn,
+               unsigned long end_pfn,
+               unsigned long nr_scanned,
                unsigned long nr_taken),
 
-       TP_ARGS(nr_scanned, nr_taken),
+       TP_ARGS(start_pfn, end_pfn, nr_scanned, nr_taken),
 
-       TP_STRUCT__entry(
-               __field(unsigned long, nr_scanned)
-               __field(unsigned long, nr_taken)
-       ),
+       TP_FIELDS(
+               ctf_integer(unsigned long, start_pfn, start_pfn)
+               ctf_integer(unsigned long, end_pfn, end_pfn)
+               ctf_integer(unsigned long, nr_scanned, nr_scanned)
+               ctf_integer(unsigned long, nr_taken, nr_taken)
+       )
+)
 
-       TP_fast_assign(
-               tp_assign(nr_scanned, nr_scanned)
-               tp_assign(nr_taken, nr_taken)
-       ),
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template,
 
-       TP_printk("nr_scanned=%lu nr_taken=%lu",
-               __entry->nr_scanned,
-               __entry->nr_taken)
-)
+       mm_compaction_isolate_migratepages,
 
-DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_migratepages,
+       compaction_isolate_migratepages,
 
-       TP_PROTO(unsigned long nr_scanned,
+       TP_PROTO(unsigned long start_pfn,
+               unsigned long end_pfn,
+               unsigned long nr_scanned,
                unsigned long nr_taken),
 
-       TP_ARGS(nr_scanned, nr_taken)
+       TP_ARGS(start_pfn, end_pfn, nr_scanned, nr_taken)
 )
 
-DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages,
-       TP_PROTO(unsigned long nr_scanned,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template,
+
+       mm_compaction_isolate_freepages,
+
+       compaction_isolate_freepages,
+
+       TP_PROTO(unsigned long start_pfn,
+               unsigned long end_pfn,
+               unsigned long nr_scanned,
                unsigned long nr_taken),
 
-       TP_ARGS(nr_scanned, nr_taken)
+       TP_ARGS(start_pfn, end_pfn, nr_scanned, nr_taken)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
-TRACE_EVENT(mm_compaction_migratepages,
+LTTNG_TRACEPOINT_EVENT_CODE_MAP(mm_compaction_migratepages,
+
+       compaction_migratepages,
 
        TP_PROTO(unsigned long nr_all,
                int migrate_rc,
@@ -55,63 +63,33 @@ TRACE_EVENT(mm_compaction_migratepages,
 
        TP_ARGS(nr_all, migrate_rc, migratepages),
 
-       TP_STRUCT__entry(
-               __field(unsigned long, nr_migrated)
-               __field(unsigned long, nr_failed)
-       ),
-
-       TP_fast_assign(
-               tp_assign(nr_migrated,
-                       nr_all -
-                       (migrate_rc >= 0 ? migrate_rc :
-                               ({
-                                       unsigned long nr_failed = 0;
-                                       struct list_head *page_lru;
-
-                                       list_for_each(page_lru, migratepages)
-                                               nr_failed++;
-                                       nr_failed;
-                               })))
-               tp_assign(nr_failed,
-                               ({
-                                       unsigned long nr_failed = 0;
-                                       struct list_head *page_lru;
-
-                                       list_for_each(page_lru, migratepages)
-                                               nr_failed++;
-                                       nr_failed;
-                               }))
+       TP_locvar(
+               unsigned long nr_failed;
        ),
 
-       TP_printk("nr_migrated=%lu nr_failed=%lu",
-               __entry->nr_migrated,
-               __entry->nr_failed)
-)
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
-TRACE_EVENT(mm_compaction_migratepages,
-
-       TP_PROTO(unsigned long nr_migrated,
-               unsigned long nr_failed),
+       TP_code_pre(
+               tp_locvar->nr_failed = 0;
 
-       TP_ARGS(nr_migrated, nr_failed),
+               {
+                       struct list_head *page_lru;
 
-       TP_STRUCT__entry(
-               __field(unsigned long, nr_migrated)
-               __field(unsigned long, nr_failed)
+                       if (migrate_rc >= 0)
+                               tp_locvar->nr_failed = migrate_rc;
+                       else
+                               list_for_each(page_lru, migratepages)
+                                       tp_locvar->nr_failed++;
+               }
        ),
 
-       TP_fast_assign(
-               tp_assign(nr_migrated, nr_migrated)
-               tp_assign(nr_failed, nr_failed)
+       TP_FIELDS(
+               ctf_integer(unsigned long, nr_migrated, nr_all - tp_locvar->nr_failed)
+               ctf_integer(unsigned long, nr_failed, tp_locvar->nr_failed)
        ),
 
-       TP_printk("nr_migrated=%lu nr_failed=%lu",
-               __entry->nr_migrated,
-               __entry->nr_failed)
+       TP_code_post()
 )
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
 
-#endif /* _TRACE_COMPACTION_H */
+#endif /* LTTNG_TRACE_COMPACTION_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>