* [PATCH 3/3] tracing/events: convert NAPI's tracepoint and fix DEFINE_TRACE_FN
@ 2009-08-27 10:43 Xiao Guangrong
2009-08-27 10:49 ` Xiao Guangrong
0 siblings, 1 reply; 4+ messages in thread
From: Xiao Guangrong @ 2009-08-27 10:43 UTC (permalink / raw)
To: Ingo Molnar
Cc: Steven Rostedt, Frederic Weisbecker, Neil Horman, David Miller,
Wei Yongjun, LKML, Netdev
References: <4A966288.8020402@cn.fujitsu.com>
In-Reply-To: <4A966288.8020402@cn.fujitsu.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
- Convert NAPI's tracepoint via TRACE_EVENT macro, the output information
like below:
sshd-2503 [000] 71.920846: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
sshd-2503 [000] 72.020291: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
sshd-2503 [000] 72.020418: napi_poll: ifname=eth0 state=NAPI_STATE_SCHED weigth=16 poll=pcnet32_poll
- Remove the "DECLARE_TRACE" definiens in include/trace/define_trace.h,
because TRACE_EVENT not use it
- Undef DEFINE_TRACE_FN after TRACE_EVENT/TRACE_EVENT_FN expanded,
then we can include more TRACE_EVENT .h file in one .c file
(the .c file has defined CREATE_TRACE_POINTS)
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
include/trace/define_trace.h | 5 +---
include/trace/events/napi.h | 43 +++++++++++++++++++++++++++++++++++++----
2 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
index a89ed59..6158741 100644
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
@@ -31,10 +31,6 @@
assign, print, reg, unreg) \
DEFINE_TRACE_FN(name, reg, unreg)
-#undef DECLARE_TRACE
-#define DECLARE_TRACE(name, proto, args) \
- DEFINE_TRACE(name)
-
#undef TRACE_INCLUDE
#undef __TRACE_INCLUDE
@@ -62,6 +58,7 @@
#endif
#undef TRACE_EVENT
+#undef TRACE_EVENT_FN
#undef TRACE_HEADER_MULTI_READ
/* Only undef what we defined in this file */
diff --git a/include/trace/events/napi.h b/include/trace/events/napi.h
index a8989c4..22802d1 100644
--- a/include/trace/events/napi.h
+++ b/include/trace/events/napi.h
@@ -1,11 +1,44 @@
-#ifndef _TRACE_NAPI_H_
-#define _TRACE_NAPI_H_
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM napi
+
+#if !defined(_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_NAPI_H
#include <linux/netdevice.h>
#include <linux/tracepoint.h>
-DECLARE_TRACE(napi_poll,
+#define show_napi_state(state) state ? __print_flags(state, "|", \
+ { (1UL << NAPI_STATE_SCHED), "NAPI_STATE_SCHED" }, \
+ { (1UL << NAPI_STATE_DISABLE), "NAPI_STATE_DISABLE" }, \
+ { (1UL << NAPI_STATE_NPSVC), "NAPI_STATE_NPSVC" }) : "0"
+
+TRACE_EVENT(napi_poll,
+
TP_PROTO(struct napi_struct *napi),
- TP_ARGS(napi));
-#endif
+ TP_ARGS(napi),
+
+ TP_STRUCT__entry(
+ __field( unsigned long, state )
+ __field( int, weight )
+ __field( void *, poll )
+ __string( ifname, (napi->dev ?
+ napi->dev->name : "backlog") )
+ ),
+
+ TP_fast_assign(
+ __entry->state = napi->state;
+ __entry->weight = napi->weight;
+ __entry->poll = napi->poll;
+ __assign_str(ifname, napi->dev ? napi->dev->name : "backlog")
+ ),
+
+ TP_printk("ifname=%s state=%s weigth=%d poll=%pf",
+ __get_str(ifname), show_napi_state(__entry->state),
+ __entry->weight, __entry->poll)
+);
+
+#endif /* _TRACE_NAPI_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
--
1.6.1.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 3/3] tracing/events: convert NAPI's tracepoint and fix DEFINE_TRACE_FN
2009-08-27 10:43 [PATCH 3/3] tracing/events: convert NAPI's tracepoint and fix DEFINE_TRACE_FN Xiao Guangrong
@ 2009-08-27 10:49 ` Xiao Guangrong
2009-08-27 12:56 ` Neil Horman
0 siblings, 1 reply; 4+ messages in thread
From: Xiao Guangrong @ 2009-08-27 10:49 UTC (permalink / raw)
To: Ingo Molnar
Cc: Steven Rostedt, Frederic Weisbecker, Neil Horman, David Miller,
Wei Yongjun, LKML, Netdev
Xiao Guangrong wrote:
> References: <4A966288.8020402@cn.fujitsu.com>
> In-Reply-To: <4A966288.8020402@cn.fujitsu.com>
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 7bit
>
It's look like my mail client has some problems, I'll check it and resend
this mail. Sorry!
Thanks,
Xiao
> - Convert NAPI's tracepoint via TRACE_EVENT macro, the output information
> like below:
>
> sshd-2503 [000] 71.920846: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
> sshd-2503 [000] 72.020291: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
> sshd-2503 [000] 72.020418: napi_poll: ifname=eth0 state=NAPI_STATE_SCHED weigth=16 poll=pcnet32_poll
>
> - Remove the "DECLARE_TRACE" definiens in include/trace/define_trace.h,
> because TRACE_EVENT not use it
>
> - Undef DEFINE_TRACE_FN after TRACE_EVENT/TRACE_EVENT_FN expanded,
> then we can include more TRACE_EVENT .h file in one .c file
> (the .c file has defined CREATE_TRACE_POINTS)
>
> Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 3/3] tracing/events: convert NAPI's tracepoint and fix DEFINE_TRACE_FN
2009-08-27 10:40 [PATCH 1/3] drop_monitor: fix trace_napi_poll_hit() Xiao Guangrong
@ 2009-08-27 10:56 ` Xiao Guangrong
0 siblings, 0 replies; 4+ messages in thread
From: Xiao Guangrong @ 2009-08-27 10:56 UTC (permalink / raw)
To: Ingo Molnar
Cc: Steven Rostedt, Frederic Weisbecker, Neil Horman, David Miller,
Wei Yongjun, LKML, Netdev
- Convert NAPI's tracepoint via TRACE_EVENT macro, the output information
like below:
sshd-2503 [000] 71.920846: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
sshd-2503 [000] 72.020291: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
sshd-2503 [000] 72.020418: napi_poll: ifname=eth0 state=NAPI_STATE_SCHED weigth=16 poll=pcnet32_poll
- Remove the "DECLARE_TRACE" definiens in include/trace/define_trace.h,
because TRACE_EVENT not use it
- Undef DEFINE_TRACE_FN after TRACE_EVENT/TRACE_EVENT_FN expanded,
then we can include more TRACE_EVENT .h file in one .c file
(the .c file has defined CREATE_TRACE_POINTS)
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
include/trace/define_trace.h | 5 +---
include/trace/events/napi.h | 43 +++++++++++++++++++++++++++++++++++++----
2 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
index a89ed59..6158741 100644
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
@@ -31,10 +31,6 @@
assign, print, reg, unreg) \
DEFINE_TRACE_FN(name, reg, unreg)
-#undef DECLARE_TRACE
-#define DECLARE_TRACE(name, proto, args) \
- DEFINE_TRACE(name)
-
#undef TRACE_INCLUDE
#undef __TRACE_INCLUDE
@@ -62,6 +58,7 @@
#endif
#undef TRACE_EVENT
+#undef TRACE_EVENT_FN
#undef TRACE_HEADER_MULTI_READ
/* Only undef what we defined in this file */
diff --git a/include/trace/events/napi.h b/include/trace/events/napi.h
index a8989c4..22802d1 100644
--- a/include/trace/events/napi.h
+++ b/include/trace/events/napi.h
@@ -1,11 +1,44 @@
-#ifndef _TRACE_NAPI_H_
-#define _TRACE_NAPI_H_
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM napi
+
+#if !defined(_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_NAPI_H
#include <linux/netdevice.h>
#include <linux/tracepoint.h>
-DECLARE_TRACE(napi_poll,
+#define show_napi_state(state) state ? __print_flags(state, "|", \
+ { (1UL << NAPI_STATE_SCHED), "NAPI_STATE_SCHED" }, \
+ { (1UL << NAPI_STATE_DISABLE), "NAPI_STATE_DISABLE" }, \
+ { (1UL << NAPI_STATE_NPSVC), "NAPI_STATE_NPSVC" }) : "0"
+
+TRACE_EVENT(napi_poll,
+
TP_PROTO(struct napi_struct *napi),
- TP_ARGS(napi));
-#endif
+ TP_ARGS(napi),
+
+ TP_STRUCT__entry(
+ __field( unsigned long, state )
+ __field( int, weight )
+ __field( void *, poll )
+ __string( ifname, (napi->dev ?
+ napi->dev->name : "backlog") )
+ ),
+
+ TP_fast_assign(
+ __entry->state = napi->state;
+ __entry->weight = napi->weight;
+ __entry->poll = napi->poll;
+ __assign_str(ifname, napi->dev ? napi->dev->name : "backlog")
+ ),
+
+ TP_printk("ifname=%s state=%s weigth=%d poll=%pf",
+ __get_str(ifname), show_napi_state(__entry->state),
+ __entry->weight, __entry->poll)
+);
+
+#endif /* _TRACE_NAPI_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
--
1.6.1.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 3/3] tracing/events: convert NAPI's tracepoint and fix DEFINE_TRACE_FN
2009-08-27 10:49 ` Xiao Guangrong
@ 2009-08-27 12:56 ` Neil Horman
0 siblings, 0 replies; 4+ messages in thread
From: Neil Horman @ 2009-08-27 12:56 UTC (permalink / raw)
To: Xiao Guangrong
Cc: Ingo Molnar, Steven Rostedt, Frederic Weisbecker, David Miller,
Wei Yongjun, LKML, Netdev
On Thu, Aug 27, 2009 at 06:49:38PM +0800, Xiao Guangrong wrote:
>
>
> Xiao Guangrong wrote:
> > References: <4A966288.8020402@cn.fujitsu.com>
> > In-Reply-To: <4A966288.8020402@cn.fujitsu.com>
> > Content-Type: text/plain; charset=UTF-8
> > Content-Transfer-Encoding: 7bit
> >
>
> It's look like my mail client has some problems, I'll check it and resend
> this mail. Sorry!
>
> Thanks,
> Xiao
>
Please do, thank you!
Neil
> > - Convert NAPI's tracepoint via TRACE_EVENT macro, the output information
> > like below:
> >
> > sshd-2503 [000] 71.920846: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
> > sshd-2503 [000] 72.020291: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
> > sshd-2503 [000] 72.020418: napi_poll: ifname=eth0 state=NAPI_STATE_SCHED weigth=16 poll=pcnet32_poll
> >
> > - Remove the "DECLARE_TRACE" definiens in include/trace/define_trace.h,
> > because TRACE_EVENT not use it
> >
> > - Undef DEFINE_TRACE_FN after TRACE_EVENT/TRACE_EVENT_FN expanded,
> > then we can include more TRACE_EVENT .h file in one .c file
> > (the .c file has defined CREATE_TRACE_POINTS)
> >
> > Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-08-27 12:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-27 10:43 [PATCH 3/3] tracing/events: convert NAPI's tracepoint and fix DEFINE_TRACE_FN Xiao Guangrong
2009-08-27 10:49 ` Xiao Guangrong
2009-08-27 12:56 ` Neil Horman
-- strict thread matches above, loose matches on Subject: below --
2009-08-27 10:40 [PATCH 1/3] drop_monitor: fix trace_napi_poll_hit() Xiao Guangrong
2009-08-27 10:56 ` [PATCH 3/3] tracing/events: convert NAPI's tracepoint and fix DEFINE_TRACE_FN Xiao Guangrong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).