Rename odd event names

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

diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h
index baf4176aa1192ed0f46b48a25390f356158a5e17..7607fc0c71b7f78aa6d6546d499e9c66ab83365d 100644 (file)
--- a/instrumentation/events/lttng-module/kmem.h
+++ b/instrumentation/events/lttng-module/kmem.h
@@ -22,8 +22,8 @@ DECLARE_EVENT_CLASS(kmem_alloc,
        TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags),
 
        TP_STRUCT__entry(
-               __field(        unsigned long,  call_site       )
-               __field(        const void *,   ptr             )
+               __field_hex(    unsigned long,  call_site       )
+               __field_hex(    const void *,   ptr             )
                __field(        size_t,         bytes_req       )
                __field(        size_t,         bytes_alloc     )
                __field(        gfp_t,          gfp_flags       )
@@ -45,7 +45,9 @@ DECLARE_EVENT_CLASS(kmem_alloc,
                show_gfp_flags(__entry->gfp_flags))
 )
 
-DEFINE_EVENT(kmem_alloc, kmalloc,
+DEFINE_EVENT_MAP(kmem_alloc, kmalloc,
+
+       kmem_kmalloc,
 
        TP_PROTO(unsigned long call_site, const void *ptr,
                 size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags),
@@ -73,8 +75,8 @@ DECLARE_EVENT_CLASS(kmem_alloc_node,
        TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node),
 
        TP_STRUCT__entry(
-               __field(        unsigned long,  call_site       )
-               __field(        const void *,   ptr             )
+               __field_hex(    unsigned long,  call_site       )
+               __field_hex(    const void *,   ptr             )
                __field(        size_t,         bytes_req       )
                __field(        size_t,         bytes_alloc     )
                __field(        gfp_t,          gfp_flags       )
@@ -99,7 +101,9 @@ DECLARE_EVENT_CLASS(kmem_alloc_node,
                __entry->node)
 )
 
-DEFINE_EVENT(kmem_alloc_node, kmalloc_node,
+DEFINE_EVENT_MAP(kmem_alloc_node, kmalloc_node,
+
+       kmem_kmalloc_node,
 
        TP_PROTO(unsigned long call_site, const void *ptr,
                 size_t bytes_req, size_t bytes_alloc,
@@ -124,8 +128,8 @@ DECLARE_EVENT_CLASS(kmem_free,
        TP_ARGS(call_site, ptr),
 
        TP_STRUCT__entry(
-               __field(        unsigned long,  call_site       )
-               __field(        const void *,   ptr             )
+               __field_hex(    unsigned long,  call_site       )
+               __field_hex(    const void *,   ptr             )
        ),
 
        TP_fast_assign(
@@ -136,7 +140,9 @@ DECLARE_EVENT_CLASS(kmem_free,
        TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)
 )
 
-DEFINE_EVENT(kmem_free, kfree,
+DEFINE_EVENT_MAP(kmem_free, kfree,
+
+       kmem_kfree,
 
        TP_PROTO(unsigned long call_site, const void *ptr),
 
@@ -162,7 +168,7 @@ TRACE_EVENT(mm_page_free_direct,
        TP_ARGS(page, order),
 
        TP_STRUCT__entry(
-               __field(        struct page *,  page            )
+               __field_hex(    struct page *,  page            )
                __field(        unsigned int,   order           )
        ),
 
@@ -188,7 +194,7 @@ TRACE_EVENT(mm_pagevec_free,
        TP_ARGS(page, cold),
 
        TP_STRUCT__entry(
-               __field(        struct page *,  page            )
+               __field_hex(    struct page *,  page            )
                __field(        int,            cold            )
        ),
 
@@ -211,7 +217,7 @@ TRACE_EVENT(mm_page_alloc,
        TP_ARGS(page, order, gfp_flags, migratetype),
 
        TP_STRUCT__entry(
-               __field(        struct page *,  page            )
+               __field_hex(    struct page *,  page            )
                __field(        unsigned int,   order           )
                __field(        gfp_t,          gfp_flags       )
                __field(        int,            migratetype     )
@@ -239,7 +245,7 @@ DECLARE_EVENT_CLASS(mm_page,
        TP_ARGS(page, order, migratetype),
 
        TP_STRUCT__entry(
-               __field(        struct page *,  page            )
+               __field_hex(    struct page *,  page            )
                __field(        unsigned int,   order           )
                __field(        int,            migratetype     )
        ),
@@ -291,7 +297,7 @@ TRACE_EVENT(mm_page_alloc_extfrag,
                alloc_migratetype, fallback_migratetype),
 
        TP_STRUCT__entry(
-               __field(        struct page *,  page                    )
+               __field_hex(    struct page *,  page                    )
                __field(        int,            alloc_order             )
                __field(        int,            fallback_order          )
                __field(        int,            alloc_migratetype       )