[PATCH 09/11] tracing/events: modify kmem print to new format

Steven Rostedt
2009-06-10T17:02:29Z

[-- Attachment #1: 0009-tracing-events-modify-kmem-print-to-new-format.patch --]
[-- Type: text/plain, Size: 5968 bytes --]

From: Steven Rostedt <srostedt@redhat.com>

Use new format for better parsing of kmem events.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
include/trace/events/kmem.h | 100 ++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 54 deletions(-)

diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index 9baba50..32c93da 100644
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -17,32 +17,36 @@
*
* Thus most bits set go first.
*/
-#define show_gfp_flags(flags) \
- (flags) ? __print_flags(flags, "|", \
- {(unsigned long)GFP_HIGHUSER_MOVABLE, "GFP_HIGHUSER_MOVABLE"}, \
- {(unsigned long)GFP_HIGHUSER, "GFP_HIGHUSER"}, \
- {(unsigned long)GFP_USER, "GFP_USER"}, \
- {(unsigned long)GFP_TEMPORARY, "GFP_TEMPORARY"}, \
- {(unsigned long)GFP_KERNEL, "GFP_KERNEL"}, \
- {(unsigned long)GFP_NOFS, "GFP_NOFS"}, \
- {(unsigned long)GFP_ATOMIC, "GFP_ATOMIC"}, \
- {(unsigned long)GFP_NOIO, "GFP_NOIO"}, \
- {(unsigned long)__GFP_HIGH, "GFP_HIGH"}, \
- {(unsigned long)__GFP_WAIT, "GFP_WAIT"}, \
- {(unsigned long)__GFP_IO, "GFP_IO"}, \
- {(unsigned long)__GFP_COLD, "GFP_COLD"}, \
- {(unsigned long)__GFP_NOWARN, "GFP_NOWARN"}, \
- {(unsigned long)__GFP_REPEAT, "GFP_REPEAT"}, \
- {(unsigned long)__GFP_NOFAIL, "GFP_NOFAIL"}, \
- {(unsigned long)__GFP_NORETRY, "GFP_NORETRY"}, \
- {(unsigned long)__GFP_COMP, "GFP_COMP"}, \
- {(unsigned long)__GFP_ZERO, "GFP_ZERO"}, \
- {(unsigned long)__GFP_NOMEMALLOC, "GFP_NOMEMALLOC"}, \
- {(unsigned long)__GFP_HARDWALL, "GFP_HARDWALL"}, \
- {(unsigned long)__GFP_THISNODE, "GFP_THISNODE"}, \
- {(unsigned long)__GFP_RECLAIMABLE, "GFP_RECLAIMABLE"}, \
- {(unsigned long)__GFP_MOVABLE, "GFP_MOVABLE"} \
- ) : "GFP_NOWAIT"
+#define show_gfp_flags_format() \
+ "0=GFP_NOWAIT," \
+ "0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s," \
+ "0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s," \
+ "0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s,0x%lx=%s," \
+ "0x%lx=%s,0x%lx=%s"
+#define show_gfp_flags_args() \
+ (unsigned long)GFP_HIGHUSER_MOVABLE, "GFP_HIGHUSER_MOVABLE", \
+ (unsigned long)GFP_HIGHUSER, "GFP_HIGHUSER", \
+ (unsigned long)GFP_USER, "GFP_USER", \
+ (unsigned long)GFP_TEMPORARY, "GFP_TEMPORARY", \
+ (unsigned long)GFP_KERNEL, "GFP_KERNEL", \
+ (unsigned long)GFP_NOFS, "GFP_NOFS", \
+ (unsigned long)GFP_ATOMIC, "GFP_ATOMIC", \
+ (unsigned long)GFP_NOIO, "GFP_NOIO", \
+ (unsigned long)__GFP_HIGH, "GFP_HIGH", \
+ (unsigned long)__GFP_WAIT, "GFP_WAIT", \
+ (unsigned long)__GFP_IO, "GFP_IO", \
+ (unsigned long)__GFP_COLD, "GFP_COLD", \
+ (unsigned long)__GFP_NOWARN, "GFP_NOWARN", \
+ (unsigned long)__GFP_REPEAT, "GFP_REPEAT", \
+ (unsigned long)__GFP_NOFAIL, "GFP_NOFAIL", \
+ (unsigned long)__GFP_NORETRY, "GFP_NORETRY", \
+ (unsigned long)__GFP_COMP, "GFP_COMP", \
+ (unsigned long)__GFP_ZERO, "GFP_ZERO", \
+ (unsigned long)__GFP_NOMEMALLOC, "GFP_NOMEMALLOC", \
+ (unsigned long)__GFP_HARDWALL, "GFP_HARDWALL", \
+ (unsigned long)__GFP_THISNODE, "GFP_THISNODE", \
+ (unsigned long)__GFP_RECLAIMABLE, "GFP_RECLAIMABLE", \
+ (unsigned long)__GFP_MOVABLE, "GFP_MOVABLE"

TRACE_EVENT(kmalloc,

@@ -70,12 +74,9 @@ TRACE_EVENT(kmalloc,
__entry->gfp_flags = gfp_flags;
),

- TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s",
- __entry->call_site,
- __entry->ptr,
- __entry->bytes_req,
- __entry->bytes_alloc,
- show_gfp_flags(__entry->gfp_flags))
+ TP_FORMAT("call_site=<hex:call_site> ptr=<ptr:ptr> bytes_req=<int:bytes_req> "
+ "bytes_alloc=<int:bytes_alloc> gfp_flags=<mask:gfp_flags:|:"
+ show_gfp_flags_format() ">", show_gfp_flags_args())
);

TRACE_EVENT(kmem_cache_alloc,
@@ -104,12 +105,9 @@ TRACE_EVENT(kmem_cache_alloc,
__entry->gfp_flags = gfp_flags;
),

- TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s",
- __entry->call_site,
- __entry->ptr,
- __entry->bytes_req,
- __entry->bytes_alloc,
- show_gfp_flags(__entry->gfp_flags))
+ TP_FORMAT("call_site=<hex:call_site> ptr=<ptr:ptr> bytes_req=<int:bytes_req> "
+ "bytes_alloc=<int:bytes_alloc> gfp_flags=<mask:gfp_flags:|:"
+ show_gfp_flags_format() ">", show_gfp_flags_args())
);

TRACE_EVENT(kmalloc_node,
@@ -141,13 +139,10 @@ TRACE_EVENT(kmalloc_node,
__entry->node = node;
),

- TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s node=%d",
- __entry->call_site,
- __entry->ptr,
- __entry->bytes_req,
- __entry->bytes_alloc,
- show_gfp_flags(__entry->gfp_flags),
- __entry->node)
+ TP_FORMAT("call_site=<hex:call_site> ptr=<ptr:ptr> bytes_req=<int:bytes_req> "
+ "bytes_alloc=<int:bytes_alloc> gfp_flags=<mask:gfp_flags:|:"
+ show_gfp_flags_format() "> node=<int:node>",
+ show_gfp_flags_args())
);

TRACE_EVENT(kmem_cache_alloc_node,
@@ -179,13 +174,10 @@ TRACE_EVENT(kmem_cache_alloc_node,
__entry->node = node;
),

- TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s node=%d",
- __entry->call_site,
- __entry->ptr,
- __entry->bytes_req,
- __entry->bytes_alloc,
- show_gfp_flags(__entry->gfp_flags),
- __entry->node)
+ TP_FORMAT("call_site=<hex:call_site> ptr=<ptr:ptr> bytes_req=<int:bytes_req> "
+ "bytes_alloc=<int:bytes_alloc> gfp_flags=<mask:gfp_flags:|:"
+ show_gfp_flags_format() "> node=<int:node>",
+ show_gfp_flags_args())
);

TRACE_EVENT(kfree,
@@ -204,7 +196,7 @@ TRACE_EVENT(kfree,
__entry->ptr = ptr;
),

- TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)
+ TP_FORMAT("call_site=<hex:call_site> ptr=<ptr:ptr>")
);

TRACE_EVENT(kmem_cache_free,
@@ -223,7 +215,7 @@ TRACE_EVENT(kmem_cache_free,
__entry->ptr = ptr;
),

- TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)
+ TP_FORMAT("call_site=<hex:call_site> ptr=<ptr:ptr>")
);
#endif /* _TRACE_KMEM_H */

--
1.6.3.1

--