Migrate tracepoint instrumentation to TP_FIELDS

[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 992b5be500e3ce1f94cc2d5745d46530168d9500..10edec41425ff3d0c06c839609f8cbb3fad04ace 100644 (file)
--- a/instrumentation/events/lttng-module/compaction.h
+++ b/instrumentation/events/lttng-module/compaction.h
@@ -20,25 +20,12 @@ LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template,
 
        TP_ARGS(start_pfn, end_pfn, nr_scanned, nr_taken),
 
-       TP_STRUCT__entry(
-               __field(unsigned long, start_pfn)
-               __field(unsigned long, end_pfn)
-               __field(unsigned long, nr_scanned)
-               __field(unsigned long, nr_taken)
-       ),
-
-       TP_fast_assign(
-               tp_assign(start_pfn, start_pfn)
-               tp_assign(end_pfn, end_pfn)
-               tp_assign(nr_scanned, nr_scanned)
-               tp_assign(nr_taken, nr_taken)
-       ),
-
-       TP_printk("range=(0x%lx ~ 0x%lx) nr_scanned=%lu nr_taken=%lu",
-               __entry->start_pfn,
-               __entry->end_pfn,
-               __entry->nr_scanned,
-               __entry->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)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(compaction_isolate_template, mm_compaction_isolate_migratepages,
@@ -70,19 +57,10 @@ LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template,
 
        TP_ARGS(nr_scanned, nr_taken),
 
-       TP_STRUCT__entry(
-               __field(unsigned long, nr_scanned)
-               __field(unsigned long, nr_taken)
-       ),
-
-       TP_fast_assign(
-               tp_assign(nr_scanned, nr_scanned)
-               tp_assign(nr_taken, nr_taken)
-       ),
-
-       TP_printk("nr_scanned=%lu nr_taken=%lu",
-               __entry->nr_scanned,
-               __entry->nr_taken)
+       TP_FIELDS(
+               ctf_integer(unsigned long, nr_scanned, nr_scanned)
+               ctf_integer(unsigned long, nr_taken, nr_taken)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template,
@@ -114,7 +92,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template,
 #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_MAP(mm_compaction_migratepages,
+LTTNG_TRACEPOINT_EVENT_CODE_MAP(mm_compaction_migratepages,
 
        compaction_migratepages,
 
@@ -124,37 +102,28 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
 
        TP_ARGS(nr_all, migrate_rc, migratepages),
 
-       TP_STRUCT__entry(
-               __field(unsigned long, nr_migrated)
-               __field(unsigned long, nr_failed)
+       TP_locvar(
+               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_code(
+               tp_locvar->nr_failed = 0;
+
+               {
+                       struct list_head *page_lru;
+
+                       if (migrate_rc >= 0)
+                               tp_locvar->nr_failed = migrate_rc;
+                       else
+                               list_for_each(page_lru, migratepages)
+                                       tp_locvar->nr_failed++;
+               }
        ),
 
-       TP_printk("nr_migrated=%lu nr_failed=%lu",
-               __entry->nr_migrated,
-               __entry->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)
+       )
 )
 #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
 LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
@@ -166,19 +135,10 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages,
 
        TP_ARGS(nr_migrated, nr_failed),
 
-       TP_STRUCT__entry(
-               __field(unsigned long, nr_migrated)
-               __field(unsigned long, nr_failed)
-       ),
-
-       TP_fast_assign(
-               tp_assign(nr_migrated, nr_migrated)
-               tp_assign(nr_failed, nr_failed)
-       ),
-
-       TP_printk("nr_migrated=%lu nr_failed=%lu",
-               __entry->nr_migrated,
-               __entry->nr_failed)
+       TP_FIELDS(
+               ctf_integer(unsigned long, nr_migrated, nr_migrated)
+               ctf_integer(unsigned long, nr_failed, nr_failed)
+       )
 )
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */